From c55173ee4c33082fa438c20f06aa9d5b34f5e96e Mon Sep 17 00:00:00 2001 From: nikita Date: Tue, 21 Feb 2017 18:00:20 +0530 Subject: [PATCH] In a case there was issue in combination of Tbox and AToolbar.-fixed --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 1b20c90..08c31e2 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -5644,18 +5644,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(); -- libgit2 0.21.4