ADAM / AIAHTML5

Commit 22292e832e6278003ab6b144d9a27761ad46da4f

Authored by Amrita Vishnoi
2 parents c964685a 67307b1c

Merge branch 'LMNotLoading' of http://52.6.196.163/ADAM/AIAHTML5 into QA

Inline Side-by-side
Showing 2 changed files with 9 additions and 3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @22292e8
... ... @@ -724,7 +724,10 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
724 724 //} else {
725 725 // $rootScope.isLoading = true;
726 726 // $("#spinner").css("visibility", "visible");
727   - // // $("#spinner").css("visibility", "block");
  727 + // // $("#spinner").css("visibility", "block");
  728 + if ($rootScope.isListManagerMenuSelected) {
  729 + $scope.loadListManger();
  730 + }
728 731 }
729 732  
730 733  
... ... @@ -8372,6 +8375,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
8372 8375  
8373 8376 $scope.loadListManger = function () {
8374 8377  
  8378 + $rootScope.isListManagerMenuSelected = true;
8375 8379  
8376 8380 var vocabTermTxt = [];
8377 8381 if ($rootScope.TermNumberData != null || $rootScope.TermNumberData != undefined && $rootScope.TermNumberData.length > 0) {
... ... @@ -8430,8 +8434,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
8430 8434 }
8431 8435 }
8432 8436 else {
  8437 + console.log("$rootScope.TermNumberData NOT FOUND");
8433 8438 $scope.loadSearchData();
8434   - $scope.loadListManger();
  8439 +
8435 8440 }
8436 8441 }
8437 8442  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @22292e8
... ... @@ -3290,7 +3290,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3290 3290  
3291 3291 $("#btnTranparency").removeAttr('disabled', 'disabled');
3292 3292 $("#optionsListManagerTab").removeClass("active");
3293   - console.log('close');
  3293 + $rootScope.isListManagerMenuSelected = false;
  3294 + console.log('listManager closed');
3294 3295 $rootScope.disableAnnotationtoolOnListManager = false;
3295 3296 if ($rootScope.MenuModuleName == "DA" || $rootScope.MenuModuleName == "AA") {
3296 3297 $("#annotationpaintbrushsize").attr("href", "#canvasPaint");
... ...