Commit c52ed36955a02c0af57fe60edf1d65e42c4acc6d
1 parent
e26f5798
Commit changes for Issue :Ref
#I7908:Annotation Toolbar | Incorrect state of the button #7930:Annotation: Defect in Opacity Level. #7177:Annotation toolbar is not working in IE Browser
Showing
2 changed files
with
12 additions
and
7 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
| ... | ... | @@ -127,6 +127,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", |
| 127 | 127 | |
| 128 | 128 | $rootScope.CloseAnnotationTool = function () { |
| 129 | 129 | console.log('close') |
| 130 | + $('.btnCursor').removeClass('activebtncolor'); | |
| 130 | 131 | $(".annotationTollbar").css("display", "none"); |
| 131 | 132 | $rootScope.isAnnotationWindowClose = true; |
| 132 | 133 | $("#canvasPaint").css("display", "none"); |
| ... | ... | @@ -349,7 +350,12 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", |
| 349 | 350 | document.getElementById('modelbackground').style.display = "block"; |
| 350 | 351 | //$("#editshapestyle").modal('show'); |
| 351 | 352 | document.getElementById('modeleditstyle').style.display = "block"; |
| 352 | - | |
| 353 | + if ($('#modeleditstyle').css("display") == "block") { //Check if the modal is already showing | |
| 354 | + var previewOpacity = $('#imgOpacity').css("opacity"); | |
| 355 | + $('#slider-range-min-4 div.ui-slider-range-min').css("width", (previewOpacity*100) + "%"); | |
| 356 | + $('#slider-range-min-4 span.ui-slider-handle').css("left", (previewOpacity * 100) + "%"); | |
| 357 | + | |
| 358 | + }; | |
| 353 | 359 | } |
| 354 | 360 | |
| 355 | 361 | $rootScope.disableAnnotationToolBar = function () { | ... | ... |
400-SOURCECODE/AIAHTML5.Web/index.html
| 1 | 1 | <!DOCTYPE html> |
| 2 | 2 | <html lang="en" ng-cloak ng-app="AIA"> |
| 3 | 3 | <head> |
| 4 | - <!--<base href="/AIA/" />--> | |
| 5 | - <base href="/" /> | |
| 4 | + <base href="/AIA/" /> | |
| 5 | + <!--<base href="/" />--> | |
| 6 | 6 | <meta charset="utf-8"> |
| 7 | 7 | <meta http-equiv="X-UA-Compatible" content="IE=edge"> |
| 8 | 8 | <!--<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">--> |
| ... | ... | @@ -401,7 +401,7 @@ |
| 401 | 401 | </div> |
| 402 | 402 | |
| 403 | 403 | <!--Annotation Modal--> |
| 404 | - <div class="annotationTollbar" style="position:fixed;top:80px;right:20px;display:none;z-index:1200000;"> | |
| 404 | + <div class="annotationTollbar" style="width: 300px;position: fixed; top: 80px; right: 20px; display: none; z-index: 1200000;"> | |
| 405 | 405 | <div class="annotationbar"> |
| 406 | 406 | <div class="modal-content"> |
| 407 | 407 | <div class="modal-header annotation-modal-header"> |
| ... | ... | @@ -1295,8 +1295,7 @@ |
| 1295 | 1295 | |
| 1296 | 1296 | }); |
| 1297 | 1297 | </script> |
| 1298 | - | |
| 1299 | - | |
| 1298 | + | |
| 1300 | 1299 | <script> |
| 1301 | 1300 | $(function () { |
| 1302 | 1301 | $("#slider-range-min-3").slider({ |
| ... | ... | @@ -1328,7 +1327,7 @@ |
| 1328 | 1327 | max: 1, |
| 1329 | 1328 | step: .1, |
| 1330 | 1329 | slide: function (event, ui) { |
| 1331 | - | |
| 1330 | + | |
| 1332 | 1331 | $(".marginTopBtm10 img.imgopacity").css("opacity", ui.value); |
| 1333 | 1332 | // $("#slider-value").html(ui.value); |
| 1334 | 1333 | ... | ... |