diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index 7f69ee1..bec7a09 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -1953,12 +1953,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic width: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].width, height: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].height, resizeFromCenter: false, - add: function(layer){ - var TextAreaLayerName = layer.name; - var TextAreaLayerNameAftrSplit = TextAreaLayerName.split("_"); - $rootScope.postFixLayerNumber = TextAreaLayerNameAftrSplit[1]; - }, - click: function (layer) { if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) { @@ -2149,8 +2143,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic } }).drawLayers(); - $rootScope.TextAreaRectXAxisAftrResize = layer.x; - $rootScope.TextAreaRectYAxisAftrResize = layer.y; } else { //jcanvas property @@ -2178,17 +2170,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic //jcanvas property layer.draggable = false; } - }, - change: function (layer) { - if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) { - if ((layer.x > $rootScope.TextAreaRectXAxisAftrResize && layer.y > $rootScope.TextAreaRectYAxisAftrResize) || (layer.x == $rootScope.TextAreaRectXAxisAftrResize && layer.y > $rootScope.TextAreaRectYAxisAftrResize) || (layer.x > $rootScope.TextAreaRectXAxisAftrResize && layer.y == $rootScope.TextAreaRectYAxisAftrResize)) { - var CangedTextAreaName = 'TextAreaNew_' + $rootScope.postFixLayerNumber; - $('#canvas').setLayer(CangedTextAreaName, { - x: layer.x, - y: layer.y - }); - } - } } }).drawText({ layer: true, @@ -2264,7 +2245,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $rootScope.resetTextSave = $rootScope.ObjectIndexSave++; // generating new text area - $('#canvas') + // $('#canvas') // Draw rect as wide as the text $('#canvas').drawRect({ name: 'TextAreaAfterEditRect_' + $rootScope.resetTextSave, @@ -2281,11 +2262,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic width: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].width, height: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].height, resizeFromCenter: false, - add: function (layer) { - var TextAreaLayerName = layer.name; - var TextAreaLayerNameAftrSplit = TextAreaLayerName.split("_"); - $rootScope.postFixLayerNumber = TextAreaLayerNameAftrSplit[1]; - }, + click: function (layer) { if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) { //jcanvas property @@ -2426,8 +2403,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic cornerRadius: 0 } }).drawLayers(); - $rootScope.RectXAxisAftrResize = layer.x; - $rootScope.RectYAxisAftrResize = layer.y; + } else { //jcanvas property @@ -2456,18 +2432,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic //jcanvas property layer.draggable = false; } - }, - change: function (layer) { - if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) { - if ((layer.x > $rootScope.RectXAxisAftrResize && layer.y > $rootScope.RectYAxisAftrResize) || (layer.x == $rootScope.RectXAxisAftrResize && layer.y > $rootScope.RectYAxisAftrResize) || (layer.x > $rootScope.RectXAxisAftrResize && layer.y == $rootScope.RectYAxisAftrResize)) { - var CangedTextAreaName = 'TextAreaNew_' + $rootScope.postFixLayerNumber; - $('#canvas').setLayer(CangedTextAreaName, { - x: layer.x, - y: layer.y - }); - } - } } + }).drawText({ layer: true, draggable: true,