diff options
author | Raccoon | 2017-03-03 09:22:35 +0800 |
---|---|---|
committer | GitHub | 2017-03-03 09:22:35 +0800 |
commit | 48592d692c2b8a71e3ca9e7f0bc34f230eea1542 (patch) | |
tree | 053538d49b92121e29e0e576d2e5e0b249d28537 /public/vendor/ot/codemirror-adapter.js | |
parent | a8b99638b2bc4db0dffd643b96287faf4f97e030 (diff) | |
parent | 0bea4da6238b1f46562b146b32d88fc8d8b9060a (diff) |
Merge branch 'master' into feature/addSecrets
Diffstat (limited to 'public/vendor/ot/codemirror-adapter.js')
-rwxr-xr-x | public/vendor/ot/codemirror-adapter.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/public/vendor/ot/codemirror-adapter.js b/public/vendor/ot/codemirror-adapter.js index d858c411..cc23be01 100755 --- a/public/vendor/ot/codemirror-adapter.js +++ b/public/vendor/ot/codemirror-adapter.js @@ -343,7 +343,9 @@ ot.CodeMirrorAdapter = (function (global) { }; CodeMirrorAdapter.prototype.applyOperation = function (operation) { - this.ignoreNextChange = true; + if (!operation.isNoop()) { + this.ignoreNextChange = true; + } CodeMirrorAdapter.applyOperationToCodeMirror(operation, this.cm); }; |