ADAM / AIAHTML5

Commit 34fb900d2b676c3a2d3f407b64f26aa6a257b44d

Authored by Nikita Kulshreshtha
2 parents 337e0b66 6d0acf3d

Merge branch '14986Merge' into Develop

Inline Side-by-side
Showing 1 changed file with 14 additions and 13 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @34fb900
@@ -1178,8 +1178,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -1178,8 +1178,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
1178 strokeWidth: shapestyleborderWidth, 1178 strokeWidth: shapestyleborderWidth,
1179 fromCenter: false, 1179 fromCenter: false,
1180 x: offsetX1, y: offsetY1, 1180 x: offsetX1, y: offsetY1,
1181 - width: (x - offsetX1),  
1182 - height: (y - offsetY1), 1181 + width: Math.abs(x - offsetX1),
  1182 + height: Math.abs(y - offsetY1),
1183 1183
1184 resizeFromCenter: false, 1184 resizeFromCenter: false,
1185 1185
@@ -1275,7 +1275,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -1275,7 +1275,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
1275 fillStyle: shapestyleFillColor, 1275 fillStyle: shapestyleFillColor,
1276 fromCenter: false, 1276 fromCenter: false,
1277 x: (offsetX1), y: (offsetY1), 1277 x: (offsetX1), y: (offsetY1),
1278 - width: (x - offsetX1), height: (y - offsetY1), 1278 + //added abs
  1279 + width: Math.abs(x - offsetX1), height: Math.abs(y - offsetY1),
1279 // Place a handle at each side and each corner 1280 // Place a handle at each side and each corner
1280 resizeFromCenter: false, 1281 resizeFromCenter: false,
1281 handlePlacement: 'both', 1282 handlePlacement: 'both',
@@ -1604,8 +1605,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -1604,8 +1605,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
1604 strokeWidth: $rootScope.shapestyleborderWidth, 1605 strokeWidth: $rootScope.shapestyleborderWidth,
1605 fillStyle: $rootScope.shapestyleFillColor, 1606 fillStyle: $rootScope.shapestyleFillColor,
1606 x: $rootScope.offsetX1, y: $rootScope.offsetY1, 1607 x: $rootScope.offsetX1, y: $rootScope.offsetY1,
1607 - width: ($rootScope.x - $rootScope.offsetX1),  
1608 - height: ($rootScope.y - $rootScope.offsetY1), 1608 + width: Math.abs($rootScope.x - $rootScope.offsetX1),
  1609 + height: Math.abs($rootScope.y - $rootScope.offsetY1),
1609 resizeFromCenter: false, 1610 resizeFromCenter: false,
1610 add: function (layer) { 1611 add: function (layer) {
1611 1612
@@ -2005,8 +2006,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -2005,8 +2006,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
2005 fillStyle: $rootScope.selectedBGColorForTextArea, 2006 fillStyle: $rootScope.selectedBGColorForTextArea,
2006 fromCenter: false, 2007 fromCenter: false,
2007 x: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].x, y: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].y, 2008 x: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].x, y: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].y,
2008 - width: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].width,  
2009 - height: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].height, 2009 + width: Math.abs($rootScope.rectDimension[$rootScope.rectDimension.length - 1].width),
  2010 + height: Math.abs($rootScope.rectDimension[$rootScope.rectDimension.length - 1].height),
2010 resizeFromCenter: false, 2011 resizeFromCenter: false,
2011 add: function (layer) { 2012 add: function (layer) {
2012 var TextAreaLayerName = layer.name; 2013 var TextAreaLayerName = layer.name;
@@ -2269,8 +2270,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -2269,8 +2270,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
2269 strokeWidth: 0, 2270 strokeWidth: 0,
2270 text: $rootScope.textArea, 2271 text: $rootScope.textArea,
2271 x: ($rootScope.rectDimension[$rootScope.rectDimension.length - 1].x), y: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].y, 2272 x: ($rootScope.rectDimension[$rootScope.rectDimension.length - 1].x), y: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].y,
2272 - maxWidth: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].width,  
2273 - maxHeight: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].height, 2273 + maxWidth: Math.abs($rootScope.rectDimension[$rootScope.rectDimension.length - 1].width),
  2274 + maxHeight: Math.abs($rootScope.rectDimension[$rootScope.rectDimension.length - 1].height),
2274 add: function (layer) { 2275 add: function (layer) {
2275 // console.log(layer.x + " " + layer.y); 2276 // console.log(layer.x + " " + layer.y);
2276 $rootScope.textXAxisAftrResize = layer.x; 2277 $rootScope.textXAxisAftrResize = layer.x;
@@ -2345,8 +2346,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -2345,8 +2346,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
2345 strokeWidth: $rootScope.shapestyleborderWidth, 2346 strokeWidth: $rootScope.shapestyleborderWidth,
2346 fillStyle: $rootScope.selectedBGColorForTextArea, 2347 fillStyle: $rootScope.selectedBGColorForTextArea,
2347 x: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].x, y: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].y, 2348 x: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].x, y: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].y,
2348 - width: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].width,  
2349 - height: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].height, 2349 + width: Math.abs($rootScope.rectDimension[$rootScope.rectDimension.length - 1].width),
  2350 + height: Math.abs($rootScope.rectDimension[$rootScope.rectDimension.length - 1].height),
2350 resizeFromCenter: false, 2351 resizeFromCenter: false,
2351 add: function (layer) { 2352 add: function (layer) {
2352 var TextAreaLayerName = layer.name; 2353 var TextAreaLayerName = layer.name;
@@ -2563,8 +2564,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -2563,8 +2564,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
2563 fromCenter: false, 2564 fromCenter: false,
2564 text: _modifiedText, 2565 text: _modifiedText,
2565 x: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].x, y: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].y, 2566 x: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].x, y: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].y,
2566 - maxWidth: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].width,  
2567 - maxHeight: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].height, 2567 + maxWidth: Math.abs($rootScope.rectDimension[$rootScope.rectDimension.length - 1].width),
  2568 + maxHeight: Math.abs($rootScope.rectDimension[$rootScope.rectDimension.length - 1].height),
2568 add: function (layer) { 2569 add: function (layer) {
2569 // console.log(layer.x + " " + layer.y); 2570 // console.log(layer.x + " " + layer.y);
2570 $rootScope.editTextXAxisAftrResize = layer.x; 2571 $rootScope.editTextXAxisAftrResize = layer.x;