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

Component view error handling, extensions-manager submodule

Browse Source
This commit is contained in:
Mo Bitar
2018-02-04 11:24:48 -06:00
parent 805fc48da4
commit 84d68e8f68
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,14 +82,20 @@ class ComponentView {
var expired, offlineRestricted, urlError;
offlineRestricted = component.offlineOnly && !isDesktopApplication();
urlError = !isDesktopApplication() && (!component.url && !component.hosted_url);
urlError =
(!isDesktopApplication() && (!component.url && !component.hosted_url))
||
(isDesktopApplication() && (!component.local_url && !component.url && !component.hosted_url))
expired = component.valid_until && component.valid_until <= new Date();
$scope.componentValid = !offlineRestricted && !urlError && !expired;
if(offlineRestricted) $scope.error = 'offline-restricted';
if(urlError) $scope.error = 'url-missing';
if(expired) $scope.error = 'expired';
else if(urlError) $scope.error = 'url-missing';
else if(expired) $scope.error = 'expired';
else $scope.error = null;
if($scope.componentValid !== previouslyValid) {
if($scope.componentValid) {