diff --git a/package-lock.json b/package-lock.json index fb2b01e3..1f7a454e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,21 +1,21 @@ { "name": "Stylus", - "version": "1.5.25", + "version": "1.5.27", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "Stylus", - "version": "1.5.25", + "version": "1.5.27", "license": "GPL-3.0-only", "dependencies": { "@eight04/draggable-list": "^0.3.0", - "codemirror": "5.65.7", + "codemirror": "5.65.8", "db-to-cloud": "^0.7.0", "jsonlint": "^1.6.3", "less-bundle": "github:openstyles/less-bundle#v0.1.0", "lz-string-unsafe": "^1.4.4-fork-1", - "stylelint-bundle": "14.9.1-fixup", + "stylelint-bundle": "^14.9.1-fixup", "stylus-lang-bundle": "^0.58.1", "usercss-meta": "^0.12.0", "webext-launch-web-auth-flow": "^0.1.1" @@ -1356,9 +1356,9 @@ } }, "node_modules/codemirror": { - "version": "5.65.7", - "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.7.tgz", - "integrity": "sha512-zb67cXzgugIQmb6tfD4G11ILjYoMfTjwcjn+cWsa4GewlI2adhR/h3kolkoCQTm1msD/1BuqVTKuO09ELsS++A==" + "version": "5.65.8", + "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.8.tgz", + "integrity": "sha512-TNGkSkkoAsmZSf6W6g35LMVQJBHKasc2CKwhr/fTxSYun7cn6J+CbtyNjV/MYlFVkNTsqZoviegyCZimWhoMMA==" }, "node_modules/color-convert": { "version": "1.9.3", @@ -8504,9 +8504,9 @@ } }, "codemirror": { - "version": "5.65.7", - "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.7.tgz", - "integrity": "sha512-zb67cXzgugIQmb6tfD4G11ILjYoMfTjwcjn+cWsa4GewlI2adhR/h3kolkoCQTm1msD/1BuqVTKuO09ELsS++A==" + "version": "5.65.8", + "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.8.tgz", + "integrity": "sha512-TNGkSkkoAsmZSf6W6g35LMVQJBHKasc2CKwhr/fTxSYun7cn6J+CbtyNjV/MYlFVkNTsqZoviegyCZimWhoMMA==" }, "color-convert": { "version": "1.9.3", diff --git a/package.json b/package.json index 16c81a80..35629433 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@eight04/draggable-list": "^0.3.0", - "codemirror": "5.65.7", + "codemirror": "5.65.8", "db-to-cloud": "^0.7.0", "jsonlint": "^1.6.3", "less-bundle": "github:openstyles/less-bundle#v0.1.0", diff --git a/vendor/codemirror/README.md b/vendor/codemirror/README.md index a1dfa3c8..dc43c5c3 100644 --- a/vendor/codemirror/README.md +++ b/vendor/codemirror/README.md @@ -1,4 +1,4 @@ -## codemirror v5.65.7 +## codemirror v5.65.8 Files copied from NPM (node_modules): * addon/comment/comment.js diff --git a/vendor/codemirror/addon/fold/foldgutter.js b/vendor/codemirror/addon/fold/foldgutter.js index 481fea2a..8fc0e994 100644 --- a/vendor/codemirror/addon/fold/foldgutter.js +++ b/vendor/codemirror/addon/fold/foldgutter.js @@ -21,6 +21,7 @@ cm.off("fold", onFold); cm.off("unfold", onFold); cm.off("swapDoc", onChange); + cm.off("optionChange", optionChange); } if (val) { cm.state.foldGutter = new State(parseOptions(val)); @@ -31,6 +32,7 @@ cm.on("fold", onFold); cm.on("unfold", onFold); cm.on("swapDoc", onChange); + cm.on("optionChange", optionChange); } }); @@ -120,6 +122,10 @@ else cm.foldCode(Pos(line, 0), opts); } + function optionChange(cm, option) { + if (option == "mode") onChange(cm) + } + function onChange(cm) { var state = cm.state.foldGutter; if (!state) return; diff --git a/vendor/codemirror/lib/codemirror.js b/vendor/codemirror/lib/codemirror.js index 5ff61d9e..2254f538 100644 --- a/vendor/codemirror/lib/codemirror.js +++ b/vendor/codemirror/lib/codemirror.js @@ -7772,7 +7772,7 @@ for (var i = newBreaks.length - 1; i >= 0; i--) { replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length)); } }); - option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b\u200e\u200f\u2028\u2029\ufeff\ufff9-\ufffc]/g, function (cm, val, old) { + option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b\u200e\u200f\u2028\u2029\u202d\u202e\u2066\u2067\u2069\ufeff\ufff9-\ufffc]/g, function (cm, val, old) { cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g"); if (old != Init) { cm.refresh(); } }); @@ -9368,6 +9368,7 @@ // Used to work around IE issue with selection being forgotten when focus moves away from textarea this.hasSelection = false; this.composing = null; + this.resetting = false; }; TextareaInput.prototype.init = function (display) { @@ -9500,8 +9501,9 @@ // Reset the input to correspond to the selection (or to be empty, // when not typing and nothing is selected) TextareaInput.prototype.reset = function (typing) { - if (this.contextMenuPending || this.composing) { return } + if (this.contextMenuPending || this.composing && typing) { return } var cm = this.cm; + this.resetting = true; if (cm.somethingSelected()) { this.prevInput = ""; var content = cm.getSelection(); @@ -9512,6 +9514,7 @@ this.prevInput = this.textarea.value = ""; if (ie && ie_version >= 9) { this.hasSelection = null; } } + this.resetting = false; }; TextareaInput.prototype.getField = function () { return this.textarea }; @@ -9573,7 +9576,7 @@ // possible when it is clear that nothing happened. hasSelection // will be the case when there is a lot of text in the textarea, // in which case reading its value would be expensive. - if (this.contextMenuPending || !cm.state.focused || + if (this.contextMenuPending || this.resetting || !cm.state.focused || (hasSelection(input) && !prevInput && !this.composing) || cm.isReadOnly() || cm.options.disableInput || cm.state.keySeq) { return false } @@ -9860,7 +9863,7 @@ addLegacyProps(CodeMirror); - CodeMirror.version = "5.65.7"; + CodeMirror.version = "5.65.8"; return CodeMirror;