From db85f87f39cc2b0f1531a3cc7e24c76379dada1b Mon Sep 17 00:00:00 2001
From: unknown <Khushbu.Sahani@NOIKHSHP3330.indiaebix.com>
Date: Wed, 30 Nov 2016 16:09:32 +0530
Subject: [PATCH] commit changes for Issue : 9711

---
 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js | 15 ++++++++++++---
 400-SOURCECODE/AIAHTML5.Web/index.html                        | 48 +++++++++++++++++++++++++-----------------------
 2 files changed, 37 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..ec0f66d 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -345,8 +345,16 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
             $("#canvas").css("display", "block");
             $rootScope.switchCanvasToPaintCanvas();
             $rootScope.shapeType = "FreeStylePaint";
-            var a = $("#amount-2").val();
+            //var a = $("#amount-2").val();
+            //$rootScope.shapeSize = parseInt(a);
+
+            var a = $("#btnBrushSize").val();
             $rootScope.shapeSize = parseInt(a);
+            $("#msglist").attr("data-size", $rootScope.shapeSize);
+          
+                $("#msglist").attr("data-color", $rootScope.shapestyleFillColor);
+           
+
             if ($rootScope.shapeSize == '') {
                 $('#canvasPaint').sketch({ defaultSize: 1 });
             }
@@ -454,7 +462,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
         $rootScope.shapestyleborderWidth = 2;
         $rootScope.shapestyleborderStyles = "solid";
         $rootScope.shapestyle = function (id) {
-            //  debugger;
+      //        debugger;
             document.getElementById('modelbackground').style.display = "none";
             document.getElementById('modeleditstyle').style.display = "none";
 
@@ -481,7 +489,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
 
             //Edit Shape Style popup should open at it's default position
             $("#modeleditstyle").css({ "left": "40%", "right": "0", "top": "70px" });
-
+      
         }
 
         $rootScope.enableAnnotationToolBar = function () {
@@ -500,6 +508,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                     $('#slider-range-min-4 span.ui-slider-handle').css("left", (previewOpacity * 100) + "%");
 
                 };
+              
             }
         }
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html
index 55e41d0..5f8f4cd 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.html
+++ b/400-SOURCECODE/AIAHTML5.Web/index.html
@@ -536,33 +536,35 @@
                             <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="msglist" data-color="#fff">
+                                            <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>
+                                        </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