From d8c4bc8ece2462a5ab86c2e4c8f22a263bd46a7e Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 12 Oct 2016 11:05:33 +0530 Subject: [PATCH] Commit changes for Issue Ref: #7929 :Annotation: Default color defect in Edit Shape Style --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 6ead278..9600b9d 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -6165,6 +6165,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //----Annotation Toolbar: Jcanvas--- $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"); $scope.BindCanvasDrawingListners(); @@ -6562,7 +6567,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo // $scope.resetRect += 1; break; case "Pin": - $rootScope.resetPin = $rootScope.Object2Index++; $rootScope.resetPinArc = $rootScope.Object1Index++; var radial = $('canvas').createGradient({ @@ -6657,6 +6661,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo // strokeWidth: 2, // radius: 3 //}, + add: function (layer) { $rootScope.resetPinArc = layer.name; -- libgit2 0.21.4