diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index ee68b6d..4858420 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -378,7 +378,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic max: 60, value: 1, slide: function (event, ui) { - debugger; + onBrushSizeChange(); console.log("sliding"); $("#btnBrushSize").val(ui.value); @@ -746,7 +746,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic //annotation tool custom events $rootScope.ShowAnnotationWindow = function () { //7904 - + $rootScope.isAnnotatiomToolBarPopupActive = true; $rootScope.isAnnotatiomToolBarPopupClosed = false; $rootScope.isAnnotaionToolBarDrawingModeActive = false; @@ -3020,7 +3020,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic //---- $rootScope.onDrawingCanvasClick = function (event) { - + $rootScope.clicked = true; // OnPaintCanvasMouseDown(event); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index a7ff48f..398fe5d 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -889,7 +889,17 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $("#speechBubbleLine" + pinId).remove(); }); } - + $rootScope.$on('annotationToolEvent', function (event, data) { + $('#editstylebackgroundcolor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", "rgb(255,255,255)") + $('#editstylebackgroundcolor .minicolors >.minicolors-panel > .minicolors-grid >.minicolors-picker').css({ "top": "145px", "left": "4px" }); + $('#outlineColor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", "rgb(0,0,0)") + $('#outlineColor .minicolors >.minicolors-panel > .minicolors-grid >.minicolors-picker').css({ "top": "145px", "left": "4px" }); + + $("#canvas").css("display", "block"); + $("#canvasPaint").css("display", "block"); + $rootScope.onDrawingCanvasClick(); + $rootScope.FreeStylePaint(); + }); $scope.angle = function (id, cx, cy, ex, ey, BoolValues) { // debugger;