ADAM / AIAHTML5

Commit 290c782a7e05ee0a7755ab7508704377fa95cfd1

Authored by unknown
1 parent 2da8c53a

Commit Changes

Inline Side-by-side
Showing 1 changed file with 2 additions and 3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @290c782
@@ -264,7 +264,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -264,7 +264,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
264 //annotation tool custom events 264 //annotation tool custom events
265 $rootScope.ShowAnnotationWindow = function () { 265 $rootScope.ShowAnnotationWindow = function () {
266 //7904 266 //7904
267 - $rootScope.isAnnotaionToolBarDrawingModeActive = false;  
268 if ($rootScope.MenuModuleName == "DA" || $rootScope.MenuModuleName == "CI") { 267 if ($rootScope.MenuModuleName == "DA" || $rootScope.MenuModuleName == "CI") {
269 if ($rootScope.disableAnnotationtoolOnListManager == true) { 268 if ($rootScope.disableAnnotationtoolOnListManager == true) {
270 $('#AnnotaionPopupDiv').find('a,input, textarea, button, select,img,div').attr('disabled', 'disabled'); 269 $('#AnnotaionPopupDiv').find('a,input, textarea, button, select,img,div').attr('disabled', 'disabled');
@@ -339,7 +338,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -339,7 +338,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
339 // $("#canvas").css("display", "none"); 338 // $("#canvas").css("display", "none");
340 $('.btnCursor').removeClass('activebtncolor'); 339 $('.btnCursor').removeClass('activebtncolor');
341 $(".btn-annotation").removeClass("activebtncolor"); 340 $(".btn-annotation").removeClass("activebtncolor");
342 - $rootScope.isAnnotaionToolBarDrawingModeActive = false; 341 + $rootScope.isAnnotaionToolBarDrawingModeActive = true;
343 $rootScope.switchCanvas(); 342 $rootScope.switchCanvas();
344 } 343 }
345 $rootScope.CIAnotationIdentifyModeOff = false; 344 $rootScope.CIAnotationIdentifyModeOff = false;
@@ -571,7 +570,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -571,7 +570,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
571 $rootScope.switchCanvas(); 570 $rootScope.switchCanvas();
572 $rootScope.isEraseToolSelected = true; 571 $rootScope.isEraseToolSelected = true;
573 //$rootScope.switchCanvasToPaintCanvas(); 572 //$rootScope.switchCanvasToPaintCanvas();
574 - $('.btnCursor').removeClass('activebtncolor'); 573 + $('.btnCursor').removeClass('activebtncolor');
575 $(".btn-annotation").removeClass("activebtncolor"); 574 $(".btn-annotation").removeClass("activebtncolor");
576 $(".btn-annotation-erase").addClass("activebtncolor"); 575 $(".btn-annotation-erase").addClass("activebtncolor");
577 } 576 }