ADAM / AIAHTML5

Merged
Merge Request #860 · created by Ayush Jain

25382 : loader keeps on loading on selection of skin

From loaderIssue into Develop-IPAD-MAC

Merged by Nikita Kulshreshtha

2 participants
Inline Side-by-side
Showing 1 changed file
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  Edit  View file @2719391
... ... @@ -2986,6 +2986,24 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2986 2986  
2987 2987 }
2988 2988 }
  2989 +
  2990 + $timeout(function () {
  2991 +
  2992 + // alert($("#termList option").prop('selected', true).val());
  2993 + // alert(document.getElementById("typedTermName").value);
  2994 + // alert($rootScope.searchSelectedText);
  2995 + var termSelectedName = $rootScope.searchSelectedText;
  2996 + if (termSelectedName == "Cardiovascular") {
  2997 + termSelectedName = "Skin";
  2998 + }
  2999 + if (document.getElementById("typedTermName").value == "Skin" || termSelectedName == "Skin") {
  3000 + $rootScope.isLoading = false;
  3001 + $('#spinner').css('visibility', 'hidden');
  3002 + $scope.EnableUI();
  3003 + }
  3004 + }, 800);
  3005 +
  3006 +
2989 3007 }, 100)
2990 3008 }
2991 3009  
... ... @@ -9110,6 +9128,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
9110 9128 $scope.DisableUI();
9111 9129  
9112 9130 $rootScope.searchSelectedText = $("#" + actualTermNumber).text();
  9131 +
9113 9132 $rootScope.slectedActualTermNumber = actualTermNumber;
9114 9133  
9115 9134 if (isTermListOptionClicked == true) {
... ...