ADAM / AIAHTML5

Commit 6bc1bf7b2ee09ca89042cd054a5207b763ef0642

Authored by unknown
1 parent 0eda95c0

Commit Changes

Inline Side-by-side
Showing 2 changed files with 44 additions and 45 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @6bc1bf7
... ... @@ -782,10 +782,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
782 782 $scope.modestyImageInfo = [];
783 783 // annotation toolbar canvas
784 784 if ($("#canvasDiv").find("canvas[id='canvasPaint']").length == 0) {
785   - $("#canvasDiv").append('<canvas id="canvasPaint" width="2277" height="3248" class="canvas-annotationStyle1"></canvas><canvas id="canvas" ng-click="BindCanvasDrawingListners($event)" width="2277" height="3248" class="canvas-annotationStyle"></canvas>');
786   - //var annotationAppendedCanvas =
787   - // $compile(annotationAppendedCanvas)($scope);
788   - // $scope.BindCanvasDrawingListners();
  785 + var annotationAppendedCanvas = $("#canvasDiv").append('<canvas id="canvasPaint" width="2277" height="3248" class="canvas-annotationStyle1"></canvas><canvas id="canvas" ng-click="BindCanvasDrawingListners($event)" width="2277" height="3248" class="canvas-annotationStyle"></canvas>');
  786 + $compile(annotationAppendedCanvas)($scope);
  787 + $scope.BindCanvasDrawingListners();
789 788 // $rootScope.FreeStylePaint();
790 789  
791 790 }
... ... @@ -2996,7 +2995,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2996 2995  
2997 2996  
2998 2997  
2999   - if ($rootScope.isAnnotaionToolBarPopupClosed == true) {
  2998 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) {
3000 2999 $("#sppeachBubble").remove();
3001 3000 $("#dot").remove();
3002 3001 }
... ... @@ -3110,7 +3109,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3110 3109 //history maintained issue
3111 3110  
3112 3111  
3113   - if ($rootScope.isAnnotaionToolBarPopupClosed == true) { document.getElementById('sppeachBubble').style.zIndex = "100000000000"; }
  3112 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) { document.getElementById('sppeachBubble').style.zIndex = "100000000000"; }
