rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Offline extensions message

Browse Source
This commit is contained in:
Mo Bitar
2019-02-19 17:18:18 -06:00
parent c84c02f989
commit e3ce68c63f
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/app/directives/views/componentView.js
View File

@@ -73,10 +73,9 @@ class ComponentView {
return; return;
} }
$scope.loading = true;
let iframe = componentManager.iframeForComponent(component); let iframe = componentManager.iframeForComponent(component);
if(iframe) { if(iframe) {
$scope.loading = true;
// begin loading error handler. If onload isn't called in x seconds, display an error // begin loading error handler. If onload isn't called in x seconds, display an error
if($scope.loadTimeout) { $timeout.cancel($scope.loadTimeout);} if($scope.loadTimeout) { $timeout.cancel($scope.loadTimeout);}
$scope.loadTimeout = $timeout(() => { $scope.loadTimeout = $timeout(() => {
@@ -152,12 +151,10 @@ class ComponentView {
$scope.reloading = true; $scope.reloading = true;
let previouslyValid = $scope.componentValid; let previouslyValid = $scope.componentValid;
var offlineRestricted, urlError; let offlineRestricted = component.offlineOnly && !isDesktopApplication();
offlineRestricted = component.offlineOnly && !isDesktopApplication(); let urlError =
(!isDesktopApplication() && !component.hasValidHostedUrl())
urlError =
(!isDesktopApplication() && (!component.hasValidHostedUrl()))
|| ||
(isDesktopApplication() && (!component.local_url && !component.hasValidHostedUrl())) (isDesktopApplication() && (!component.local_url && !component.hasValidHostedUrl()))

15
app/assets/templates/directives/component-view.html.haml
View File

@@ -37,15 +37,16 @@
.sk-panel.static .sk-panel.static
.sk-panel-content .sk-panel-content
.sk-panel-section.stretch .sk-panel-section.stretch
.sk-panel-section-title You have restricted this extension to be used offline only. .sk-panel-column
%p Offline extensions are not available in the Web app. .sk-h1.sk-bold You have restricted this extension to be used offline only.
.sk-subtitle Offline extensions are not available in the Web app.
.sk-panel-row
.sk-panel-row .sk-panel-row
.sk-panel-column .sk-panel-column
%p You can either: .sk-p You can either:
%p %ul
%ul %li.sk-p <strong>Enable the Hosted option</strong> for this extension by opening the 'Extensions' menu and toggling 'Use hosted when local is unavailable' under this extension's options. Then press Reload below.
%li <strong>Enable the Hosted option</strong> for this extension by opening the 'Extensions' menu and toggling 'Use hosted when local is unavailable' under this extension's options. Then press Reload below. %li.sk-p <strong>Use the Desktop application.</strong>
%li <strong>Use the Desktop application.</strong>
.sk-panel-row .sk-panel-row
.sk-button.info{"ng-if" => "!reloading", "ng-click" => "reloadStatus()"} .sk-button.info{"ng-if" => "!reloading", "ng-click" => "reloadStatus()"}
.sk-label Reload .sk-label Reload