Showing
1 changed file
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
| ... | ... | @@ -1018,7 +1018,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l |
| 1018 | 1018 | $("#navigatorDiv_"+windowviewid).css({"min-width":"auto", "min-height":"auto"}); |
| 1019 | 1019 | $(".containment-wrapper-"+windowviewid).css("min-width", "auto"); |
| 1020 | 1020 | } |
| 1021 | - $("#transparencyScale_"+windowviewid).draggable(); | |
| 1021 | + $("#transparencyScale_" + windowviewid).draggable({containment:'window'}); | |
| 1022 | 1022 | $("#draggable_"+windowviewid).draggable({ containment: ".containment-wrapper-"+windowviewid, scroll: false }); |
| 1023 | 1023 | |
| 1024 | 1024 | } |
| ... | ... | @@ -5627,7 +5627,16 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l |
| 5627 | 5627 | $scope.TransparencyBoxEndY = TransparencyBoxEndY; |
| 5628 | 5628 | |
| 5629 | 5629 | if ($scope.TransparencyBoxStartX == $scope.TransparencyEndX && $scope.TransparencyBoxStartY == $scope.TransparencyBoxEndY) { |
| 5630 | - // $('#transparencyScale').css('visibility', 'hidden'); | |
| 5630 | + | |
| 5631 | + $("#btnExtract_" + windowviewid).removeClass("disabled"); | |
| 5632 | + $("#btnExtract_" + windowviewid).css("pointer-events", "auto"); | |
| 5633 | + | |
| 5634 | + | |
| 5635 | + $('#btnTranparency_' + windowviewid).removeClass('tButtonActive'); | |
| 5636 | + $('#btnTranparency_' + windowviewid).removeClass(' btn-primary'); | |
| 5637 | + $('#btnTranparency_' + windowviewid).addClass('btn-black'); | |
| 5638 | + | |
| 5639 | + | |
| 5631 | 5640 | } else { |
| 5632 | 5641 | |
| 5633 | 5642 | if (previewRectangleWidth == 0 && previewRectangleHeight == 0) { |
| ... | ... | @@ -5637,6 +5646,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l |
| 5637 | 5646 | |
| 5638 | 5647 | $scope.DisableUI(); |
| 5639 | 5648 | |
| 5649 | + $('#btnTranparency_' + windowviewid).removeClass('btn-black'); | |
| 5650 | + $('#btnTranparency_' + windowviewid).addClass('tButtonActive'); | |
| 5651 | + | |
| 5640 | 5652 | $scope.SetwindowStoreData(windowviewid,'layerNumberBeforeTBDraw',parseInt($('#txtLayerNumberDA_' + windowviewid).val())); |
| 5641 | 5653 | // $scope.layerNumberBeforeTBDraw = parseInt($('#txtLayerNumberDA_' + windowviewid).val()); |
| 5642 | 5654 | |
| ... | ... | @@ -5687,9 +5699,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l |
| 5687 | 5699 | |
| 5688 | 5700 | document.getElementById("canvasDivDA_" + windowviewid).removeEventListener("touchend", mouseUpListener); |
| 5689 | 5701 | |
| 5690 | - $('#btnTranparency_' + windowviewid).removeClass('btn-black'); | |
| 5691 | - | |
| 5692 | - $('#btnTranparency_' + windowviewid).addClass('tButtonActive'); | |
| 5702 | + | |
| 5693 | 5703 | |
| 5694 | 5704 | //Dated:18-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected. |
| 5695 | 5705 | $('#btnTranparency_' + windowviewid).removeClass('tButtonActive'); | ... | ... |