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

Component offline only check

Browse Source
This commit is contained in:
Mo Bitar
2018-01-21 10:25:31 -06:00
parent c3bb993075
commit 330649d261
4 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,15 +58,21 @@ class ComponentView {
}
$scope.reloadStatus = function() {
let component = $scope.component;
$scope.reloading = true;
let previouslyValid = $scope.componentValid;
$scope.componentValid = !$scope.component.valid_until || ($scope.component.valid_until && $scope.component.valid_until > new Date());
$scope.offlineRestricted = component.offlineOnly && !isDesktopApplication();
$scope.componentValid = !$scope.offlineRestricted && (!component.valid_until || (component.valid_until && component.valid_until > new Date()));
if($scope.componentValid !== previouslyValid) {
if($scope.componentValid) {
componentManager.activateComponent($scope.component);
componentManager.activateComponent(component);
}
}
$timeout(() => {
$scope.reloading = false;
}, 500)

5
app/assets/javascripts/app/services/componentManager.js
View File

@@ -197,7 +197,7 @@ class ComponentManager {
urlForComponent(component) {
if(component.offlineOnly || (isDesktopApplication() && component.local_url)) {
return component.local_url.replace("sn://", this.desktopManager.getApplicationDataPath() + "/");
return component.local_url && component.local_url.replace("sn://", this.desktopManager.getApplicationDataPath() + "/");
} else {
return component.url || component.hosted_url;
}
@@ -402,6 +402,7 @@ class ComponentManager {
// Allow handlers to be notified when a save begins and ends, to update the UI
var saveMessage = Object.assign({}, message);
saveMessage.action = response && response.error ? "save-error" : "save-success";
this.replyToMessage(component, message, {error: response.error})
this.handleMessage(component, saveMessage);
});
});
@@ -599,7 +600,7 @@ class ComponentManager {
}
return;
}
if(this.loggingEnabled) {
console.log("Web|sendMessageToComponent", component, message);
}