From 0905fa98582cd8402d11ae434946960f70c5bed1 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 18 Sep 2017 10:37:22 +0530 Subject: [PATCH] Commit Changes --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js | 54 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index 1e3b7fb..92ab7bb 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -855,23 +855,21 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic if ($location.url() == "/module-item-view") { - var a = $("#canvas").css("z-index"); - var b = $("#canvasPaint").css("z-index"); + var canvasZIndex = $("#canvas").css("z-index"); + var canvasPaintZIndex = $("#canvasPaint").css("z-index"); - if (parseInt(a) < parseInt(b)) { - b = parseInt(b) + 1; - $("#aaDetailViewCanvas").css("z-index", b); + if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) { + canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1; + $("#aaDetailViewCanvas").css("z-index", canvasPaintZIndex); } else { - a = parseInt(a) + 1; - $("#aaDetailViewCanvas").css("z-index", a); + canvasZIndex = parseInt(canvasZIndex) + 1; + $("#aaDetailViewCanvas").css("z-index", canvasZIndex); } } - - } $rootScope.CloseAnnotationTool = function () { @@ -929,17 +927,17 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic } if ($location.url() == "/module-item-view") { - var a = $("#canvas").css("z-index"); - var b = $("#canvasPaint").css("z-index"); + var canvasZIndex = $("#canvas").css("z-index"); + var canvasPaintZIndex = $("#canvasPaint").css("z-index"); - if (parseInt(a) < parseInt(b)) { - b = parseInt(b) + 1; - $("#aaDetailViewCanvas").css("z-index", b); + if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) { + canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1; + $("#aaDetailViewCanvas").css("z-index", canvasPaintZIndex); } else { - a = parseInt(a) + 1; - $("#aaDetailViewCanvas").css("z-index", a); + canvasZIndex = parseInt(canvasZIndex) + 1; + $("#aaDetailViewCanvas").css("z-index", canvasZIndex); } for (var i = 0; i <= $rootScope.jcanvasObjectArray.length - 1; i++) { @@ -1128,15 +1126,15 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic } $rootScope.switchToAACanvas = function () { - var a = $("#aaDetailViewCanvas").css("z-index"); - var b = $("#canvasPaint").css("z-index"); - if (parseInt(a) < parseInt(b)) { - b = parseInt(b) + 1; - $("#canvas").css("z-index", b); + var aaViewCanvasZIndex = $("#aaDetailViewCanvas").css("z-index"); + var canvasPaintZIndex = $("#canvasPaint").css("z-index"); + if (parseInt(aaViewCanvasZIndex) < parseInt(canvasPaintZIndex)) { + canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1; + $("#canvas").css("z-index", canvasPaintZIndex); } else { - a = parseInt(a) + 1; - $("#canvas").css("z-index", a); + aaViewCanvasZIndex = parseInt(aaViewCanvasZIndex) + 1; + $("#canvas").css("z-index", aaViewCanvasZIndex); } } @@ -1948,8 +1946,16 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic //added abs width: Math.abs(x - offsetX1), height: Math.abs(y - offsetY1), // Place a handle at each side and each corner - resizeFromCenter: false, + resizeFromCenter: true, handlePlacement: 'both', + cursors: { + // Show pointer on hover + mouseover: 'pointer', + // Show 'move' cursor on mousedown + mousedown: 'move', + // Revert cursor on mouseup + mouseup: 'pointer' + }, add: function (layer) { if ($location.path() == "/module-item-view") { -- libgit2 0.21.4