ADAM / AIAHTML5

Commit c9fa6efc966a70113532b462fcce0215f80de8d3

Authored by Mukul Rajput
1 parent 00c11b3b

update controller file

Inline Side-by-side
Showing 2 changed files with 11 additions and 21 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @c9fa6ef
... ... @@ -30,9 +30,6 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
30 30 $rootScope.lastY;
31 31 $rootScope.CommonData;
32 32 $rootScope.shapeType;
33   - //mukul
34   - $rootScope.shapestyleOpacity = 1;
35   -
36 33 $rootScope.globalSetting = {
37 34 ethnicity: 'W',
38 35 modesty: 'Y',
... ... @@ -75,7 +72,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
75 72 if (alreadyOpenThisView != null) {
76 73 for (var i = 0; i < $rootScope.openViews.length; i++) {
77 74 k++;
78   - if ($rootScope.openViews[i].body-views == title) {
  75 + if ($rootScope.openViews[i].body - views == title) {
79 76 $rootScope.openViews.splice((k - 1), 1);
80 77  
81 78 $rootScope.openViews.push(
... ... @@ -246,21 +243,21 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
246 243 }
247 244 $rootScope.EraseDrawing = function () {
248 245 $rootScope.switchCanvasToPaintCanvas();
249   - // $('#canvasPaint').sketch({ defaultColor: "yellow", defaultSize: 1 });
  246 + // $('#canvasPaint').sketch({ defaultColor: "yellow", defaultSize: 1 });
250 247 var sktch = $('#canvasPaint').sketch();
251   - $('#canvasPaint').sketch().actions = []; // this line empties the actions.
  248 + $('#canvasPaint').sketch().actions = []; // this line empties the actions.
252 249 var myCanvas = document.getElementById("canvasPaint");
253 250 var ctx = myCanvas.getContext('2d');
254   - ctx.clearRect(0, 0, myCanvas.width, myCanvas.height);
255   - $rootScope.switchCanvas();
256   -
  251 + ctx.clearRect(0, 0, myCanvas.width, myCanvas.height);
  252 + $rootScope.switchCanvas();
  253 +
257 254 }
258 255  
259 256 //opacity code
260 257 $rootScope.shapestyleOpacity = 1;
261 258 $rootScope.shapestyleFillColor = "#fff";
262 259 $rootScope.shapestyleFillBorderColor = "black";
263   - $rootScope.shapestyleborderWidth=2;
  260 + $rootScope.shapestyleborderWidth = 2;
264 261  
265 262 $rootScope.shapestyle = function (id) {
266 263  
... ... @@ -271,11 +268,11 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
271 268 var b = a.split("px");
272 269 // alert(b);
273 270 $rootScope.shapestyleborderWidth = b[0];
274   -
275   - // alert(b[0]);
  271 +
  272 + // alert(b[0]);
276 273 //alert(b[1]);
277 274 var c = b[1].split("solid");
278   - // alert(c[1]);
  275 + // alert(c[1]);
279 276 $rootScope.shapestyleborderColor = c[1];
280 277  
281 278  
... ... @@ -285,11 +282,6 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
285 282  
286 283  
287 284  
288   -
289   - $rootScope.shapestyleOpacity = $("#" + id).css('opacity');
290   - $('#editshapestyle').modal('hide');
291   - }
292   -
293 285 //----End-------------
294 286  
295 287 $rootScope.AddClick = function (x, y, dragging) {
... ... @@ -515,8 +507,6 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
515 507  
516 508 }
517 509  
518   -
519   -
520 510 $rootScope.CloseSetting = function () {
521 511  
522 512 $rootScope.setEthncitySettings($rootScope.globalSetting.ethnicity);
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @c9fa6ef
1 1 <!DOCTYPE html>
2 2 <html lang="en" ng-cloak ng-app="AIA">
3 3 <head>
4   - <base href="/AIA/" />
  4 + <base href="/AIAHTML5/" />
5 5 <meta charset="utf-8">
6 6 <meta http-equiv="X-UA-Compatible" content="IE=edge">
7 7 <!--<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">-->
... ...