Commit f562c0f020d7553078c59d0be059bc408e470f29
1 parent
b1701fb2
Commit Changes
Showing
1 changed file
with
23 additions
and
10 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
| @@ -965,7 +965,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -965,7 +965,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
| 965 | } | 965 | } |
| 966 | 966 | ||
| 967 | $rootScope.switchToTransparencycanvas = function () { | 967 | $rootScope.switchToTransparencycanvas = function () { |
| 968 | - | 968 | + |
| 969 | if ($rootScope.isTBoxModestyVisible == true) { | 969 | if ($rootScope.isTBoxModestyVisible == true) { |
| 970 | var modestyTransCanvases = $("canvas[id*='modestyTransCanavs']"); | 970 | var modestyTransCanvases = $("canvas[id*='modestyTransCanavs']"); |
| 971 | if (modestyTransCanvases != null || modestyTransCanvases != undefined && modestyTransCanvases.length > 0) { | 971 | if (modestyTransCanvases != null || modestyTransCanvases != undefined && modestyTransCanvases.length > 0) { |
| @@ -984,13 +984,12 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -984,13 +984,12 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
| 984 | $("#canvas").css("z-index", MaxZindexVal); | 984 | $("#canvas").css("z-index", MaxZindexVal); |
| 985 | if ($rootScope.currentBodyViewId == "11") { | 985 | if ($rootScope.currentBodyViewId == "11") { |
| 986 | $(".ui-wrapper").css("z-index", MaxZindexVal + 1); | 986 | $(".ui-wrapper").css("z-index", MaxZindexVal + 1); |
| 987 | - $('#' + ctx.getAttribute("id")).css("z-index", MaxZindexVal); | 987 | + $('#' + ctx.getAttribute("id")).css("z-index", MaxZindexVal); |
| 988 | 988 | ||
| 989 | } | 989 | } |
| 990 | - else | 990 | + else { |
| 991 | $('#' + ctx.getAttribute("id")).css("z-index", MaxZindexVal); | 991 | $('#' + ctx.getAttribute("id")).css("z-index", MaxZindexVal); |
| 992 | - | ||
| 993 | - | 992 | + } |
| 994 | } | 993 | } |
| 995 | else { | 994 | else { |
| 996 | var drawCanvasZindex = $("#canvas").css("z-index"); | 995 | var drawCanvasZindex = $("#canvas").css("z-index"); |
| @@ -1000,11 +999,19 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -1000,11 +999,19 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
| 1000 | MaxZindexVal = parseInt(MaxZindexVal + 1); | 999 | MaxZindexVal = parseInt(MaxZindexVal + 1); |
| 1001 | 1000 | ||
| 1002 | if ($("#annotationpaintbrushsize").hasClass("activebtncolor") || $("#annotationpainteraser").hasClass("activebtncolor")) { | 1001 | if ($("#annotationpaintbrushsize").hasClass("activebtncolor") || $("#annotationpainteraser").hasClass("activebtncolor")) { |
| 1003 | - | ||
| 1004 | $("#canvasPaint").css("z-index", MaxZindexVal); | 1002 | $("#canvasPaint").css("z-index", MaxZindexVal); |
| 1005 | } | 1003 | } |
| 1006 | else { | 1004 | else { |
| 1005 | + | ||
| 1007 | $("#canvas").css("z-index", MaxZindexVal); | 1006 | $("#canvas").css("z-index", MaxZindexVal); |
| 1007 | + if ($rootScope.currentBodyViewId == "11") { | ||
| 1008 | + $(".ui-wrapper").css("z-index", MaxZindexVal); | ||
| 1009 | + } | ||
| 1010 | + else | ||
| 1011 | + { | ||
| 1012 | + $('#' + ctx.getAttribute("id")).css("z-index", MaxZindexVal); | ||
| 1013 | + } | ||
| 1014 | + | ||
| 1008 | } | 1015 | } |
| 1009 | 1016 | ||
| 1010 | } | 1017 | } |
| @@ -1417,7 +1424,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -1417,7 +1424,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
| 1417 | 1424 | ||
| 1418 | 1425 | ||
| 1419 | $rootScope.switchCanvas = function () { | 1426 | $rootScope.switchCanvas = function () { |
| 1420 | - debugger; | 1427 | + |
| 1421 | if ($rootScope.isTBoxModestyVisible == true) { | 1428 | if ($rootScope.isTBoxModestyVisible == true) { |
| 1422 | var modestyTransCanvases = $("canvas[id*='modestyTransCanavs']"); | 1429 | var modestyTransCanvases = $("canvas[id*='modestyTransCanavs']"); |
| 1423 | if (modestyTransCanvases != null || modestyTransCanvases != undefined && modestyTransCanvases.length > 0) { | 1430 | if (modestyTransCanvases != null || modestyTransCanvases != undefined && modestyTransCanvases.length > 0) { |
| @@ -1442,11 +1449,17 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -1442,11 +1449,17 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
| 1442 | else { | 1449 | else { |
| 1443 | 1450 | ||
| 1444 | if ($("#annotationpaintbrushsize").hasClass("activebtncolor") || $("#annotationpainteraser").hasClass("activebtncolor")) { | 1451 | if ($("#annotationpaintbrushsize").hasClass("activebtncolor") || $("#annotationpainteraser").hasClass("activebtncolor")) { |
| 1445 | - | ||
| 1446 | - $("#canvasPaint").css("z-index", MaxZindexVal); | 1452 | + if ($rootScope.currentBodyViewId == "11") { $("#canvasPaint").css("z-index", MaxZindexVal + 1); } |
| 1453 | + else{ $("#canvasPaint").css("z-index", MaxZindexVal);} | ||
| 1447 | } | 1454 | } |
| 1448 | else { | 1455 | else { |
| 1449 | - $("#canvas").css("z-index", MaxZindexVal); | 1456 | + if ($rootScope.currentBodyViewId == "11") { |
| 1457 | + $("#canvas").css("z-index", MaxZindexVal + 1); | ||
| 1458 | + } | ||
| 1459 | + else | ||
| 1460 | + { | ||
| 1461 | + $("#canvas").css("z-index", MaxZindexVal); | ||
| 1462 | + } | ||
| 1450 | } | 1463 | } |
| 1451 | 1464 | ||
| 1452 | } | 1465 | } |