From 3152a626662919324b42cc790d488b33ac8e2310 Mon Sep 17 00:00:00 2001
From: Mukul <mukul@ebix.com>
Date: Mon, 28 Nov 2016 12:47:50 +0530
Subject: [PATCH] Paint Brush Size issue Resolved

---
 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js |  7 ++++---
 400-SOURCECODE/AIAHTML5.Web/index.html                        | 46 +++++++++++++++++++++++-----------------------
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 6e51ddf..290a0bd 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -345,13 +345,14 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
             $("#canvas").css("display", "block");
             $rootScope.switchCanvasToPaintCanvas();
             $rootScope.shapeType = "FreeStylePaint";
-            var a = $("#amount-2").val();
-            $rootScope.shapeSize = parseInt(a);
+            var btnBrushSizeValue = $("#btnBrushSize").val();
+            $rootScope.shapeSize = parseInt(btnBrushSizeValue);
+            $("#annotationpaintbrushsize").attr("data-size", $rootScope.shapeSize);
             if ($rootScope.shapeSize == '') {
                 $('#canvasPaint').sketch({ defaultSize: 1 });
             }
             else {
-                $('#canvasPaint').sketch({ defaultSize: $rootScope.shapeSize });
+                $('#canvasPaint').sketch();
 
             }
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html
index 55e41d0..ba1c725 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.html
+++ b/400-SOURCECODE/AIAHTML5.Web/index.html
@@ -536,33 +536,33 @@
                             <div class="well well-popup">
                                 <div class="" role="group" aria-label="...">
                                     <div>
-                                        <button type="button" class="btn btn-primary btn-xs pull-left btn-annotation" id="paintLine" data-toggle="tooltip" data-placement="top" title="Paint" style="margin-right:1%;" ng-click="paintBrush()"><i class="fa fa-paint-brush"></i></button>
-                                        <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>&nbsp;
-                                        <div style="width: 80px; margin: 0px 0px 0px 4px; display: inline-block;float:left;">
-                                            <div style="width: 58px; float: left;">
-                                                <input type="text" id="btnBrushSize" class="form-control" value="1" style="height:32px;border-radius:0;" oninput="Brushsize(this)">
-                                            </div>
-                                            <div style="width: 22px; float: left;">
-                                                <div style="width: 100%; float: left; height: 16px;">
-                                                    <button type="button" id="btnBrushSizeIncrement" class="btn btn-default" style="padding:0 5px;border-radius:0;font-size: 10px;vertical-align:top;">
-
-                                                        <img style="width:10px;height:10px;" src="~/../content/images/DA/angle-up.png">
-                                                    </button>
+                                        <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>
+                                            <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>&nbsp;
+                                            <div style="width: 80px; margin: 0px 0px 0px 4px; display: inline-block;float:left;">
+                                                <div style="width: 58px; float: left;">
+                                                    <input type="text" id="btnBrushSize" class="form-control" value="1" style="height:32px;border-radius:0;" oninput="Brushsize(this)">
                                                 </div>
-                                                <div style="width: 100%; float: left; height: 16px;">
-                                                    <button type="button" id="btnBrushSizeDecrease" class="btn btn-default" style="padding:0 5px;border-radius:0;font-size: 10px;vertical-align:top;">
-                                                        <img style="width:10px;height:10px;" src="~/../content/images/DA/angle-down.png">
-                                                    </button>
+                                                <div style="width: 22px; float: left;">
+                                                    <div style="width: 100%; float: left; height: 16px;">
+                                                        <button type="button" id="btnBrushSizeIncrement" class="btn btn-default" style="padding:0 5px;border-radius:0;font-size: 10px;vertical-align:top;">
+
+                                                            <img style="width:10px;height:10px;" src="~/../content/images/DA/angle-up.png">
+                                                        </button>
+                                                    </div>
+                                                    <div style="width: 100%; float: left; height: 16px;">
+                                                        <button type="button" id="btnBrushSizeDecrease" class="btn btn-default" style="padding:0 5px;border-radius:0;font-size: 10px;vertical-align:top;">
+                                                            <img style="width:10px;height:10px;" src="~/../content/images/DA/angle-down.png">
+                                                        </button>
+                                                    </div>
                                                 </div>
-                                            </div>
 
-                                        </div>
+                                            </div>
 
-                                        <div class="pull-left" style="width:45%; margin-left:2%;margin-top:5px;">
-                                            <div id="slider-range-min-2"></div>
-                                        </div>
-                                        <div class="clearfix"></div>
-                                    </div>
+                                            <div class="pull-left" style="width:45%; margin-left:2%;margin-top:5px;">
+                                                <div id="slider-range-min-2"></div>
+                                            </div>
+                                            <div class="clearfix"></div>
+</div>
 
                                 </div>
 
--
libgit2 0.21.4