From c9fa6efc966a70113532b462fcce0215f80de8d3 Mon Sep 17 00:00:00 2001 From: Mukul Date: Mon, 29 Aug 2016 13:36:17 +0530 Subject: [PATCH] update controller file --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js | 30 ++++++++++-------------------- 400-SOURCECODE/AIAHTML5.Web/index.html | 2 +- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index 2457726..ab7204e 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -30,9 +30,6 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", $rootScope.lastY; $rootScope.CommonData; $rootScope.shapeType; - //mukul - $rootScope.shapestyleOpacity = 1; - $rootScope.globalSetting = { ethnicity: 'W', modesty: 'Y', @@ -75,7 +72,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", if (alreadyOpenThisView != null) { for (var i = 0; i < $rootScope.openViews.length; i++) { k++; - if ($rootScope.openViews[i].body-views == title) { + if ($rootScope.openViews[i].body - views == title) { $rootScope.openViews.splice((k - 1), 1); $rootScope.openViews.push( @@ -246,21 +243,21 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", } $rootScope.EraseDrawing = function () { $rootScope.switchCanvasToPaintCanvas(); - // $('#canvasPaint').sketch({ defaultColor: "yellow", defaultSize: 1 }); + // $('#canvasPaint').sketch({ defaultColor: "yellow", defaultSize: 1 }); var sktch = $('#canvasPaint').sketch(); - $('#canvasPaint').sketch().actions = []; // this line empties the actions. + $('#canvasPaint').sketch().actions = []; // this line empties the actions. var myCanvas = document.getElementById("canvasPaint"); var ctx = myCanvas.getContext('2d'); - ctx.clearRect(0, 0, myCanvas.width, myCanvas.height); - $rootScope.switchCanvas(); - + ctx.clearRect(0, 0, myCanvas.width, myCanvas.height); + $rootScope.switchCanvas(); + } //opacity code $rootScope.shapestyleOpacity = 1; $rootScope.shapestyleFillColor = "#fff"; $rootScope.shapestyleFillBorderColor = "black"; - $rootScope.shapestyleborderWidth=2; + $rootScope.shapestyleborderWidth = 2; $rootScope.shapestyle = function (id) { @@ -271,11 +268,11 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", var b = a.split("px"); // alert(b); $rootScope.shapestyleborderWidth = b[0]; - - // alert(b[0]); + + // alert(b[0]); //alert(b[1]); var c = b[1].split("solid"); - // alert(c[1]); + // alert(c[1]); $rootScope.shapestyleborderColor = c[1]; @@ -285,11 +282,6 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", - - $rootScope.shapestyleOpacity = $("#" + id).css('opacity'); - $('#editshapestyle').modal('hide'); - } - //----End------------- $rootScope.AddClick = function (x, y, dragging) { @@ -515,8 +507,6 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", } - - $rootScope.CloseSetting = function () { $rootScope.setEthncitySettings($rootScope.globalSetting.ethnicity); diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html index 10632e8..a50aa33 100644 --- a/400-SOURCECODE/AIAHTML5.Web/index.html +++ b/400-SOURCECODE/AIAHTML5.Web/index.html @@ -1,7 +1,7 @@  - + -- libgit2 0.21.4