Commit 2d0fab0bf4c794dffbf55d83763966d3920c01df
1 parent
8e78629f
DA > Search List > List Manager hang in the below mention case.
Showing
2 changed files
with
23 additions
and
22 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
| @@ -3179,7 +3179,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -3179,7 +3179,7 @@ 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 | ||
| @@ -7557,27 +7557,28 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -7557,27 +7557,28 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
| 7557 | // $('#slider-range-min-2').slider('disable'); | 7557 | // $('#slider-range-min-2').slider('disable'); |
| 7558 | // } | 7558 | // } |
| 7559 | //} | 7559 | //} |
| 7560 | - if ($rootScope.setListManagerZindex == true) | ||
| 7561 | - { | ||
| 7562 | - var canvasPaintZindex = $('#canvasPaint').css("z-index"); //x | ||
| 7563 | - | ||
| 7564 | - var canvasZindex = $('#canvas').css("z-index"); //y | ||
| 7565 | - var listManagerZindex = $('#listManager').css("z-index"); //z | ||
| 7566 | - if (canvasPaintZindex > canvasZindex) { | ||
| 7567 | - //y = parseInt(canvasPaintZindex) + 1; | ||
| 7568 | - //if (listManagerZindex <= canvasPaintZindex) { | ||
| 7569 | - // listManagerZindex = parseInt(canvasPaintZindex) + 1; | ||
| 7570 | - // $('#listManager').css("z-index", z); | ||
| 7571 | - //} | ||
| 7572 | - //else { | ||
| 7573 | - $('#listManager').css("z-index", canvasPaintZindex); | ||
| 7574 | - // } | ||
| 7575 | - } else { | ||
| 7576 | - //y = parseInt(y) + 1; | ||
| 7577 | - $('#listManager').css("z-index", canvasZindex); | ||
| 7578 | - } | 7560 | + |
| 7561 | + //if ($rootScope.setListManagerZindex == true) | ||
| 7562 | + //{ | ||
| 7563 | + // var canvasPaintZindex = $('#canvasPaint').css("z-index"); //x | ||
| 7564 | + | ||
| 7565 | + // var canvasZindex = $('#canvas').css("z-index"); //y | ||
| 7566 | + // var listManagerZindex = $('#listManager').css("z-index"); //z | ||
| 7567 | + // if (canvasPaintZindex > canvasZindex) { | ||
| 7568 | + // //y = parseInt(canvasPaintZindex) + 1; | ||
| 7569 | + // //if (listManagerZindex <= canvasPaintZindex) { | ||
| 7570 | + // // listManagerZindex = parseInt(canvasPaintZindex) + 1; | ||
| 7571 | + // // $('#listManager').css("z-index", z); | ||
| 7572 | + // //} | ||
| 7573 | + // //else { | ||
| 7574 | + // $('#listManager').css("z-index", (canvasPaintZindex + 2)); | ||
| 7575 | + // // } | ||
| 7576 | + // } else { | ||
| 7577 | + // //y = parseInt(y) + 1; | ||
| 7578 | + // $('#listManager').css("z-index", canvasZindex); | ||
| 7579 | + // } | ||
| 7579 | 7580 | ||
| 7580 | - } | 7581 | + //} |
| 7581 | 7582 | ||
| 7582 | 7583 | ||
| 7583 | 7584 |
400-SOURCECODE/AIAHTML5.Web/index.html