reorganize SC.CloseFieldEditor() to reduce possibilty of interference…

… if it is invoked while dispatching
fohr · May 14, 2012 · 0954460 · 0954460
1 parent 42d23f4
commit 0954460
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/application/text/field_editor.js b/application/text/field_editor.js
@@ -260,9 +260,16 @@ SC.CloseFieldEditor = function() {
   sc_assert(input);
   sc_assert(document.getElementById(input.id));
 
+  SC.activeEditor = null;
+  editor.widget = null;
+  SC.app.set('fieldEditor', null);
+
   var value = input.value,
       old;
 
+  input.style.display = 'none';
+  document.body.appendChild(input);
+
   if (widget.valueForFieldEditor) {
     old = widget.valueForFieldEditor();
   } else {
@@ -271,17 +278,12 @@ SC.CloseFieldEditor = function() {
 
   if (old !== value) {
     if (widget.takeValueFromFieldEditor) widget.takeValueFromFieldEditor(value);
-    else widget.set('value', value);
+    else {
+      widget.set('value', value);
+    }
   }
 
   widget.tryToPerform('fieldEditorDidClose');
-
-  SC.activeEditor = null;
-  editor.widget = null;
-  SC.app.set('fieldEditor', null);
-
-  input.style.display = 'none';
-  document.body.appendChild(input);
 };
 
 SC.ready(function() {