From c52ed36955a02c0af57fe60edf1d65e42c4acc6d Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 26 Sep 2016 16:54:46 +0530 Subject: [PATCH] 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 --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js | 8 +++++++- 400-SOURCECODE/AIAHTML5.Web/index.html | 11 +++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index 67b001d..dc50d19 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -127,6 +127,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", $rootScope.CloseAnnotationTool = function () { console.log('close') + $('.btnCursor').removeClass('activebtncolor'); $(".annotationTollbar").css("display", "none"); $rootScope.isAnnotationWindowClose = true; $("#canvasPaint").css("display", "none"); @@ -349,7 +350,12 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", document.getElementById('modelbackground').style.display = "block"; //$("#editshapestyle").modal('show'); document.getElementById('modeleditstyle').style.display = "block"; - + if ($('#modeleditstyle').css("display") == "block") { //Check if the modal is already showing + var previewOpacity = $('#imgOpacity').css("opacity"); + $('#slider-range-min-4 div.ui-slider-range-min').css("width", (previewOpacity*100) + "%"); + $('#slider-range-min-4 span.ui-slider-handle').css("left", (previewOpacity * 100) + "%"); + + }; } $rootScope.disableAnnotationToolBar = function () { diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html index 34aa067..436bdbe 100644 --- a/400-SOURCECODE/AIAHTML5.Web/index.html +++ b/400-SOURCECODE/AIAHTML5.Web/index.html @@ -1,8 +1,8 @@  - - + + @@ -401,7 +401,7 @@ -