#6062-Extract view is not disabled in transparency mode.

#7552- Click is disabled within the image area if open annotation toolbar and and closing without doing anything

#6062-Extract view is not disabled in transparency mode.
#7552- Click is disabled within the image area if open annotation toolbar and and closing without doing anything
unknown
1 parent d5ffa0b1
Showing 2 changed files with 92 additions and 62 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -3400,35 +3400,44 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     };
-
+    $rootScope.isTransparencyBoxActivated = false;
     $scope.createTransparencyBox = function () {
+       
+        $rootScope.isTransparencyBoxActivated = true;
+ 
+        if ($rootScope.isExtractButtonActive == false) {
-
-        //if listanager is visisble then close it
-     
+            //if listanager is visisble then close it
+            $("#btnExtract").addClass("disabled");
             $rootScope.isListManagerSelected = false;
             $rootScope.CloseListManager();
-        $scope.isTransparencyActivated = true;
-        //   alert('transparencyClicked' + $scope.isTransparencyActivated)
-        $('#btnTranparency').addClass('tButtonActive');
-        $('#btnIdentity').removeClass(' btn-primary');
-        $('#btnIdentity').addClass('btn-black');
+            $scope.isTransparencyActivated = true;
+         
+            $('#btnTranparency').addClass('tButtonActive');
+            $('#btnIdentity').removeClass(' btn-primary');
+            $('#btnIdentity').addClass('btn-black');
-        var canvasDiv = document.getElementById('canvasDiv');
-        $scope.verticalScrollPosition = canvasDiv.scrollTop;
-        $scope.horizontlScrollPosition = canvasDiv.scrollLeft;
+            var canvasDiv = document.getElementById('canvasDiv');
+            $scope.verticalScrollPosition = canvasDiv.scrollTop;
+            $scope.horizontlScrollPosition = canvasDiv.scrollLeft;
-        var canvasDiv = document.getElementById('canvasDiv');
-        canvasDiv.addEventListener("mousedown", mouseDownListener);
+            var canvasDiv = document.getElementById('canvasDiv');
+            canvasDiv.addEventListener("mousedown", mouseDownListener);
-        canvasDiv.addEventListener("mousemove", mouseMoveListener);
+            canvasDiv.addEventListener("mousemove", mouseMoveListener);
-        canvasDiv.addEventListener("mouseup", mouseUpListener)
+            canvasDiv.addEventListener("mouseup", mouseUpListener)
-    }
+        }
+        else
+        {
+            console.log("extract button is active");
+
+        }
+    }
     function mouseDownListener(e) {
         //Dated:18-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected.
         var tCanvas = document.getElementById('transparencyCanvas');
@@ -4496,7 +4505,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     }
     $scope.CloseTransparencyBox = function () {
-
+        $rootScope.isTransparencyBoxActivated = false;
+        $("#btnExtract").removeClass("disabled");
         $('.com_anno').css('display', 'none');
         $('#sppeachBubble_annotation').css('display', 'none');
@@ -4860,7 +4870,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     }
     $scope.enableNormalMode = function () {
-              
+        
+        
+
+        $rootScope.isExtractButtonActive = false;
+        $("#btnTranparency").removeClass("disabled");
         console.log('enableNormalMode is called');
@@ -4921,70 +4935,82 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             $("#btnHighLight").removeClass("btn-primary");
         }
     }
-
+    $rootScope.isExtractButtonActive = false;
     $scope.enableExtract = function () {
+        if ($rootScope.isTransparencyBoxActivated == true) {
+            $("#btnExtract").addClass("disabled");
+        }
+        else
+        {
-        //if listanager is visisble then close it
-
-       // $rootScope.isListManagerSelected = false;
-        $rootScope.CloseListManager();
-        //1.
-        $rootScope.isLoading = true;
-        $('#spinner').css('visibility', 'visible');
-
-        //2.
-        $scope.terminateCurrentlyRunningWPs();
+            //disable transparency button
+            $rootScope.isExtractButtonActive = true;
+            $("#btnTranparency").addClass("disabled");
-        //3.
-        if ($rootScope.isExtract == true) {
+            //if listanager is visisble then close it
-        }
-        else {
-            $rootScope.isExtract = true;
+            // $rootScope.isListManagerSelected = false;
+            $rootScope.CloseListManager();
+            //1.
+            $rootScope.isLoading = true;
+            $('#spinner').css('visibility', 'visible');
+            //2.
+            $scope.terminateCurrentlyRunningWPs();
-            if ($rootScope.isNormalMode == true) {
+            //3.
+            if ($rootScope.isExtract == true) {
-                $rootScope.isHighLight = false;
-                $rootScope.isNormalMode = false;
             }
             else {
-                $rootScope.isNormalMode = false;
-                $rootScope.isHighLight = false;
-            }
+                $rootScope.isExtract = true;
-            //4.
-            console.log('highLightBody from enableExtract')
-            $scope.highLightBody();
+                if ($rootScope.isNormalMode == true) {
-        }
+                    $rootScope.isHighLight = false;
+                    $rootScope.isNormalMode = false;
+                }
+                else {
+                    $rootScope.isNormalMode = false;
+                    $rootScope.isHighLight = false;
+                }
-        //5. unhighlight other
-        //$scope.Normal = "";
-        //$scope.Extract = "LeftButtonsDefaultState";
-        //$scope.Highlight = "";
+                //4.
+                console.log('highLightBody from enableExtract')
+                $scope.highLightBody();
-        $("#btnExtract").addClass("btn-primary");
-        $("#btnExtract").removeClass("btn-black");
-        if (!$("#btnNormalMode").hasClass("btn-black")) {
-            $("#btnNormalMode").addClass("btn-black");
-        }
+            }
-        if (!$("#btnHighLight").hasClass("btn-black")) {
-            $("#btnHighLight").addClass("btn-black");
-        }
+            //5. unhighlight other
+            //$scope.Normal = "";
+            //$scope.Extract = "LeftButtonsDefaultState";
+            //$scope.Highlight = "";
-        if ($("#btnNormalMode").hasClass("btn-primary")) {
-            $("#btnNormalMode").removeClass("btn-primary");
-        }
+            $("#btnExtract").addClass("btn-primary");
+            $("#btnExtract").removeClass("btn-black");
+
+            if (!$("#btnNormalMode").hasClass("btn-black")) {
+                $("#btnNormalMode").addClass("btn-black");
+            }
+
+            if (!$("#btnHighLight").hasClass("btn-black")) {
+                $("#btnHighLight").addClass("btn-black");
+            }
+
+            if ($("#btnNormalMode").hasClass("btn-primary")) {
+                $("#btnNormalMode").removeClass("btn-primary");
+            }
+
+            if ($("#btnHighLight").hasClass("btn-primary")) {
+                $("#btnHighLight").removeClass("btn-primary");
+            }
-        if ($("#btnHighLight").hasClass("btn-primary")) {
-            $("#btnHighLight").removeClass("btn-primary");
         }
+       
     }
     $scope.enableShowHideStructureBox = function () {
@@ -127,6 +127,10 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
             console.log('close')
             $(".annotationTollbar").css("display", "none");
             $rootScope.isAnnotationWindowClose = true;
+            //Click is disabled within the image area if open annotation toolbar and and closing without doing anything
+            $("#canvasPaint").css("display", "none");
+            $("#canvas").css("display", "none");
+
         }
         $rootScope.OnIdentifyClick = function () {