Merge branch 'TransparencyBoxResizingIssue1' into Develop

Nikita Kulshreshtha
2 parents ee65ccfa 7fd3ba4a
Showing 2 changed files with 19 additions and 5 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -2881,8 +2881,22 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.layerNumber));
+        // Annotations Closing Code
+
+        $('.com_anno').remove();
+
+        $('#sppeachBubble_annotation').remove();
+        $('#dot_annotation').remove();
+        $('#bord_annotation').remove();
+
+        $('#dot').remove();
+        $('#sppeachBubble').remove();
+        $(".com").remove();
+        $("#bord").remove();
+
+
         if (($("#canvasPaint").css("display") == "block") && ($("#canvas").css("display") == "block")){
-            if ($rootScope.isAnnotatiomToolBarPopupOpenOnLayerChange == false) {
+            if ($rootScope.isAnnotatiomToolBarPopupActive == false) {
             if ($("#transparencyScale").css("display") == "block") {
                 $rootScope.switchToTransparencycanvas();
@@ -2902,7 +2916,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         }
         else
         {
-            if ($rootScope.isAnnotatiomToolBarPopupOpenOnLayerChange == true) {
+            if ($rootScope.isAnnotatiomToolBarPopupActive == true) {
                 $rootScope.CloseAnnotationTool();
@@ -6893,7 +6907,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             $scope.male = "";
             $scope.female = "active";
         }
-
+        $rootScope.CloseAnnotationTool();
     }
@@ -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");