Commit 8e78629fac12ebefb223852c3d4342be72e5d17a
1 parent
8a21167f
Showing
2 changed files
with
9 additions
and
0 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -7007,6 +7007,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -7007,6 +7007,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
7007 | $scope.LateralArmView = ""; | 7007 | $scope.LateralArmView = ""; |
7008 | $scope.MedialArmView = "active"; | 7008 | $scope.MedialArmView = "active"; |
7009 | } | 7009 | } |
7010 | + //13573 | ||
7011 | + $("#sppeachBubble").remove(); | ||
7012 | + $("#bord").remove(); | ||
7013 | + $("#dot").remove(); | ||
7014 | + $(".com").remove(); | ||
7015 | + $rootScope.CloseAnnotationTool(); | ||
7016 | + | ||
7010 | } | 7017 | } |
7011 | 7018 | ||
7012 | //Reload DA controller event listener after setting change | 7019 | //Reload DA controller event listener after setting change |
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -344,6 +344,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -344,6 +344,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
344 | $rootScope.isAnnotaionToolBarDrawingModeActive = false; | 344 | $rootScope.isAnnotaionToolBarDrawingModeActive = false; |
345 | 345 | ||
346 | $rootScope.switchCanvas(); | 346 | $rootScope.switchCanvas(); |
347 | + $rootScope.shapeType = ''; | ||
347 | } | 348 | } |
348 | $rootScope.CIAnotationIdentifyModeOff = false; | 349 | $rootScope.CIAnotationIdentifyModeOff = false; |
349 | $rootScope.OnIdentifyClick = function () { | 350 | $rootScope.OnIdentifyClick = function () { |
@@ -1393,6 +1394,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -1393,6 +1394,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
1393 | $rootScope.lastX; $rootScope.lastY; | 1394 | $rootScope.lastX; $rootScope.lastY; |
1394 | var ctx; | 1395 | var ctx; |
1395 | $rootScope.OnPaintCanvasMouseDown = function (event) { | 1396 | $rootScope.OnPaintCanvasMouseDown = function (event) { |
1397 | + | ||
1396 | if ($rootScope.isAnnotatiomToolBarPopupClosed == false) { | 1398 | if ($rootScope.isAnnotatiomToolBarPopupClosed == false) { |
1397 | var canvasElement = document.getElementById("canvas"); | 1399 | var canvasElement = document.getElementById("canvas"); |
1398 | var ctx = canvasElement.getContext("2d"); | 1400 | var ctx = canvasElement.getContext("2d"); |