diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 7050728..c320fdd 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -1031,7 +1031,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $("#navigatorDiv_"+windowviewid).css({"min-width":"auto", "min-height":"auto"}); $(".containment-wrapper-"+windowviewid).css("min-width", "auto"); } - $("#transparencyScale_"+windowviewid).draggable(); + $("#transparencyScale_" + windowviewid).draggable({containment:'window'}); $("#draggable_"+windowviewid).draggable({ containment: ".containment-wrapper-"+windowviewid, scroll: false }); } @@ -5424,7 +5424,16 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.TransparencyBoxEndY = TransparencyBoxEndY; if ($scope.TransparencyBoxStartX == $scope.TransparencyEndX && $scope.TransparencyBoxStartY == $scope.TransparencyBoxEndY) { - // $('#transparencyScale').css('visibility', 'hidden'); + + $("#btnExtract_" + windowviewid).removeClass("disabled"); + $("#btnExtract_" + windowviewid).css("pointer-events", "auto"); + + + $('#btnTranparency_' + windowviewid).removeClass('tButtonActive'); + $('#btnTranparency_' + windowviewid).removeClass(' btn-primary'); + $('#btnTranparency_' + windowviewid).addClass('btn-black'); + + } else { if (previewRectangleWidth == 0 && previewRectangleHeight == 0) { @@ -5434,6 +5443,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.DisableUI(); + $('#btnTranparency_' + windowviewid).removeClass('btn-black'); + $('#btnTranparency_' + windowviewid).addClass('tButtonActive'); + $scope.SetwindowStoreData(windowviewid,'layerNumberBeforeTBDraw',parseInt($('#txtLayerNumberDA_' + windowviewid).val())); // $scope.layerNumberBeforeTBDraw = parseInt($('#txtLayerNumberDA_' + windowviewid).val()); @@ -5484,9 +5496,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l document.getElementById("canvasDivDA_" + windowviewid).removeEventListener("touchend", mouseUpListener); - $('#btnTranparency_' + windowviewid).removeClass('btn-black'); - - $('#btnTranparency_' + windowviewid).addClass('tButtonActive'); + //Dated:18-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected. $('#btnTranparency_' + windowviewid).removeClass('tButtonActive');