ADAM / AIAHTML5

Commit 4e0645856983c76246654736a3d1e7afe99a2468

Authored by Nikita Kulshreshtha
1 parent 2a4b7280

Manully merged code for Bug #29776 and Bug #29654.

Inline Side-by-side
Showing 1 changed file with 2 additions and 3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @4e06458
... ... @@ -126,7 +126,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
126 126  
127 127 $rootScope.isLoading = false;
128 128 $('#spinner').css('visibility', 'hidden');
129   - }, 100);
  129 + }, 200);
130 130  
131 131  
132 132 }, 100);
... ... @@ -1563,9 +1563,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1563 1563 var termID = $rootScope.duplicateListArray[i].id;
1564 1564 if ($.inArray(termID, temp) == -1) {
1565 1565 temp.push(termID);
1566   - console.log('1'+$rootScope.duplicateListArray[i].title + " " + $rootScope.duplicateListArray[i].id);
1567 1566 $rootScope.sortedListArray.push({ "title": $rootScope.duplicateListArray[i].title, "id": termID });
1568   - console.log('3' + $rootScope.sortedListArray[i].title + " " + $rootScope.sortedListArray[i].id)
  1567 +
1569 1568 }
1570 1569 }
1571 1570 console.log('2'+$rootScope.sortedListArray);
... ...