ADAM / AIAHTML5

Commit d8c4bc8ece2462a5ab86c2e4c8f22a263bd46a7e

Authored by unknown
1 parent e8d6391d

Commit changes for Issue Ref: #7929 :Annotation: Default color defect in Edit Shape Style

Inline Side-by-side
Showing 1 changed file with 6 additions and 1 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @d8c4bc8
... ... @@ -6165,6 +6165,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6165 6165 //----Annotation Toolbar: Jcanvas---
6166 6166  
6167 6167 $rootScope.$on('annotationToolEvent', function (event, data) {
  6168 + $('#editstylebackgroundcolor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", "rgb(255,255,255)")
  6169 + $('#editstylebackgroundcolor .minicolors >.minicolors-panel > .minicolors-grid >.minicolors-picker').css({ "top": "145px", "left": "4px" });
  6170 + $('#outlineColor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", "rgb(0,0,0)")
  6171 + $('#outlineColor .minicolors >.minicolors-panel > .minicolors-grid >.minicolors-picker').css({ "top": "145px", "left": "4px" });
  6172 +
6168 6173 $("#canvas").css("display", "block");
6169 6174 $("#canvasPaint").css("display", "block");
6170 6175 $scope.BindCanvasDrawingListners();
... ... @@ -6562,7 +6567,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6562 6567 // $scope.resetRect += 1;
6563 6568 break;
6564 6569 case "Pin":
6565   -
6566 6570 $rootScope.resetPin = $rootScope.Object2Index++;
6567 6571 $rootScope.resetPinArc = $rootScope.Object1Index++;
6568 6572 var radial = $('canvas').createGradient({
... ... @@ -6657,6 +6661,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6657 6661 // strokeWidth: 2,
6658 6662 // radius: 3
6659 6663 //},
  6664 +
6660 6665 add: function (layer) {
6661 6666  
6662 6667 $rootScope.resetPinArc = layer.name;
... ...