Commit c55173ee4c33082fa438c20f06aa9d5b34f5e96e
1 parent
afab0321
In a case there was issue in combination of Tbox and AToolbar.-fixed
Showing
1 changed file
with
13 additions
and
8 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
... | ... | @@ -5644,18 +5644,23 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
5644 | 5644 | } |
5645 | 5645 | |
5646 | 5646 | $scope.CloseTransparencyBox = function () { |
5647 | - | |
5648 | - | |
5647 | + | |
5648 | + //for enabling annoataions. | |
5649 | + //Now everything si done on canavases uswed in annotation toolbar. | |
5650 | + | |
5651 | + if (parseInt($("#canvasPaint").css("z-index")) > parseInt($("#canvas").css("z-index"))) | |
5652 | + { | |
5653 | + $rootScope.switchCanvasToPaintCanvas(); | |
5654 | + } | |
5655 | + else | |
5656 | + { | |
5657 | + $rootScope.switchCanvas(); | |
5658 | + } | |
5659 | + // $rootScope.switchCanvas(); | |
5649 | 5660 | //To enable extract button |
5650 | 5661 | $scope.isTransparencyActivated = false; |
5651 | 5662 | $("#btnExtract").removeClass("disabled"); |
5652 | 5663 | |
5653 | - //$('.com_anno').css('display', 'none'); | |
5654 | - | |
5655 | - //$('#sppeachBubble_annotation').css('display', 'none'); | |
5656 | - //$('#dot_annotation').css('display', 'none'); | |
5657 | - //$('#bord_annotation').css('display', 'none'); | |
5658 | - | |
5659 | 5664 | |
5660 | 5665 | $('.com_anno').remove(); |
5661 | 5666 | ... | ... |