From ebd198170862b03224a5da3cdbeb53bf98e1eb9a Mon Sep 17 00:00:00 2001
From: Mukul <mukul@ebix.com>
Date: Wed, 8 Mar 2017 17:50:08 +0530
Subject: [PATCH] this is complete bug for 12310

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

diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index ea68113..027d910 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -61,8 +61,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     $rootScope.modifySavedText = [];
     $rootScope.TextRectangleArr = [];
     $rootScope.rectDimension = [];
-
-    $rootScope.isEraseToolSelected = false;
     $rootScope.isMousedownOnPaintCanvas = false;
     //opacity code
     $rootScope.shapestyleOpacity = 1;
@@ -907,6 +905,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $("#DrawMode").addClass('annotationtoolbartab');
         $rootScope.switchCanvasToPaintCanvas();
         var btneraseBrushSizeValue = $("#btnBrushSize").val();
+        $('#canvasPaint').sketch();
         $rootScope.eraseshapeSize = parseInt(btneraseBrushSizeValue);
         $("#annotationpainteraser").attr("data-size", $rootScope.eraseshapeSize);
         return $.sketch.tools.eraser = {
@@ -923,20 +922,26 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             }
         }
 
-        
+       
 
     }
 
     $rootScope.isShapeSyleOkBtnClicked = false;
+ 
     $rootScope.setPropertiesForShapes = function (id) {
         isfilloptionChecked = document.getElementById('fill-option').checked;
         isOutlineOptionChecked = document.getElementById('Outline-Option').checked;
         $rootScope.isShapeSyleOkBtnClicked = true;
-        if ($("#annotationpaintbrushsize").hasClass('activebtncolor')) {
+      if ($("#annotationpaintbrushsize").hasClass('activebtncolor')) {
             $("#annotationpaintbrushsize").removeClass('activebtncolor')
             $rootScope.switchCanvas();
 
-        }
+      }
+      if ($("#annotationpainteraser").hasClass('activebtncolor')) {
+          $("#annotationpainteraser").removeClass('activebtncolor')
+          $rootScope.switchCanvas();
+
+      }
         if ((document.getElementById('fill-option').checked == false) && (document.getElementById('Outline-Option').checked == false)) {
             //  $('#btnShapeStyle').attr('disabled', 'disabled');
         } else {
@@ -1012,6 +1017,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
 
 
     $rootScope.disableAnnotationToolBar = function () {
+     
         if ($rootScope.isShapeSyleOkBtnClicked == false) {
             $('#editstylebackgroundcolor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", "rgb(255,255,255)");
             $('#outlineColor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", "rgb(0,0,0)");
@@ -1054,6 +1060,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             //    $(".marginTopBtm10 div.outlinediv").css("border-color", x);
             //});
         } else {
+      
             document.getElementById('fill-option').checked = isfilloptionChecked;
              document.getElementById('Outline-Option').checked = isOutlineOptionChecked;
                     if (isfilloptionChecked == true) {
@@ -1080,7 +1087,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                     $("#borderWidthCanvasElement").css({ "pointer-events": "none" });
                    $("#outlineColor").css({ "pointer-events": "none" });
                }
-            var previewBgColor = $("#shapeStyleDiv").css('background-color');
+               var previewBgColor = $("#shapeStyleDiv").css('background-color');
             var previewBorderColor = $('#previewBorder').css('border-color');
             var previewBorderWidth = $('#previewBorder').css('border-width');
             var previewOpacity = $('#previewBorder').css('opacity');
@@ -1092,6 +1099,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             $('#borderWidthCanvasElement').val(previewBorderWidth.split("px"));
             $("#imgOpacity").css("opacity", previewOpacity);
             $(".marginTopBtm10 div.outlinediv").css("opacity", previewOpacity);
+           
         }
         document.getElementById('modelbackground').style.display = "none";
         document.getElementById('modeleditstyle').style.display = "none";
@@ -1189,6 +1197,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     }
 
     $rootScope.DrawRectangleOnModuleItem = function (canvasId, RectNumber, shapestyleFillColor, shapestyleborderColor, shapestyleOpacity, shapestyleborderWidth, offsetX1, offsetY1, x, y) {
+       
         if ($rootScope.isRectanglePreviewCompleted == true) {
             $rootScope.isRectanglePreviewCompleted = false;
             $(canvasId).addLayer({
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html
index 7106d4e..b791b9a 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.html
+++ b/400-SOURCECODE/AIAHTML5.Web/index.html
@@ -1313,6 +1313,23 @@
     </script>-->
    
     <script>
+        function onBrushSizeChange()
+        {
+            $('.btnCursor').addClass('activebtncolor');
+            $(".btn-annotation").removeClass("activebtncolor");
+            $(".btn-annotation-erase").removeClass("activebtncolor");
+            $(".btn-annotation-erase").removeClass("activebtncolor");
+            $(".annotationpaintbrushsize").removeClass("activebtncolor");
+            var x = $('#canvasPaint').css("z-index");
+
+            var y = $('#canvas').css("z-index");
+            if (x > y) {
+                y = parseInt(x) + 1;
+            } else {
+                y = parseInt(y) + 1;
+            }
+            $('#canvas').css("z-index", y);
+        }
         $(function () {
             $("#slider-range-min-2").slider({
                 range: "min",
@@ -1320,7 +1337,7 @@
                 max: 60,
                 value: 1,
                 slide: function (event, ui) {
-                   
+                    onBrushSizeChange();
                     $("#btnBrushSize").val(ui.value);
 
                 },
@@ -1334,17 +1351,17 @@
 
 
             $("#btnBrushSize").keydown(function () {
-         
+                onBrushSizeChange();
                 var brushSizevalue = this.value;
                 $("#slider-range-min-2").slider("value", parseInt(brushSizevalue));
             });
             $("#btnBrushSize").keyup(function () {
-             
+                onBrushSizeChange();
                 var brushSizevalue = this.value;
                 $("#slider-range-min-2").slider("value", parseInt(brushSizevalue));
             });
             $("#btnBrushSizeIncrement").click(function () {
-               
+                abc();
                 var brushIncrementVar = $("#btnBrushSize").val();
                 if (brushIncrementVar >= 60) {
                     $("#slider-range-min-2").slider("value", 60);
@@ -1361,7 +1378,7 @@
                 }
             });
             $("#btnBrushSizeDecrease").click(function () {
-               
+                onBrushSizeChange();
                 var brushDecreaseVar = $("#btnBrushSize").val();
                 if (brushDecreaseVar == "") {
                     var brushDecrementedValue = 1;
--
libgit2 0.21.4