Commit 39c96872622971bb7a2098d1b5b80eca954b6786

Authored by unknown
1 parent 3f238331

DA > Unable to resize transparency box, if annotation toolbar isopen.

400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -1953,12 +1953,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -1953,12 +1953,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
1953 width: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].width, 1953 width: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].width,
1954 height: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].height, 1954 height: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].height,
1955 resizeFromCenter: false, 1955 resizeFromCenter: false,
1956 - add: function(layer){  
1957 - var TextAreaLayerName = layer.name;  
1958 - var TextAreaLayerNameAftrSplit = TextAreaLayerName.split("_");  
1959 - $rootScope.postFixLayerNumber = TextAreaLayerNameAftrSplit[1];  
1960 - },  
1961 -  
1962 click: function (layer) { 1956 click: function (layer) {
1963 1957
1964 if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) { 1958 if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) {
@@ -2149,8 +2143,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -2149,8 +2143,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
2149 2143
2150 } 2144 }
2151 }).drawLayers(); 2145 }).drawLayers();
2152 - $rootScope.TextAreaRectXAxisAftrResize = layer.x;  
2153 - $rootScope.TextAreaRectYAxisAftrResize = layer.y;  
2154 } 2146 }
2155 else { 2147 else {
2156 //jcanvas property 2148 //jcanvas property
@@ -2178,17 +2170,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -2178,17 +2170,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
2178 //jcanvas property 2170 //jcanvas property
2179 layer.draggable = false; 2171 layer.draggable = false;
2180 } 2172 }
2181 - },  
2182 - change: function (layer) {  
2183 - if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) {  
2184 - 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)) {  
2185 - var CangedTextAreaName = 'TextAreaNew_' + $rootScope.postFixLayerNumber;  
2186 - $('#canvas').setLayer(CangedTextAreaName, {  
2187 - x: layer.x,  
2188 - y: layer.y  
2189 - });  
2190 - }  
2191 - }  
2192 } 2173 }
2193 }).drawText({ 2174 }).drawText({
2194 layer: true, 2175 layer: true,
@@ -2264,7 +2245,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -2264,7 +2245,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
2264 $rootScope.resetTextSave = $rootScope.ObjectIndexSave++; 2245 $rootScope.resetTextSave = $rootScope.ObjectIndexSave++;
2265 2246
2266 // generating new text area 2247 // generating new text area
2267 - $('#canvas') 2248 + // $('#canvas')
2268 // Draw rect as wide as the text 2249 // Draw rect as wide as the text
2269 $('#canvas').drawRect({ 2250 $('#canvas').drawRect({
2270 name: 'TextAreaAfterEditRect_' + $rootScope.resetTextSave, 2251 name: 'TextAreaAfterEditRect_' + $rootScope.resetTextSave,
@@ -2281,11 +2262,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -2281,11 +2262,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
2281 width: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].width, 2262 width: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].width,
2282 height: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].height, 2263 height: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].height,
2283 resizeFromCenter: false, 2264 resizeFromCenter: false,
2284 - add: function (layer) {  
2285 - var TextAreaLayerName = layer.name;  
2286 - var TextAreaLayerNameAftrSplit = TextAreaLayerName.split("_");  
2287 - $rootScope.postFixLayerNumber = TextAreaLayerNameAftrSplit[1];  
2288 - }, 2265 +
2289 click: function (layer) { 2266 click: function (layer) {
2290 if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) { 2267 if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) {
2291 //jcanvas property 2268 //jcanvas property
@@ -2426,8 +2403,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -2426,8 +2403,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
2426 cornerRadius: 0 2403 cornerRadius: 0
2427 } 2404 }
2428 }).drawLayers(); 2405 }).drawLayers();
2429 - $rootScope.RectXAxisAftrResize = layer.x;  
2430 - $rootScope.RectYAxisAftrResize = layer.y; 2406 +
2431 } 2407 }
2432 else { 2408 else {
2433 //jcanvas property 2409 //jcanvas property
@@ -2456,18 +2432,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -2456,18 +2432,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
2456 //jcanvas property 2432 //jcanvas property
2457 layer.draggable = false; 2433 layer.draggable = false;
2458 } 2434 }
2459 - },  
2460 - change: function (layer) {  
2461 - if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) {  
2462 - 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)) {  
2463 - var CangedTextAreaName = 'TextAreaNew_' + $rootScope.postFixLayerNumber;  
2464 - $('#canvas').setLayer(CangedTextAreaName, {  
2465 - x: layer.x,  
2466 - y: layer.y  
2467 - });  
2468 - }  
2469 - }  
2470 } 2435 }
  2436 +
2471 }).drawText({ 2437 }).drawText({
2472 layer: true, 2438 layer: true,
2473 draggable: true, 2439 draggable: true,