Actually true is false, and false is true (#460)

* actually true is false, and false is true * loading is now loaded, makes more sense now
uPortal-Attic · Apr 29, 2016 · a4aa68e · a4aa68e
1 parent 13b0f58
commit a4aa68e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/angularjs-portal-home/src/main/webapp/my-app/layout/static/controllers.js b/angularjs-portal-home/src/main/webapp/my-app/layout/static/controllers.js
@@ -32,7 +32,7 @@ define(['angular', 'jquery'], function(angular, $) {
         };
 
         var endFn = function(){
-          $scope.loading = false;
+          $scope.loaded = true;
           $scope.empty = $scope.portlet.exclusiveContent
                           && $scope.portlet.exclusiveContent.length > 0 ? false : true;
         };
@@ -50,7 +50,7 @@ define(['angular', 'jquery'], function(angular, $) {
                     if (typeof $scope.portlet === 'undefined' ||
                         typeof $scope.portlet.fname === 'undefined') {
                         if(result.status === 403) {
-                          $scope.loading = false;
+                          $scope.loaded = true;
                           $scope.empty = false;
                           $scope.portlet = {};
                           $scope.portlet.title = 'Access Denied';
@@ -60,7 +60,7 @@ define(['angular', 'jquery'], function(angular, $) {
                           $location.path('/');
                         }
                     } else {
-                        $scope.loading = true;
+                        $scope.loaded = true;
                         layoutService.getExclusiveMarkup($scope.portlet).then(endFn,endFn);
                     }
                 });
@@ -89,7 +89,7 @@ define(['angular', 'jquery'], function(angular, $) {
                   layoutService,
                   sharedPortletService) {
             $scope.portlet = sharedPortletService.getProperty() || {};
-            $scope.loading = [];
+            $scope.loaded = false;
             var that = this;
             that.getPortlet = function (fname, portlets) {
                 for (var p in portlets) {
@@ -104,7 +104,7 @@ define(['angular', 'jquery'], function(angular, $) {
 
                 if (typeof $rootScope.layout !== 'undefined' && $rootScope.layout != null) {
                     $scope.portlet = that.getPortlet($routeParams.fname, $rootScope.layout);
-                    $scope.loading = $scope.portlet;
+                    $scope.loaded = true;
                 }
                 if (typeof $scope.portlet.fname === 'undefined') {
                     layoutService.getApp($routeParams.fname).then(function (result) {
@@ -113,7 +113,7 @@ define(['angular', 'jquery'], function(angular, $) {
                         if (typeof $scope.portlet === 'undefined' ||
                             typeof $scope.portlet.fname === 'undefined') {
                             if(result.status === 403) {
-                              $scope.loading = false;
+                              $scope.loaded = true;
                               $scope.empty = false;
                               $scope.portlet = {};
                               $scope.portlet.title = 'Access Denied';
@@ -124,13 +124,13 @@ define(['angular', 'jquery'], function(angular, $) {
                             }
 
                         } else {
-                          $scope.loading = $scope.portlet; //not []
+                          $scope.loaded = true;
                         }
                     });
                 }
 
             } else {
-              $scope.loading = $scope.portlet;
+              $scope.loaded = true;
             }
 
             $scope.openRating = function (size, fname, name) {

diff --git a/...s-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-exclusive.html b/...s-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-exclusive.html
@@ -17,7 +17,7 @@
   app-action-link-text="'Add to home'"
   app-add-to-home='true'></app-header-two-way-bind>
   <div role="main" class="white-page portlet-body">
-    <loading-gif  data-object='loading' data-empty='empty'></loading-gif>
+    <loading-gif  data-object='loaded' data-empty='empty'></loading-gif>
 	  <div ng-bind-html="portlet.exclusiveContent" class="up-portlet-content-wrapper" id="content-{{::portlet.nodeId}}">
 	  </div>
   </div>

diff --git a/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-max.html b/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-max.html
@@ -18,7 +18,7 @@
   app-add-to-home='true'></app-header-two-way-bind>
 
   <div role="main" class="white-page portlet-body">
-    <loading-gif data-object='loading'></loading-gif>
+    <loading-gif data-object='loaded'></loading-gif>
 	  <div ng-bind-html="::portlet.staticContent" class="up-portlet-content-wrapper" id="content-{{::portlet.nodeId}}">
 	  </div>
   </div>