ADAM / AIAHTML5

Commit 3f329e51a72c5feccc75c81bb6a3fab6a6a1ebce

Authored by Birendra Kumar
2 parents aea52d67 c8d7e63f

Merge branch 'Bug#26464' into AIA_Develop

Inline Side-by-side
Showing 1 changed file with 15 additions and 5 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @3f329e5
... ... @@ -1031,7 +1031,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1031 1031 $("#navigatorDiv_"+windowviewid).css({"min-width":"auto", "min-height":"auto"});
1032 1032 $(".containment-wrapper-"+windowviewid).css("min-width", "auto");
1033 1033 }
1034   - $("#transparencyScale_"+windowviewid).draggable();
  1034 + $("#transparencyScale_" + windowviewid).draggable({containment:'window'});
1035 1035 $("#draggable_"+windowviewid).draggable({ containment: ".containment-wrapper-"+windowviewid, scroll: false });
1036 1036  
1037 1037 }
... ... @@ -5424,7 +5424,16 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
5424 5424 $scope.TransparencyBoxEndY = TransparencyBoxEndY;
5425 5425  
5426 5426 if ($scope.TransparencyBoxStartX == $scope.TransparencyEndX && $scope.TransparencyBoxStartY == $scope.TransparencyBoxEndY) {
5427   - // $('#transparencyScale').css('visibility', 'hidden');
  5427 +
  5428 + $("#btnExtract_" + windowviewid).removeClass("disabled");
  5429 + $("#btnExtract_" + windowviewid).css("pointer-events", "auto");
  5430 +
  5431 +
  5432 + $('#btnTranparency_' + windowviewid).removeClass('tButtonActive');
  5433 + $('#btnTranparency_' + windowviewid).removeClass(' btn-primary');
  5434 + $('#btnTranparency_' + windowviewid).addClass('btn-black');
  5435 +
  5436 +
5428 5437 } else {
5429 5438  
5430 5439 if (previewRectangleWidth == 0 && previewRectangleHeight == 0) {
... ... @@ -5434,6 +5443,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
5434 5443  
5435 5444 $scope.DisableUI();
5436 5445  
  5446 + $('#btnTranparency_' + windowviewid).removeClass('btn-black');
  5447 + $('#btnTranparency_' + windowviewid).addClass('tButtonActive');
  5448 +
5437 5449 $scope.SetwindowStoreData(windowviewid,'layerNumberBeforeTBDraw',parseInt($('#txtLayerNumberDA_' + windowviewid).val()));
5438 5450 // $scope.layerNumberBeforeTBDraw = parseInt($('#txtLayerNumberDA_' + windowviewid).val());
5439 5451  
... ... @@ -5484,9 +5496,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
5484 5496  
5485 5497 document.getElementById("canvasDivDA_" + windowviewid).removeEventListener("touchend", mouseUpListener);
5486 5498  
5487   - $('#btnTranparency_' + windowviewid).removeClass('btn-black');
5488   -
5489   - $('#btnTranparency_' + windowviewid).addClass('tButtonActive');
  5499 +
5490 5500  
5491 5501 //Dated:18-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected.
5492 5502 $('#btnTranparency_' + windowviewid).removeClass('tButtonActive');
... ...