Merge pull request vitalets#251 from enapupe/move

added setTimeout() to call $hide on another stack
mcliment · Mar 19, 2015 · a085d79 · a085d79
2 parents 4f2f989 + b596ba9
commit a085d79
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/js/editable-element/controller.js b/src/js/editable-element/controller.js
@@ -385,10 +385,19 @@ angular.module('xeditable').factory('editableController',
       }
     };
 
-    self.activate = function() {
+    self.activate = function(start, end) {
       setTimeout(function() {
         var el = self.inputEl[0];
         if (editableOptions.activate === 'focus' && el.focus) {
+          if(start){
+            end = end || start;
+            el.onfocus = function(){
+              var that = this;
+              setTimeout(function(){
+                that.setSelectionRange(start,end);
+              });
+            };
+          }
           el.focus();
         }
         if (editableOptions.activate === 'select' && el.select) {

diff --git a/src/js/editable-form/controller.js b/src/js/editable-form/controller.js
@@ -151,7 +151,7 @@ angular.module('xeditable').factory('editableFormController',
         }
 
         //by default activate first field
-        this.$editables[0].activate();
+        this.$editables[0].activate(this.$editables[0].elem[0].selectionStart, this.$editables[0].elem[0].selectionEnd);
       }
     },
 
@@ -194,7 +194,10 @@ angular.module('xeditable').factory('editableFormController',
         editable.cancel();
       });
       // self hide
-      this.$hide();
+      var that = this;
+      setTimeout(function(){
+        that.$hide();
+      });
     },    
 
     $setWaiting: function(value) {