Merge pull request #6883 from WebsiteDeveloper/overwriteAnimationFix

redmunds · redmunds · commit 3ad6d5f1ed3e · 2014-03-10T07:49:39.000-07:00
Don't show overwrite animation on click
diff --git a/src/editor/EditorStatusBar.js b/src/editor/EditorStatusBar.js
@@ -143,16 +143,26 @@ define(function (require, exports, module) {
         _updateCursorInfo();
     }
     
-    function _updateOverwriteLabel(event, editor, newstate) {
+    function _updateOverwriteLabel(event, editor, newstate, doNotAnimate) {
+        if ($statusOverwrite.text() === (newstate ? Strings.STATUSBAR_OVERWRITE : Strings.STATUSBAR_INSERT)) {
+            // label already up-to-date
+            return;
+        }
+
         $statusOverwrite.text(newstate ? Strings.STATUSBAR_OVERWRITE : Strings.STATUSBAR_INSERT);
-        
-        AnimationUtils.animateUsingClass($statusOverwrite[0], "flash");
+
+        if (!doNotAnimate) {
+            AnimationUtils.animateUsingClass($statusOverwrite[0], "flash");
+        }
     }
-    
-    function _updateEditorOverwriteMode() {
-        var editor = EditorManager.getActiveEditor();
-        
-        editor.toggleOverwrite(null);
+
+    function _updateEditorOverwriteMode(event) {
+        var editor = EditorManager.getActiveEditor(),
+            newstate = !editor._codeMirror.state.overwrite;
+
+        // update label with no transition
+        _updateOverwriteLabel(event, editor, newstate, true);
+        editor.toggleOverwrite(newstate);
     }
     
     function _initOverwriteMode(currentEditor) {
