Commit 0c58ca7e5397855d36f03e9acdd1ac0d04b71ca9

Authored by unknown
1 parent 679a8d2a

Commit Changes

400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
... ... @@ -378,7 +378,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
378 378 max: 60,
379 379 value: 1,
380 380 slide: function (event, ui) {
381   - debugger;
  381 +
382 382 onBrushSizeChange();
383 383 console.log("sliding");
384 384 $("#btnBrushSize").val(ui.value);
... ... @@ -746,7 +746,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
746 746 //annotation tool custom events
747 747 $rootScope.ShowAnnotationWindow = function () {
748 748 //7904
749   -
  749 +
750 750 $rootScope.isAnnotatiomToolBarPopupActive = true;
751 751 $rootScope.isAnnotatiomToolBarPopupClosed = false;
752 752 $rootScope.isAnnotaionToolBarDrawingModeActive = false;
... ... @@ -3020,7 +3020,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3020 3020 //----
3021 3021  
3022 3022 $rootScope.onDrawingCanvasClick = function (event) {
3023   -
  3023 +
3024 3024 $rootScope.clicked = true;
3025 3025 // OnPaintCanvasMouseDown(event);
3026 3026  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
... ... @@ -889,7 +889,17 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
889 889 $("#speechBubbleLine" + pinId).remove();
890 890 });
891 891 }
892   -
  892 + $rootScope.$on('annotationToolEvent', function (event, data) {
  893 + $('#editstylebackgroundcolor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", "rgb(255,255,255)")
  894 + $('#editstylebackgroundcolor .minicolors >.minicolors-panel > .minicolors-grid >.minicolors-picker').css({ "top": "145px", "left": "4px" });
  895 + $('#outlineColor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", "rgb(0,0,0)")
  896 + $('#outlineColor .minicolors >.minicolors-panel > .minicolors-grid >.minicolors-picker').css({ "top": "145px", "left": "4px" });
  897 +
  898 + $("#canvas").css("display", "block");
  899 + $("#canvasPaint").css("display", "block");
  900 + $rootScope.onDrawingCanvasClick();
  901 + $rootScope.FreeStylePaint();
  902 + });
893 903  
894 904 $scope.angle = function (id, cx, cy, ex, ey, BoolValues) {
895 905 // debugger;
... ...