From 2d0fab0bf4c794dffbf55d83763966d3920c01df Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 9 Feb 2017 15:21:26 +0530 Subject: [PATCH] DA > Search List > List Manager hang in the below mention case. --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 43 ++++++++++++++++++++++--------------------- 400-SOURCECODE/AIAHTML5.Web/index.html | 2 +- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 24e426b..31e6ac9 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -3179,7 +3179,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //history maintained issue - if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) { document.getElementById('sppeachBubble').style.zIndex = "100000000000"; } + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) { document.getElementById('sppeachBubble').style.zIndex = "60000"; } @@ -7557,27 +7557,28 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo // $('#slider-range-min-2').slider('disable'); // } //} - if ($rootScope.setListManagerZindex == true) - { - var canvasPaintZindex = $('#canvasPaint').css("z-index"); //x - - var canvasZindex = $('#canvas').css("z-index"); //y - var listManagerZindex = $('#listManager').css("z-index"); //z - if (canvasPaintZindex > canvasZindex) { - //y = parseInt(canvasPaintZindex) + 1; - //if (listManagerZindex <= canvasPaintZindex) { - // listManagerZindex = parseInt(canvasPaintZindex) + 1; - // $('#listManager').css("z-index", z); - //} - //else { - $('#listManager').css("z-index", canvasPaintZindex); - // } - } else { - //y = parseInt(y) + 1; - $('#listManager').css("z-index", canvasZindex); - } + + //if ($rootScope.setListManagerZindex == true) + //{ + // var canvasPaintZindex = $('#canvasPaint').css("z-index"); //x + + // var canvasZindex = $('#canvas').css("z-index"); //y + // var listManagerZindex = $('#listManager').css("z-index"); //z + // if (canvasPaintZindex > canvasZindex) { + // //y = parseInt(canvasPaintZindex) + 1; + // //if (listManagerZindex <= canvasPaintZindex) { + // // listManagerZindex = parseInt(canvasPaintZindex) + 1; + // // $('#listManager').css("z-index", z); + // //} + // //else { + // $('#listManager').css("z-index", (canvasPaintZindex + 2)); + // // } + // } else { + // //y = parseInt(y) + 1; + // $('#listManager').css("z-index", canvasZindex); + // } - } + //} diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html index cfeb3dc..b46a7f1 100644 --- a/400-SOURCECODE/AIAHTML5.Web/index.html +++ b/400-SOURCECODE/AIAHTML5.Web/index.html @@ -738,7 +738,7 @@ top: 170px; left: 140px; display: none; - z-index: 110000; + z-index: 780000; } #listManager .annotation-modal-header { -- libgit2 0.21.4