3114 3113  
3115 3114  
3116 3115  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @6bc1bf7
... ... @@ -169,7 +169,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
169 169 //annotation tool custom events
170 170 $rootScope.ShowAnnotationWindow = function () {
171 171  
172   - $rootScope.isAnnotaionToolBarPopupClosed == true;
  172 + // $rootScope.isAnnotaionToolBarDrawingModeActive == true;
173 173  
174 174 //7904
175 175 if ($rootScope.MenuModuleName == "DA") {
... ... @@ -239,7 +239,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
239 239 // $("#canvas").css("display", "none");
240 240 $('.btnCursor').removeClass('activebtncolor');
241 241 $(".btn-annotation").removeClass("activebtncolor");
242   - $rootScope.isAnnotaionToolBarPopupClosed = true;
  242 + $rootScope.isAnnotaionToolBarDrawingModeActive = true;
243 243 }
244 244 $rootScope.CIAnotationIdentifyModeOff = false;
245 245 $rootScope.OnIdentifyClick = function () {
... ... @@ -261,13 +261,13 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
261 261 $('.btnCursor').removeClass('activebtncolor');
262 262  
263 263 }
264   - $rootScope.isAnnotaionToolBarPopupClosed = true;
  264 + $rootScope.isAnnotaionToolBarDrawingModeActive = true;
265 265 }
266 266  
267 267  
268 268  
269 269 $rootScope.DrawingMode = function () {
270   - $rootScope.isAnnotaionToolBarPopupClosed = false;
  270 + $rootScope.isAnnotaionToolBarDrawingModeActive = false;
271 271 $("#OnIdentify").removeClass("annotationtoolbartab");
272 272 $("#DrawMode").addClass("annotationtoolbartab");
273 273 $('.btnCursor').addClass('activebtncolor');
... ... @@ -560,7 +560,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
560 560 x2: x, y2: y,
561 561  
562 562 click: function (layer) {
563   - if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
  563 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
564 564 layer.draggable = true;
565 565 $rootScope.canvasLayerNameCollection = [];
566 566 $rootScope.canvasLayerNameCollection.push(layer.name);
... ... @@ -580,7 +580,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
580 580  
581 581 },
582 582 mouseout: function (layer) {
583   - if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
  583 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
584 584 layer.draggable = true;
585 585 $rootScope.canvasLayerNameCollection = [];
586 586 $(canvasId).setLayer(layer.name, {
... ... @@ -599,7 +599,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
599 599 }
600 600 },
601 601 mouseover: function (layer) {
602   - if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
  602 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
603 603 layer.draggable = true;
604 604  
605 605 $(canvasId).setLayer(layer.name, {
... ... @@ -647,7 +647,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
647 647 },
648 648  
649 649 click: function (layer) {
650   - if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
  650 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
651 651 layer.draggable = true;
652 652 $rootScope.canvasLayerNameCollection = [];
653 653 $rootScope.canvasLayerNameCollection.push(layer.name);
... ... @@ -667,7 +667,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
667 667 }
668 668 },
669 669 mouseout: function (layer) {
670   - if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
  670 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
671 671 layer.draggable = true;
672 672 $rootScope.canvasLayerNameCollection = [];
673 673 $(canvasId).setLayer(layer.name, {
... ... @@ -688,7 +688,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
688 688 },
689 689 mouseover: function (layer) {
690 690  
691   - if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
  691 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
692 692 layer.draggable = true;
693 693 $(canvasId).setLayer(layer.name, {
694 694 handle: {
... ... @@ -734,7 +734,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
734 734  
735 735  
736 736 click: function (layer) {
737   - if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
  737 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
738 738 layer.draggable = true;
739 739 $rootScope.canvasLayerNameCollection = [];
740 740 $rootScope.canvasLayerNameCollection.push(layer.name);
... ... @@ -753,7 +753,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
753 753 }
754 754 },
755 755 mouseout: function (layer) {
756   - if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
  756 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
757 757 layer.draggable = true;
758 758 $rootScope.canvasLayerNameCollection = [];
759 759 $(canvasId).setLayer(layer.name, {
... ... @@ -775,7 +775,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
775 775 }
776 776 },
777 777 mouseover: function (layer) {
778   - if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
  778 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
779 779 layer.draggable = true;
780 780  
781 781 $(canvasId).setLayer(layer.name, {
... ... @@ -816,7 +816,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
816 816 x2: x, y2: y,
817 817  
818 818 click: function (layer) {
819   - if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
  819 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
820 820 layer.draggable = true;
821 821 $rootScope.canvasLayerNameCollection = [];
822 822 $rootScope.canvasLayerNameCollection.push(layer.name);
... ... @@ -837,7 +837,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
837 837 }
838 838 },
839 839 mouseout: function (layer) {
840   - if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
  840 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
841 841 layer.draggable = true;
842 842 $rootScope.canvasLayerNameCollection = [];
843 843 $(canvasId).setLayer(layer.name, {
... ... @@ -857,7 +857,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
857 857 }
858 858 },
859 859 mouseover: function (layer) {
860   - if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
  860 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
861 861 layer.draggable = true;
862 862  
863 863 $(canvasId).setLayer(layer.name, {
... ... @@ -908,7 +908,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
908 908 x2: x, y2: y,
909 909  
910 910 click: function (layer) {
911   - if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
  911 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
912 912 layer.draggable = true;
913 913 $rootScope.shapeTypePin = "Pin";
914 914 $rootScope.canvasLayerNameCollection = [];
... ... @@ -936,7 +936,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
936 936 }
937 937 },
938 938 mouseout: function (layer) {
939   - if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
  939 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
940 940 layer.draggable = true;
941 941 $rootScope.canvasLayerNameCollection = [];
942 942 $(canvasId).setLayer(layer.name, {
... ... @@ -957,7 +957,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
957 957 },
958 958 mouseover: function (layer) {
959 959  
960   - if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
  960 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
961 961 layer.draggable = true;
962 962 $(canvasId).setLayer(layer.name, {
963 963 handle: {
... ... @@ -1057,7 +1057,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
1057 1057  
1058 1058 },
1059 1059 click: function (layer) {
1060   - if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
  1060 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
1061 1061 layer.draggable = true;
1062 1062 $rootScope.canvasLayerNameCollection = [];
1063 1063 $rootScope.canvasLayerNameCollection.push(layer.name);
... ... @@ -1077,7 +1077,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
1077 1077 }
1078 1078 },
1079 1079 dblclick: function (layer) {
1080   - if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
  1080 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
1081 1081 layer.draggable = true;
1082 1082 $rootScope.IsTextAlreadySave = false;
1083 1083 var RectNameArray = (layer.name).split("_");
... ... @@ -1117,7 +1117,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
1117 1117 }
1118 1118 },
1119 1119 mouseout: function (layer) {
1120   - if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
  1120 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
1121 1121 layer.draggable = true;
1122 1122 $rootScope.canvasLayerNameCollection = [];
1123 1123 $('#canvas').setLayer(layer.name, {
... ... @@ -1137,7 +1137,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
1137 1137 }
1138 1138 },
1139 1139 mouseover: function (layer) {
1140   - if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
  1140 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
1141 1141 layer.draggable = true;
1142 1142 $('#canvas').setLayer(layer.name, {
1143 1143 handle: {
... ... @@ -1272,7 +1272,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
1272 1272  
1273 1273 case "Line":
1274 1274 //$rootScope.canvasLayerNameCollection = [];
1275   - $rootScope.isAnnotaionToolBarPopupClosed = false;
  1275 + $rootScope.isAnnotaionToolBarDrawingModeActive = false;
1276 1276 $rootScope.LineNumber = $rootScope.ObjectIndex++;
1277 1277  
1278 1278 $rootScope.LineFn('#canvas', $rootScope.LineNumber, $rootScope.shapestyleborderColor, $rootScope.shapestyleborderWidth, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y)
... ... @@ -1280,21 +1280,21 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
1280 1280 break;
1281 1281  
1282 1282 case "Rectangle":
1283   - $rootScope.isAnnotaionToolBarPopupClosed = false;
  1283 + $rootScope.isAnnotaionToolBarDrawingModeActive = false;
1284 1284 $rootScope.rectNumber = $rootScope.ObjectIndex++;
1285 1285 $rootScope.RectangleFn('#canvas', $rootScope.rectNumber, $rootScope.shapestyleFillColor, $rootScope.shapestyleborderColor, $rootScope.shapestyleOpacity, $rootScope.shapestyleborderWidth, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y);
1286 1286  
1287 1287 break;
1288 1288  
1289 1289 case "Circle":
1290   - $rootScope.isAnnotaionToolBarPopupClosed = false;
  1290 + $rootScope.isAnnotaionToolBarDrawingModeActive = false;
1291 1291 // alert($rootScope.shapestyleborderWidth);
1292 1292 $rootScope.CircleNumber = $rootScope.ObjectIndex++;
1293 1293  
1294 1294 $rootScope.CircleFn('#canvas', $rootScope.CircleNumber, $rootScope.shapestyleOpacity, $rootScope.shapestyleborderColor, $rootScope.shapestyleborderWidth, $rootScope.shapestyleFillColor, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y);
1295 1295 break;
1296 1296 case "Arrow":
1297   - $rootScope.isAnnotaionToolBarPopupClosed = false;
  1297 + $rootScope.isAnnotaionToolBarDrawingModeActive = false;
1298 1298 $rootScope.ArrowNumber = $rootScope.ObjectIndex++;
1299 1299  
1300 1300 $rootScope.ArrowFn('#canvas', $rootScope.ArrowNumber, $rootScope.shapestyleborderColor, $rootScope.shapestyleborderWidth, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y);
... ... @@ -1302,14 +1302,14 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
1302 1302 // $scope.resetRect += 1;
1303 1303 break;
1304 1304 case "Pin":
1305   - $rootScope.isAnnotaionToolBarPopupClosed = false;
  1305 + $rootScope.isAnnotaionToolBarDrawingModeActive = false;
1306 1306 $rootScope.PinNumber = $rootScope.PinObjectIndex++;
1307 1307 $rootScope.PinArcNumber = $rootScope.ArcObjectIndex++;
1308 1308 $rootScope.PinFn('#canvas', $rootScope.PinNumber, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y, $rootScope.PinArcNumber);
1309 1309  
1310 1310 break;
1311 1311 case "TextArea":
1312   - $rootScope.isAnnotaionToolBarPopupClosed = false;
  1312 + $rootScope.isAnnotaionToolBarDrawingModeActive = false;
1313 1313 $rootScope.IsTextAlreadySave = false;
1314 1314 $("#text_area").val('');
1315 1315 // Draw text
... ... @@ -1319,7 +1319,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
1319 1319 break;
1320 1320  
1321 1321 case "DrawPolygon":
1322   - // $rootScope.isAnnotaionToolBarPopupClosed = false;
  1322 + // $rootScope.isAnnotaionToolBarDrawingModeActive = false;
1323 1323 break;
1324 1324  
1325 1325 }
... ... @@ -1397,7 +1397,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
1397 1397 width: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].width,
1398 1398 height: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].height,
1399 1399 click: function (layer) {
1400   - if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
  1400 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
1401 1401 layer.draggable = true;
1402 1402 $rootScope.shapeTypeText = "textAreaRect";
1403 1403  
... ... @@ -1423,7 +1423,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
1423 1423 }
1424 1424 },
1425 1425 dblclick: function (layer) {
1426   - if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
  1426 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
1427 1427 layer.draggable = true;
1428 1428 $rootScope.isTextAreaClosedButtonActive = false;
1429 1429 $rootScope.IsTextAlreadySave = true;
... ... @@ -1601,7 +1601,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
1601 1601 }
1602 1602 },
1603 1603 mouseout: function (layer) {
1604   - if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
  1604 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
1605 1605 layer.draggable = true;
1606 1606 $rootScope.canvasLayerNameCollection = [];
1607 1607 $('#canvas').setLayer(layer.name, {
... ... @@ -1620,7 +1620,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
1620 1620 }
1621 1621 },
1622 1622 mouseover: function (layer) {
1623   - if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
  1623 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
1624 1624 layer.draggable = true;
1625 1625 $('#canvas').setLayer(layer.name, {
1626 1626 handle: {
... ... @@ -1721,7 +1721,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
1721 1721 width: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].width,
1722 1722 height: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].height,
1723 1723 click: function (layer) {
1724   - if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
  1724 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
1725 1725 layer.draggable = true;
1726 1726 $rootScope.shapeTypeText = "textAreaRect";
1727 1727 var layerNameSplit = layer.name;
... ... @@ -1748,7 +1748,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
1748 1748 }
1749 1749 },
1750 1750 dblclick: function (layer) {
1751   - if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
  1751 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
1752 1752 layer.draggable = true;
1753 1753  
1754 1754 $rootScope.isTextAreaClosedButtonActive = false;
... ... @@ -1843,7 +1843,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
1843 1843 }
1844 1844 },
1845 1845 mouseout: function (layer) {
1846   - if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
  1846 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
1847 1847 layer.draggable = true;
1848 1848 $rootScope.canvasLayerNameCollection = [];
1849 1849 $('#canvas').setLayer(layer.name, {
... ... @@ -1862,7 +1862,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
1862 1862 }
1863 1863 },
1864 1864 mouseover: function (layer) {
1865   - if ($rootScope.isAnnotaionToolBarPopupClosed == false) {
  1865 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
1866 1866 layer.draggable = true;
1867 1867 $('#canvas').setLayer(layer.name, {
1868 1868 handle: {
... ... @@ -1898,7 +1898,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
1898 1898 }
1899 1899 // alert("doclick");
1900 1900 if (event != undefined) {
1901   - if ($rootScope.isAnnotaionToolBarPopupClosed == true) {
  1901 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) {
1902 1902  
1903 1903 $rootScope.DrawingListners_Canvas(event);
1904 1904  
... ...