Fixed a bug where the spinner displayed on the individual pack page.
authorCameron Ball <cameron@moodle.com>
Mon, 7 Dec 2015 07:33:47 +0000 (15:33 +0800)
committerCameron Ball <cameron@moodle.com>
Mon, 7 Dec 2015 07:33:47 +0000 (15:33 +0800)
app/pages/packs/packs.html
app/pages/packs/packs.js

index 9130c26..fac695d 100644 (file)
@@ -78,7 +78,7 @@
     <pack pack="pack" />\r
 </div>\r
 \r
-<div ng-if="!packList" style="text-align:center; padding-top: 250px; padding-bottom: 10px;">\r
+<div ng-if="!packList && !pack" style="text-align:center; padding-top: 250px; padding-bottom: 10px;">\r
     <img class="rotato" src="images/page_loading.png" />\r
     <h2>Loading packs...</h2>\r
-</div>
\ No newline at end of file
+</div>\r
index bfd7938..7d5ab0c 100644 (file)
@@ -14,14 +14,13 @@ angular.module("DivinElegy.pages.packs", ["DivinElegy.components.simfiles","Divi
     $scope.bgChangesFilterKeyword = 'Any';
     $scope.bpmChangesFilterKeyword = 'Any';
     $scope.modeFilterKeyword = 'Any';
-    $scope.packList = [];
+    $scope.packList = false;
     $scope.filteredPackList = [];
     $scope.allContributors = [];
     $scope.allSongTitles = [];
     $scope.allSongArtists = [];
     $scope.sortOrder = "alpha";
     $scope.reverseSort = false;
-    $scope.packList = false;
     
     var watchMen = ['packTitleFilterKeyword', 'artistFilterKeyword', 'songTitleFilterKeyword', 'difficultyFilterKeyword', 'ratingFilterKeyword', 'stepArtistFilterKeyword', 'fgChangesFilterKeyword', 'bgChangesFilterKeyword', 'bpmChangesFilterKeyword', 'modeFilterKeyword', 'sortOrder', 'reverseSort'];
     $scope.$watchGroup(watchMen, function(newValues, oldValues) {
@@ -217,4 +216,4 @@ angular.module("DivinElegy.pages.packs", ["DivinElegy.components.simfiles","Divi
         str = str ? str : "";
         return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
     };
-}]);
\ No newline at end of file
+}]);