ADAM / AIAHTML5

Commit d5e8818e4f7076229c9fadb10fb803ca5b5b12c9

Authored by Amrita Vishnoi
2 parents 4a4765f1 565ccc68

Merge branch 'uncheckedbrush' of http://52.6.196.163/ADAM/AIAHTML5 into Develop

Inline Side-by-side
Showing 1 changed file with 15 additions and 2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @d5e8818
... ... @@ -554,7 +554,15 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
554 554 $rootScope.setListManagerZindex = true;
555 555 $("#canvasPaint").css("display", "block");
556 556 $("#canvas").css("display", "block");
557   - $rootScope.switchCanvasToPaintCanvas();
  557 +
  558 + if ((document.getElementById('fill-option').checked == false) && ($rootScope.isShapeSyleOkBtnClicked == true)) {
  559 +
  560 + $rootScope.switchCanvas();
  561 + }
  562 + else {
  563 +
  564 + $rootScope.switchCanvasToPaintCanvas();
  565 + }
558 566 $rootScope.shapeType = "FreeStylePaint";
559 567 var btnBrushSizeValue = $("#btnBrushSize").val();
560 568 $rootScope.shapeSize = parseInt(btnBrushSizeValue);
... ... @@ -660,7 +668,12 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
660 668 $rootScope.isShapeSyleOkBtnClicked = false;
661 669 $rootScope.setPropertiesForShapes = function (id) {
662 670 $rootScope.isShapeSyleOkBtnClicked = true;
663   -
  671 + if ($("#annotationpaintbrushsize").hasClass('activebtncolor'))
  672 + {
  673 + $("#annotationpaintbrushsize").removeClass('activebtncolor')
  674 + $rootScope.switchCanvas();
  675 +
  676 + }
664 677 if ((document.getElementById('fill-option').checked == false) && (document.getElementById('Outline-Option').checked == false)) {
665 678 // $('#btnShapeStyle').attr('disabled', 'disabled');
666 679 } else {
... ...