diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 1b3c58a..f2eb08d 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -1956,13 +1956,17 @@ 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
                         layer.draggable = true;
                         $rootScope.shapeTypeText = "textAreaRect";
-
                         var layerName = layer.name;
                         var splitedName = layerName.split("_");
                         var textValName = "TextAreaNew_";
@@ -1975,7 +1979,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                                 fillStyle: '#fff',
                                 strokeStyle: '#c33',
                                 strokeWidth: 2,
-                                width: 5, height: 5,
+                                width: 7, height: 7,
                                 cornerRadius: 3
                                 
                             }
@@ -2151,7 +2155,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                         //jcanvas property
                         layer.draggable = false;
                     }
-                 
+                  
                 },
                 mouseover: function (layer) {
                     if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) {
@@ -2163,8 +2167,11 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                                 fillStyle: '#fff',
                                 strokeStyle: '#c33',
                                 strokeWidth: 2,
-                                width: 5, height: 5,
-                                cornerRadius: 3
+                                width: 7, height: 7,
+                                cornerRadius: 3,
+                                click: function () {
+                                    $rootScope.isTextAReaRectangleClicked = true;
+                                }
                               
                             }
                         }).drawLayers();
@@ -2173,7 +2180,28 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                         //jcanvas property
                         layer.draggable = false;
                     }
+                },
+                change: function (layer) {
+                   
+                    if ($rootScope.isTextAReaRectangleClicked == true) {
+                        if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) {
+                            console.log(layer.x + " " + layer.y);
+                            console.log($rootScope.textXAxisAftrResize + " " + $rootScope.textYAxisAftrResize);
+                            $rootScope.isTextAReaRectangleClicked = false;
+                            //if ((layer.x > $rootScope.textXAxisAftrResize) && (layer.y > $rootScope.textYAxisAftrResize) || (layer.x == $rootScope.textXAxisAftrResize) && (layer.y > $rootScope.textYAxisAftrResize) || (layer.x > $rootScope.textXAxisAftrResize) && (layer.y == $rootScope.textYAxisAftrResize)) {
+                                var CangedTextAreaName = 'TextAreaNew_' + $rootScope.postFixLayerNumber;
+                                $('#canvas').setLayer(CangedTextAreaName, {
+                                    x: layer.x,
+                                    y: layer.y
+                                });
+                              
+                            //}
+                            $rootScope.textXAxisAftrResize = layer.x;
+                            $rootScope.textYAxisAftrResize = layer.y;
+                        }
+                    }
                 }
+          
             }).drawText({
                 layer: true,
                 draggable: true,
@@ -2188,11 +2216,14 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                 align: $rootScope.textAlignmt,
                 strokeWidth: 0,
                 text: $rootScope.textArea,
-                x: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].x, y: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].y,
+                x: ($rootScope.rectDimension[$rootScope.rectDimension.length - 1].x), y: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].y,
                 maxWidth: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].width,
                 maxHeight: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].height,
                 add: function (layer) {
-                 
+                 //   console.log(layer.x + " " + layer.y);
+                    $rootScope.textXAxisAftrResize = layer.x;
+                   $rootScope.textYAxisAftrResize = layer.y;
+
                     //$rootScope.TextPropertyArray.push({ Text1: '', Align: '', FontColor: '', FontSize: '', FontStyle: '', FontFamily: '' });
                     $rootScope.TextPropertyArray.push({ layerName: layer.name, Rect_Text: layer.text, Align: layer.align, FontColor: layer.fillStyle, FontSize: layer.fontSize, FontStyle: layer.fontStyle, FontFamily: layer.fontFamily, TextDecoration: $rootScope.underlineText });
                 }
@@ -2265,7 +2296,11 @@ 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.postFixLayerNumberAftrEdit = TextAreaLayerNameAftrSplit[1];
+                },
                 click: function (layer) {
                     if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) {
                         //jcanvas property
@@ -2284,7 +2319,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                                 fillStyle: '#fff',
                                 strokeStyle: '#c33',
                                 strokeWidth: 2,
-                                width: 5, height: 5,
+                                width: 7, height: 7,
                                 cornerRadius: 3
                             }
                         }).drawLayers();
@@ -2412,7 +2447,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                         //jcanvas property
                         layer.draggable = false;
                     }
-                
+                    $rootScope.RectXAxisAftrResize = layer.x;
+                    $rootScope.RectYAxisAftrResize = layer.y;
                 },
                 mouseover: function (layer) {
                     if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) {
@@ -2424,8 +2460,11 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                                 fillStyle: '#fff',
                                 strokeStyle: '#c33',
                                 strokeWidth: 2,
-                                width: 5, height: 5,
-                                cornerRadius: 3
+                                width: 7, height: 7,
+                                cornerRadius: 3,
+                                click: function () {
+                                    $rootScope.isTextAReaRectangleClickedAftrEdit = true;
+                                }
                             }
                         }).drawLayers();
 
@@ -2435,6 +2474,26 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                         //jcanvas property
                         layer.draggable = false;
                     }
+                },
+                change: function (layer) {
+
+                    if ($rootScope.isTextAReaRectangleClickedAftrEdit == true) {
+                        if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) {
+                            console.log(layer.x + " " + layer.y);
+                            console.log($rootScope.textXAxisAftrResize + " " + $rootScope.textYAxisAftrResize);
+                            $rootScope.isTextAReaRectangleClickedAftrEdit = false;
+                            //if ((layer.x > $rootScope.textXAxisAftrResize) && (layer.y > $rootScope.textYAxisAftrResize) || (layer.x == $rootScope.textXAxisAftrResize) && (layer.y > $rootScope.textYAxisAftrResize) || (layer.x > $rootScope.textXAxisAftrResize) && (layer.y == $rootScope.textYAxisAftrResize)) {
+                            var CangedTextAreaName = 'TextAreaAfterEdit_' + $rootScope.postFixLayerNumberAftrEdit;
+                            $('#canvas').setLayer(CangedTextAreaName, {
+                                x: layer.x,
+                                y: layer.y
+                            });
+
+                            //}
+                            $rootScope.editTextXAxisAftrResize = layer.x;
+                            $rootScope.editTextYAxisAftrResize = layer.y;
+                        }
+                    }
                 }
                
             }).drawText({
@@ -2453,8 +2512,12 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                 text: _modifiedText,
                 x: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].x, y: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].y,
                 maxWidth: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].width,
-                maxHeight: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].height
-
+                maxHeight: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].height,
+                add: function (layer) {
+                    //   console.log(layer.x + " " + layer.y);
+                $rootScope.editTextXAxisAftrResize = layer.x;
+                $rootScope.editTextYAxisAftrResize = layer.y;
+            }
             });
 
         }