ADAM / AIAHTML5

Commit acd0e04001dc5d436e1de155f2f1b67998468b46

Authored by Amrita Vishnoi
2 parents 9c2ad1d7 46998b12

Merge branch 'RectangleResizingIssue' into Develop

Inline Side-by-side
Showing 1 changed file with 5 additions and 1 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @acd0e04
@@ -633,7 +633,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -633,7 +633,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
633 width: (x - offsetX1), 633 width: (x - offsetX1),
634 height: (y - offsetY1), 634 height: (y - offsetY1),
635 635
636 - resizeFromCenter: true, 636 + resizeFromCenter: false,
637 637
638 dblclick: function () { 638 dblclick: function () {
639 639
@@ -709,6 +709,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -709,6 +709,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
709 x: (offsetX1), y: (offsetY1), 709 x: (offsetX1), y: (offsetY1),
710 width: (x - offsetX1), height: (y - offsetY1), 710 width: (x - offsetX1), height: (y - offsetY1),
711 // Place a handle at each side and each corner 711 // Place a handle at each side and each corner
  712 + resizeFromCenter: false,
712 handlePlacement: 'both', 713 handlePlacement: 'both',
713 click: function (layer) { 714 click: function (layer) {
714 $rootScope.canvasLayerNameCollection = []; 715 $rootScope.canvasLayerNameCollection = [];
@@ -979,6 +980,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -979,6 +980,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
979 x: $rootScope.offsetX1, y: $rootScope.offsetY1, 980 x: $rootScope.offsetX1, y: $rootScope.offsetY1,
980 width: ($rootScope.x - $rootScope.offsetX1), 981 width: ($rootScope.x - $rootScope.offsetX1),
981 height: ($rootScope.y - $rootScope.offsetY1), 982 height: ($rootScope.y - $rootScope.offsetY1),
  983 + resizeFromCenter: false,
982 add: function (layer) { 984 add: function (layer) {
983 985
984 $rootScope.TextAreaRectID = layer.name; 986 $rootScope.TextAreaRectID = layer.name;
@@ -1361,6 +1363,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -1361,6 +1363,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1361 x: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].x, y: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].y, 1363 x: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].x, y: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].y,
1362 width: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].width, 1364 width: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].width,
1363 height: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].height, 1365 height: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].height,
  1366 + resizeFromCenter: false,
1364 click: function (layer) { 1367 click: function (layer) {
1365 $rootScope.shapeTypeText = "textAreaRect"; 1368 $rootScope.shapeTypeText = "textAreaRect";
1366 1369
@@ -1628,6 +1631,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -1628,6 +1631,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1628 x: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].x, y: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].y, 1631 x: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].x, y: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].y,
1629 width: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].width, 1632 width: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].width,
1630 height: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].height, 1633 height: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].height,
  1634 + resizeFromCenter: false,
1631 click: function (layer) { 1635 click: function (layer) {
1632 $rootScope.shapeTypeText = "textAreaRect"; 1636 $rootScope.shapeTypeText = "textAreaRect";
1633 var layerNameSplit = layer.name; 1637 var layerNameSplit = layer.name;