Commit 22fa71863ae5e6a285ddc743848fdbe782b3f6c0
Merge branch 'loaderIssue' of http://gitlab.ebix.com/ADAM/AIAHTML5 into Develop-IPAD-MAC
Showing
1 changed file
with
19 additions
and
0 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -2993,6 +2993,24 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | @@ -2993,6 +2993,24 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | ||
2993 | 2993 | ||
2994 | } | 2994 | } |
2995 | } | 2995 | } |
2996 | + | ||
2997 | + $timeout(function () { | ||
2998 | + | ||
2999 | + // alert($("#termList option").prop('selected', true).val()); | ||
3000 | + // alert(document.getElementById("typedTermName").value); | ||
3001 | + // alert($rootScope.searchSelectedText); | ||
3002 | + var termSelectedName = $rootScope.searchSelectedText; | ||
3003 | + if (termSelectedName == "Cardiovascular") { | ||
3004 | + termSelectedName = "Skin"; | ||
3005 | + } | ||
3006 | + if (document.getElementById("typedTermName").value == "Skin" || termSelectedName == "Skin") { | ||
3007 | + $rootScope.isLoading = false; | ||
3008 | + $('#spinner').css('visibility', 'hidden'); | ||
3009 | + $scope.EnableUI(); | ||
3010 | + } | ||
3011 | + }, 800); | ||
3012 | + | ||
3013 | + | ||
2996 | }, 100) | 3014 | }, 100) |
2997 | } | 3015 | } |
2998 | 3016 | ||
@@ -9132,6 +9150,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | @@ -9132,6 +9150,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | ||
9132 | $scope.DisableUI(); | 9150 | $scope.DisableUI(); |
9133 | 9151 | ||
9134 | $rootScope.searchSelectedText = $("#" + actualTermNumber).text(); | 9152 | $rootScope.searchSelectedText = $("#" + actualTermNumber).text(); |
9153 | + | ||
9135 | $rootScope.slectedActualTermNumber = actualTermNumber; | 9154 | $rootScope.slectedActualTermNumber = actualTermNumber; |
9136 | 9155 | ||
9137 | if (isTermListOptionClicked == true) { | 9156 | if (isTermListOptionClicked == true) { |