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

Amrita Vishnoi
2 parents 4a4765f1 565ccc68
Showing 1 changed file with 15 additions and 2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -554,7 +554,15 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                 $rootScope.setListManagerZindex = true;
                 $("#canvasPaint").css("display", "block");
                 $("#canvas").css("display", "block");
-                $rootScope.switchCanvasToPaintCanvas();
+               
+                if ((document.getElementById('fill-option').checked == false) && ($rootScope.isShapeSyleOkBtnClicked == true)) {
+                   
+                    $rootScope.switchCanvas();
+                }
+                else {
+                   
+                    $rootScope.switchCanvasToPaintCanvas();
+                }
                 $rootScope.shapeType = "FreeStylePaint";
             var btnBrushSizeValue = $("#btnBrushSize").val();
             $rootScope.shapeSize = parseInt(btnBrushSizeValue);
@@ -660,7 +668,12 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $rootScope.isShapeSyleOkBtnClicked = false;
         $rootScope.setPropertiesForShapes = function (id) {
             $rootScope.isShapeSyleOkBtnClicked = true;
-            
+            if ($("#annotationpaintbrushsize").hasClass('activebtncolor'))
+            {
+                $("#annotationpaintbrushsize").removeClass('activebtncolor')
+                $rootScope.switchCanvas();
+
+            }
             if ((document.getElementById('fill-option').checked == false) && (document.getElementById('Outline-Option').checked == false)) {
               //  $('#btnShapeStyle').attr('disabled', 'disabled');
             } else {