ADAM / AIAHTML5

Commit e295de62445bbc20b76553cbf84a5df1d2268a2a

Authored by Nikita Kulshreshtha
2 parents 5ffc065e 9d188e01

Merge branch 'AnnotationIssueInPopup' into Develop

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