diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 3357f9a..ebc7ce5 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -554,6 +554,43 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } angular.element(document).ready(function (e) { + + $("#layerChangeSlider").slider({ + orientation: "vertical", + range: "max", // <--- needed... + min: 0, + // max: 100, + value: 0, + slide: function (event, ui) { + // $("#txtlayerNumber").val(100 - ui.value); // basic math operation.. + + // $("#txtlayerNumber").val($("#layerChangeSlider").slider("value")); + }, + stop: function (event, ui) { + var la; + var rootScope = angular.element(document.getElementById("bo")).scope(); + rootScope.$apply(function () { + rootScope.isLoading = true; + }) + var scope = angular.element(document.getElementById("daView")).scope(); + scope.$apply(function () { + if (scope.isTransparencyActivated) { + rootScope.isLoading = false; + } + la = parseInt(scope.totalLayers) //- parseInt(scope.layerNumber); + // $('#layerChangeSlider').slider("option", "value", la - ui.value); + var slideVal = la - ui.value; + $("#txtlayerNumber").val(slideVal); + scope.layerNumber = slideVal; + scope.LayerChange(); + $("#annotationpaintbrushsize").removeClass("activebtncolor"); + $("#annotationpainteraser").removeClass("activebtncolor"); + }); + }, + + }); + + $("#daImagePanel").resize(function () { $("#canvasDiv").scrollLeft($rootScope.CanvasDivLeftPosition); $("#canvasDiv").scrollTop($rootScope.CanvasDivTopPosition); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html index f2f12bb..f52db00 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html @@ -420,40 +420,7 @@ return false; } }); - - - $("#layerChangeSlider").slider({ - orientation: "vertical", - range: "max", // <--- needed... - min: 0, - // max: 100, - value: 0, - slide: function (event, ui) { - // $("#txtlayerNumber").val(100 - ui.value); // basic math operation.. - - // $("#txtlayerNumber").val($("#layerChangeSlider").slider("value")); - }, - stop: function (event, ui) { - var la; - var rootScope = angular.element(document.getElementById("bo")).scope(); - rootScope.$apply(function () { - rootScope.isLoading = true; - }) - var scope = angular.element(document.getElementById("daView")).scope(); - scope.$apply(function () { - if (scope.isTransparencyActivated) { - rootScope.isLoading = false; - } - la = parseInt(scope.totalLayers) //- parseInt(scope.layerNumber); - // $('#layerChangeSlider').slider("option", "value", la - ui.value); - var slideVal = la - ui.value; - $("#txtlayerNumber").val(slideVal); - scope.layerNumber = slideVal; - scope.LayerChange(); - }); - }, - - }) + }); diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html index d078cbd..cfeb3dc 100644 --- a/400-SOURCECODE/AIAHTML5.Web/index.html +++ b/400-SOURCECODE/AIAHTML5.Web/index.html @@ -606,7 +606,7 @@