Merge branch 'TBIssue1' of http://52.6.196.163/ADAM/AIAHTML5 into TBIssue1

Nikita Kulshreshtha
2 parents 4b280fff c55173ee
Showing 1 changed file with 13 additions and 8 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -5646,18 +5646,23 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     }
     $scope.CloseTransparencyBox = function () {
-
-
+     
+        //for enabling annoataions. 
+        //Now everything si done on canavases uswed in annotation toolbar.
+      
+        if (parseInt($("#canvasPaint").css("z-index")) > parseInt($("#canvas").css("z-index")))
+        {
+            $rootScope.switchCanvasToPaintCanvas();
+        }
+        else
+        {
+            $rootScope.switchCanvas();
+        }
+      //  $rootScope.switchCanvas();
         //To enable extract button
         $scope.isTransparencyActivated = false;
         $("#btnExtract").removeClass("disabled");
-        //$('.com_anno').css('display', 'none');
-
-        //$('#sppeachBubble_annotation').css('display', 'none');
-        //$('#dot_annotation').css('display', 'none');
-        //$('#bord_annotation').css('display', 'none');
-
         $('.com_anno').remove();