ADAM / AIAHTML5

Commit 112ffb97ae3c306aaffefaa1f2bbb27a9353e8bd

Authored by Nikita Kulshreshtha
2 parents 46c5a81f af8e1628

Merge branch 'anotaionhidesearch' into Develop

Inline Side-by-side
Showing 1 changed file with 4 additions and 3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @112ffb9
@@ -680,7 +680,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -680,7 +680,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
680 $('#searchListDiv').empty() 680 $('#searchListDiv').empty()
681 //Delay compile of ul li so that the remove of li is completed. 681 //Delay compile of ul li so that the remove of li is completed.
682 $timeout(function () { 682 $timeout(function () {
683 - var $e2 = $('<ul id="termlistfilter" class="form-control dropdown-menu" style="height:90px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:1000;"><li ng-repeat="item in VocabTermTxt| filter:{ _TermText: searchFilter}">' + 683 + var $e2 = $('<ul id="termlistfilter" class="form-control dropdown-menu" style="height:90px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:60001;"><li ng-repeat="item in VocabTermTxt| filter:{ _TermText: searchFilter}">' +
684 '<a id="{{item._ActualTermNumber}}" href="" onclick="selectTerm(event)">{{item._TermText}}</a>' + 684 '<a id="{{item._ActualTermNumber}}" href="" onclick="selectTerm(event)">{{item._TermText}}</a>' +
685 ' </li></ul>').appendTo('#searchListDiv') 685 ' </li></ul>').appendTo('#searchListDiv')
686 $compile($e2)($scope); 686 $compile($e2)($scope);
@@ -3179,7 +3179,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -3179,7 +3179,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3179 3179
3180 3180
3181 //history maintained issue 3181 //history maintained issue
3182 - if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) { document.getElementById('sppeachBubble').style.zIndex = "100000000000"; } 3182 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) { document.getElementById('sppeachBubble').style.zIndex = "60000"; }
  3183 +
3183 3184
3184 3185
3185 3186
@@ -8237,7 +8238,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -8237,7 +8238,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
8237 $('#searchListDiv').empty() 8238 $('#searchListDiv').empty()
8238 // added the timeout to delay the compile of ul li 8239 // added the timeout to delay the compile of ul li
8239 $timeout(function () { 8240 $timeout(function () {
8240 - var $e2 = $('<ul id="termlistfilter" class="form-control dropdown-menu" style="height:90px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:1000;"><li ng-repeat="item in VocabTermTxt| filter:{ _TermText: searchFilter}">' + 8241 + var $e2 = $('<ul id="termlistfilter" class="form-control dropdown-menu" style="height:90px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:60001;"><li ng-repeat="item in VocabTermTxt| filter:{ _TermText: searchFilter}">' +
8241 '<a id="{{item._ActualTermNumber}}" href="" onclick="selectTerm(event)">{{item._TermText}}</a>' + 8242 '<a id="{{item._ActualTermNumber}}" href="" onclick="selectTerm(event)">{{item._TermText}}</a>' +
8242 ' </li></ul>').appendTo('#searchListDiv') 8243 ' </li></ul>').appendTo('#searchListDiv')
8243 $compile($e2)($scope); 8244 $compile($e2)($scope);