Commit 7fd3ba4ac5c627a76ba6a84ce519a5cdc8c08f34
1 parent
ab2b0877
renamed varibale
Showing
2 changed files
with
4 additions
and
4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
... | ... | @@ -2896,7 +2896,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
2896 | 2896 | |
2897 | 2897 | |
2898 | 2898 | if (($("#canvasPaint").css("display") == "block") && ($("#canvas").css("display") == "block")){ |
2899 | - if ($rootScope.isAnnotatiomToolBarPopupOpenOnLayerChange == false) { | |
2899 | + if ($rootScope.isAnnotatiomToolBarPopupActive == false) { | |
2900 | 2900 | |
2901 | 2901 | if ($("#transparencyScale").css("display") == "block") { |
2902 | 2902 | $rootScope.switchToTransparencycanvas(); |
... | ... | @@ -2916,7 +2916,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
2916 | 2916 | } |
2917 | 2917 | else |
2918 | 2918 | { |
2919 | - if ($rootScope.isAnnotatiomToolBarPopupOpenOnLayerChange == true) { | |
2919 | + if ($rootScope.isAnnotatiomToolBarPopupActive == true) { | |
2920 | 2920 | |
2921 | 2921 | $rootScope.CloseAnnotationTool(); |
2922 | 2922 | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
... | ... | @@ -511,7 +511,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
511 | 511 | //annotation tool custom events |
512 | 512 | $rootScope.ShowAnnotationWindow = function () { |
513 | 513 | //7904 |
514 | - $rootScope.isAnnotatiomToolBarPopupOpenOnLayerChange = true; | |
514 | + $rootScope.isAnnotatiomToolBarPopupActive = true; | |
515 | 515 | $rootScope.isAnnotatiomToolBarPopupClosed = false; |
516 | 516 | $rootScope.isAnnotaionToolBarDrawingModeActive = false; |
517 | 517 | if ($rootScope.MenuModuleName == "DA" || $rootScope.MenuModuleName == "CI") { |
... | ... | @@ -583,7 +583,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
583 | 583 | |
584 | 584 | $rootScope.CloseAnnotationTool = function () { |
585 | 585 | console.log('close'); |
586 | - $rootScope.isAnnotatiomToolBarPopupOpenOnLayerChange = false; | |
586 | + $rootScope.isAnnotatiomToolBarPopupActive = false; | |
587 | 587 | $rootScope.isAnnotatiomToolBarPopupClosed = true; |
588 | 588 | $("#OnIdentify").removeClass("annotationtoolbartab"); |
589 | 589 | $("#DrawMode").removeClass("annotationtoolbartab"); | ... | ... |