From 7fd3ba4ac5c627a76ba6a84ce519a5cdc8c08f34 Mon Sep 17 00:00:00 2001 From: nikita Date: Thu, 2 Mar 2017 17:43:11 +0530 Subject: [PATCH] renamed varibale --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 4 ++-- 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index e0f331a..fae0173 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -2896,7 +2896,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo if (($("#canvasPaint").css("display") == "block") && ($("#canvas").css("display") == "block")){ - if ($rootScope.isAnnotatiomToolBarPopupOpenOnLayerChange == false) { + if ($rootScope.isAnnotatiomToolBarPopupActive == false) { if ($("#transparencyScale").css("display") == "block") { $rootScope.switchToTransparencycanvas(); @@ -2916,7 +2916,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } else { - if ($rootScope.isAnnotatiomToolBarPopupOpenOnLayerChange == true) { + if ($rootScope.isAnnotatiomToolBarPopupActive == true) { $rootScope.CloseAnnotationTool(); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index 1b3c58a..45e4a20 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -511,7 +511,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic //annotation tool custom events $rootScope.ShowAnnotationWindow = function () { //7904 - $rootScope.isAnnotatiomToolBarPopupOpenOnLayerChange = true; + $rootScope.isAnnotatiomToolBarPopupActive = true; $rootScope.isAnnotatiomToolBarPopupClosed = false; $rootScope.isAnnotaionToolBarDrawingModeActive = false; if ($rootScope.MenuModuleName == "DA" || $rootScope.MenuModuleName == "CI") { @@ -583,7 +583,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $rootScope.CloseAnnotationTool = function () { console.log('close'); - $rootScope.isAnnotatiomToolBarPopupOpenOnLayerChange = false; + $rootScope.isAnnotatiomToolBarPopupActive = false; $rootScope.isAnnotatiomToolBarPopupClosed = true; $("#OnIdentify").removeClass("annotationtoolbartab"); $("#DrawMode").removeClass("annotationtoolbartab"); -- libgit2 0.21.4