Commit 632ab473abe2d30a3e32cfcad5b1aa9e24bf7bc1
Merge branch 'TextAreaDoubleClickIssue' into Develop
Showing
1 changed file
with
6 additions
and
8 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
... | ... | @@ -962,8 +962,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", |
962 | 962 | |
963 | 963 | }, |
964 | 964 | dblclick: function (layer) { |
965 | - | |
966 | - | |
965 | + | |
966 | + $rootScope.IsTextAlreadySave = false; | |
967 | 967 | var RectNameArray = (layer.name).split("_"); |
968 | 968 | |
969 | 969 | var TextAreaRectangleName = "TextArea_"; |
... | ... | @@ -1184,7 +1184,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", |
1184 | 1184 | ///----- |
1185 | 1185 | |
1186 | 1186 | $rootScope.saveText = function () { |
1187 | - | |
1187 | + | |
1188 | 1188 | // this part will work first time when save button will be clicked |
1189 | 1189 | if ($rootScope.IsTextAlreadySave == false) { |
1190 | 1190 | // getting textarea style properties |
... | ... | @@ -1265,7 +1265,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", |
1265 | 1265 | }).drawLayers(); |
1266 | 1266 | }, |
1267 | 1267 | dblclick: function (layer) { |
1268 | - | |
1268 | + | |
1269 | 1269 | $rootScope.isTextAreaClosedButtonActive = false; |
1270 | 1270 | $rootScope.IsTextAlreadySave = true; |
1271 | 1271 | |
... | ... | @@ -1419,9 +1419,6 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", |
1419 | 1419 | } |
1420 | 1420 | |
1421 | 1421 | |
1422 | - | |
1423 | - | |
1424 | - | |
1425 | 1422 | // _rectLayerOnSaveSplitInt = ''; |
1426 | 1423 | textArrVal = ''; |
1427 | 1424 | $("#annotationTextModal").modal("toggle"); |
... | ... | @@ -1552,7 +1549,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", |
1552 | 1549 | |
1553 | 1550 | }, |
1554 | 1551 | dblclick: function (layer) { |
1555 | - | |
1552 | + | |
1553 | + | |
1556 | 1554 | $rootScope.isTextAreaClosedButtonActive = false; |
1557 | 1555 | $rootScope.IsTextAlreadySave = true; |
1558 | 1556 | var _rectLayerOnSave = layer.name; | ... | ... |