Commit 89c153198a04f52b9c077d1e90846203b03aa3fa
Merge branch 'Bug9711Merge' into Develop
Showing
2 changed files
with
4 additions
and
1 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
| ... | ... | @@ -348,6 +348,9 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", |
| 348 | 348 | var btnBrushSizeValue = $("#btnBrushSize").val(); |
| 349 | 349 | $rootScope.shapeSize = parseInt(btnBrushSizeValue); |
| 350 | 350 | $("#annotationpaintbrushsize").attr("data-size", $rootScope.shapeSize); |
| 351 | + | |
| 352 | + $("#annotationpaintbrushsize").attr("data-color", $rootScope.shapestyleFillColor); | |
| 353 | + | |
| 351 | 354 | if ($rootScope.shapeSize == '') { |
| 352 | 355 | $('#canvasPaint').sketch({ defaultSize: 1 }); |
| 353 | 356 | } | ... | ... |
400-SOURCECODE/AIAHTML5.Web/index.html
| ... | ... | @@ -536,7 +536,7 @@ |
| 536 | 536 | <div class="well well-popup"> |
| 537 | 537 | <div class="" role="group" aria-label="..."> |
| 538 | 538 | <div> |
| 539 | - <a href="#canvasPaint" data-size="1" id="annotationpaintbrushsize" class="btn btn-primary btn-xs pull-left btn-annotation" role="button" data-toggle="tooltip" data-placement="top" title="Paint" style="margin-right:1%;" ng-click="paintBrush()"><i class="fa fa-paint-brush"></i></a> | |
| 539 | + <a href="#canvasPaint" data-size="1" data-color="#fff" id="annotationpaintbrushsize" class="btn btn-primary btn-xs pull-left btn-annotation" role="button" data-toggle="tooltip" data-placement="top" title="Paint" style="margin-right:1%;" ng-click="paintBrush()"><i class="fa fa-paint-brush"></i></a> | |
| 540 | 540 | <button type="button" class="btn btn-primary btn-xs pull-left btn-annotation" data-toggle="tooltip" data-placement="top" title="Erase" ng-click="EraseDrawing()"><i class="fa fa-eraser"></i></button> |
| 541 | 541 | <div style="width: 80px; margin: 0px 0px 0px 4px; display: inline-block;float:left;"> |
| 542 | 542 | <div style="width: 58px; float: left;"> | ... | ... |