diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 43d699c..51d99b8 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -4617,11 +4617,21 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$filter","$ $scope.TransparencyBoxEndY = TransparencyBoxEndY; if ($scope.TransparencyBoxStartX == $scope.TransparencyEndX && $scope.TransparencyBoxStartY == $scope.TransparencyBoxEndY) { - // $('#transparencyScale').css('visibility', 'hidden'); + + //#Bug 26464 + $timeout(function () { + angular.element(document.activeElement).blur(); + }); + } else { if (previewRectangleWidth == 0 && previewRectangleHeight == 0) { + //#Bug 26464 + $timeout(function () { + angular.element(document.activeElement).blur(); + }); + } else { @@ -6696,14 +6706,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$filter","$ var sliderVal = parseInt($rootScope.totalLayers) - parseInt($rootScope.currentLayerNumber); console.log('inside mouseDownListener. document.getElementById layerChangeSlider value : ' + document.getElementById('layerChangeSlider') + '$rootScope.totalLayers: ' + $rootScope.totalLayers + ' - $rootScope.currentLayerNumber: ' + $rootScope.currentLayerNumber + ' = set value for layerChangeSlider: ' + sliderVal); - - $('#layerChangeSlider').slider("option", "value", sliderVal); - //if ($scope.isGenderChnage || $rootScope.isViewChange) { - // $("#txtlayerNumber").val(parseInt(0)); - //} - //else - $("#txtlayerNumber").val(parseInt($rootScope.currentLayerNumber)); - + + //START BUG#32146 + if (($rootScope.isHighlightBodyByBodySystem == true || $scope.isbodySystemHighlight == true) && $rootScope.systemNumber > 0) { + } + else { + $('#layerChangeSlider').slider("option", "value", sliderVal); + $("#txtlayerNumber").val(parseInt($rootScope.currentLayerNumber)); + } + //END BUG#32146 if (document.getElementById('tempCanvas') != null) { $('#tempCanvas').remove(); @@ -8521,7 +8532,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$filter","$ $('#structureDropdown').html(""); var currentBodyViewId = $rootScope.voId; - var systemListHtml = '