Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.

Commit 3ad6d5f

Browse files
committed
Merge pull request #6883 from WebsiteDeveloper/overwriteAnimationFix
Don't show overwrite animation on click
2 parents 5fe1161 + 7b5af95 commit 3ad6d5f

File tree

1 file changed

+18
-8
lines changed

1 file changed

+18
-8
lines changed

src/editor/EditorStatusBar.js

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -143,16 +143,26 @@ define(function (require, exports, module) {
143143
_updateCursorInfo();
144144
}
145145

146-
function _updateOverwriteLabel(event, editor, newstate) {
146+
function _updateOverwriteLabel(event, editor, newstate, doNotAnimate) {
147+
if ($statusOverwrite.text() === (newstate ? Strings.STATUSBAR_OVERWRITE : Strings.STATUSBAR_INSERT)) {
148+
// label already up-to-date
149+
return;
150+
}
151+
147152
$statusOverwrite.text(newstate ? Strings.STATUSBAR_OVERWRITE : Strings.STATUSBAR_INSERT);
148-
149-
AnimationUtils.animateUsingClass($statusOverwrite[0], "flash");
153+
154+
if (!doNotAnimate) {
155+
AnimationUtils.animateUsingClass($statusOverwrite[0], "flash");
156+
}
150157
}
151-
152-
function _updateEditorOverwriteMode() {
153-
var editor = EditorManager.getActiveEditor();
154-
155-
editor.toggleOverwrite(null);
158+
159+
function _updateEditorOverwriteMode(event) {
160+
var editor = EditorManager.getActiveEditor(),
161+
newstate = !editor._codeMirror.state.overwrite;
162+
163+
// update label with no transition
164+
_updateOverwriteLabel(event, editor, newstate, true);
165+
editor.toggleOverwrite(newstate);
156166
}
157167

158168
function _initOverwriteMode(currentEditor) {

0 commit comments

Comments
 (0)