Commit e1ae1b5261e40a41f7041155a36f6ea0a6b0e969
1 parent
a5afc658
Changed Name
Showing
1 changed file
with
10 additions
and
10 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
... | ... | @@ -1055,7 +1055,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
1055 | 1055 | |
1056 | 1056 | if ($location.url() == "/module-item-view") { |
1057 | 1057 | |
1058 | - $rootScope.switchToAACanvas(); | |
1058 | + $rootScope.switchToAnnotationCanvas(); | |
1059 | 1059 | |
1060 | 1060 | for (var i = 0; i <= $rootScope.jcanvasObjectArray.length - 1; i++) { |
1061 | 1061 | |
... | ... | @@ -1121,12 +1121,12 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
1121 | 1121 | $rootScope.isAnnotaionToolBarDrawingModeActive = true; |
1122 | 1122 | if ($location.url() == "/module-item-view") { |
1123 | 1123 | |
1124 | - $rootScope.switchToAACanvas(); | |
1124 | + $rootScope.switchToAnnotationCanvas(); | |
1125 | 1125 | |
1126 | 1126 | } |
1127 | 1127 | } |
1128 | 1128 | |
1129 | - $rootScope.switchToAACanvas = function () { | |
1129 | + $rootScope.switchToAnnotationCanvas = function () { | |
1130 | 1130 | var aaViewCanvasZIndex = $("#aaDetailViewCanvas").css("z-index"); |
1131 | 1131 | var canvasPaintZIndex = $("#canvasPaint").css("z-index"); |
1132 | 1132 | if (parseInt(aaViewCanvasZIndex) < parseInt(canvasPaintZIndex)) { |
... | ... | @@ -1158,7 +1158,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
1158 | 1158 | $rootScope.isAnnotaionToolBarDrawingModeActive = true; |
1159 | 1159 | if ($location.url() == "/module-item-view") { |
1160 | 1160 | |
1161 | - $rootScope.switchToAACanvas(); | |
1161 | + $rootScope.switchToAnnotationCanvas(); | |
1162 | 1162 | |
1163 | 1163 | } |
1164 | 1164 | } |
... | ... | @@ -1175,7 +1175,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
1175 | 1175 | $rootScope.isAnnotaionToolBarDrawingModeActive = true; |
1176 | 1176 | if ($location.url() == "/module-item-view") { |
1177 | 1177 | |
1178 | - $rootScope.switchToAACanvas(); | |
1178 | + $rootScope.switchToAnnotationCanvas(); | |
1179 | 1179 | |
1180 | 1180 | } |
1181 | 1181 | } |
... | ... | @@ -1198,7 +1198,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
1198 | 1198 | $rootScope.isAnnotaionToolBarDrawingModeActive = true; |
1199 | 1199 | if ($location.url() == "/module-item-view") { |
1200 | 1200 | |
1201 | - $rootScope.switchToAACanvas(); | |
1201 | + $rootScope.switchToAnnotationCanvas(); | |
1202 | 1202 | |
1203 | 1203 | } |
1204 | 1204 | } |
... | ... | @@ -1343,7 +1343,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
1343 | 1343 | $rootScope.isAnnotaionToolBarDrawingModeActive = true; |
1344 | 1344 | if ($location.url() == "/module-item-view") { |
1345 | 1345 | |
1346 | - $rootScope.switchToAACanvas(); | |
1346 | + $rootScope.switchToAnnotationCanvas(); | |
1347 | 1347 | |
1348 | 1348 | } |
1349 | 1349 | } |
... | ... | @@ -1365,7 +1365,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
1365 | 1365 | $rootScope.isAnnotaionToolBarDrawingModeActive = true; |
1366 | 1366 | if ($location.url() == "/module-item-view") { |
1367 | 1367 | |
1368 | - $rootScope.switchToAACanvas(); | |
1368 | + $rootScope.switchToAnnotationCanvas(); | |
1369 | 1369 | |
1370 | 1370 | } |
1371 | 1371 | } |
... | ... | @@ -1388,7 +1388,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
1388 | 1388 | $rootScope.isAnnotaionToolBarDrawingModeActive = true; |
1389 | 1389 | if ($location.url() == "/module-item-view") { |
1390 | 1390 | |
1391 | - $rootScope.switchToAACanvas(); | |
1391 | + $rootScope.switchToAnnotationCanvas(); | |
1392 | 1392 | |
1393 | 1393 | } |
1394 | 1394 | } |
... | ... | @@ -1403,7 +1403,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
1403 | 1403 | $rootScope.isAnnotaionToolBarDrawingModeActive = true; |
1404 | 1404 | if ($location.url() == "/module-item-view") { |
1405 | 1405 | |
1406 | - $rootScope.switchToAACanvas(); | |
1406 | + $rootScope.switchToAnnotationCanvas(); | |
1407 | 1407 | |
1408 | 1408 | } |
1409 | 1409 | } | ... | ... |