Commit 7fd3ba4ac5c627a76ba6a84ce519a5cdc8c08f34

Authored by Nikita Kulshreshtha
1 parent ab2b0877

renamed varibale

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