ADAM / AIAHTML5

Commit 05d6bb26cbd2c2db5ec0a1354cf91cc30f1deba2

Authored by Amrita Vishnoi
2 parents d8f491a8 e7cd3044

Merge branch 'listmanagersystemallissue' into Develop-IPAD-MAC

Inline Side-by-side
Showing 1 changed file with 12 additions and 3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @05d6bb2
... ... @@ -37,7 +37,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
37 37 $scope.activePinArray = [];
38 38 $scope.showTabButton = true;
39 39 $scope.isListViewDataLoaded = true;
40   -
  40 + $rootScope.isSliderSlide = false;
41 41 $scope.setActiveTab = function (tabToSet) {
42 42  
43 43 $scope.activeTab = tabToSet;
... ... @@ -272,6 +272,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
272 272 range: "min",
273 273 orientation: "vertical",
274 274 slide: function (event, ui) {
  275 + $rootScope.isSliderSlide = true;
275 276 var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
276 277 scope.$apply(function () {
277 278 scope.sliderVal = ui.value;
... ... @@ -463,9 +464,17 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
463 464 })
464 465  
465 466  
466   -
  467 +
467 468 //load search/vocab data
468   - $rootScope.loadSearchData();
  469 + if ($rootScope.isSliderSlide == true) {
  470 +
  471 + $rootScope.isSliderSlide = false;
  472 +
  473 + }
  474 + else {
  475 + $rootScope.loadSearchData();
  476 +
  477 + }
469 478 }
470 479 },
471 480 function (error) {
... ...