Update ace.js to 1.2.6

This commit is contained in:
Florian Bruhin 2016-12-28 17:39:01 +01:00
parent ab784a82fd
commit 473df00ae5

View File

@ -2283,6 +2283,9 @@ var TextInput = function(parentNode, host) {
if (e.type == "compositionend" && c.range) { if (e.type == "compositionend" && c.range) {
host.selection.setRange(c.range); host.selection.setRange(c.range);
} }
if (useragent.isChrome && useragent.isChrome >= 53) {
onInput();
}
}; };
@ -6047,7 +6050,7 @@ var Mode = function() {
}; };
(function() { (function() {
this.$behaviour = new CstyleBehaviour(); this.$defaultBehaviour = new CstyleBehaviour();
this.tokenRe = new RegExp("^[" this.tokenRe = new RegExp("^["
+ unicode.packages.L + unicode.packages.L
@ -10533,7 +10536,7 @@ var Search = function() {
needle = lang.escapeRegExp(needle); needle = lang.escapeRegExp(needle);
if (options.wholeWord) if (options.wholeWord)
needle = "\\b" + needle + "\\b"; needle = addWordBoundary(needle, options);
var modifier = options.caseSensitive ? "gm" : "gmi"; var modifier = options.caseSensitive ? "gm" : "gmi";
@ -10622,6 +10625,15 @@ var Search = function() {
}).call(Search.prototype); }).call(Search.prototype);
function addWordBoundary(needle, options) {
function wordBoundary(c) {
if (/\w/.test(c) || options.regExp) return "\\b";
return "";
}
return wordBoundary(needle[0]) + needle
+ wordBoundary(needle[needle.length - 1]);
}
exports.Search = Search; exports.Search = Search;
}); });
@ -10976,7 +10988,7 @@ exports.commands = [{
readOnly: true readOnly: true
}, { }, {
name: "goToNextError", name: "goToNextError",
bindKey: bindKey("Alt-E", "Ctrl-E"), bindKey: bindKey("Alt-E", "F4"),
exec: function(editor) { exec: function(editor) {
config.loadModule("ace/ext/error_marker", function(module) { config.loadModule("ace/ext/error_marker", function(module) {
module.showErrorMarker(editor, 1); module.showErrorMarker(editor, 1);
@ -10986,7 +10998,7 @@ exports.commands = [{
readOnly: true readOnly: true
}, { }, {
name: "goToPreviousError", name: "goToPreviousError",
bindKey: bindKey("Alt-Shift-E", "Ctrl-Shift-E"), bindKey: bindKey("Alt-Shift-E", "Shift-F4"),
exec: function(editor) { exec: function(editor) {
config.loadModule("ace/ext/error_marker", function(module) { config.loadModule("ace/ext/error_marker", function(module) {
module.showErrorMarker(editor, -1); module.showErrorMarker(editor, -1);
@ -11111,7 +11123,7 @@ exports.commands = [{
readOnly: true readOnly: true
}, { }, {
name: "selecttostart", name: "selecttostart",
bindKey: bindKey("Ctrl-Shift-Home", "Command-Shift-Up"), bindKey: bindKey("Ctrl-Shift-Home", "Command-Shift-Home|Command-Shift-Up"),
exec: function(editor) { editor.getSelection().selectFileStart(); }, exec: function(editor) { editor.getSelection().selectFileStart(); },
multiSelectAction: "forEach", multiSelectAction: "forEach",
readOnly: true, readOnly: true,
@ -11127,7 +11139,7 @@ exports.commands = [{
aceCommandGroup: "fileJump" aceCommandGroup: "fileJump"
}, { }, {
name: "selectup", name: "selectup",
bindKey: bindKey("Shift-Up", "Shift-Up"), bindKey: bindKey("Shift-Up", "Shift-Up|Ctrl-Shift-P"),
exec: function(editor) { editor.getSelection().selectUp(); }, exec: function(editor) { editor.getSelection().selectUp(); },
multiSelectAction: "forEach", multiSelectAction: "forEach",
scrollIntoView: "cursor", scrollIntoView: "cursor",
@ -11141,7 +11153,7 @@ exports.commands = [{
readOnly: true readOnly: true
}, { }, {
name: "selecttoend", name: "selecttoend",
bindKey: bindKey("Ctrl-Shift-End", "Command-Shift-Down"), bindKey: bindKey("Ctrl-Shift-End", "Command-Shift-End|Command-Shift-Down"),
exec: function(editor) { editor.getSelection().selectFileEnd(); }, exec: function(editor) { editor.getSelection().selectFileEnd(); },
multiSelectAction: "forEach", multiSelectAction: "forEach",
readOnly: true, readOnly: true,
@ -11157,7 +11169,7 @@ exports.commands = [{
aceCommandGroup: "fileJump" aceCommandGroup: "fileJump"
}, { }, {
name: "selectdown", name: "selectdown",
bindKey: bindKey("Shift-Down", "Shift-Down"), bindKey: bindKey("Shift-Down", "Shift-Down|Ctrl-Shift-N"),
exec: function(editor) { editor.getSelection().selectDown(); }, exec: function(editor) { editor.getSelection().selectDown(); },
multiSelectAction: "forEach", multiSelectAction: "forEach",
scrollIntoView: "cursor", scrollIntoView: "cursor",
@ -11185,7 +11197,7 @@ exports.commands = [{
readOnly: true readOnly: true
}, { }, {
name: "selecttolinestart", name: "selecttolinestart",
bindKey: bindKey("Alt-Shift-Left", "Command-Shift-Left"), bindKey: bindKey("Alt-Shift-Left", "Command-Shift-Left|Ctrl-Shift-A"),
exec: function(editor) { editor.getSelection().selectLineStart(); }, exec: function(editor) { editor.getSelection().selectLineStart(); },
multiSelectAction: "forEach", multiSelectAction: "forEach",
scrollIntoView: "cursor", scrollIntoView: "cursor",
@ -11199,7 +11211,7 @@ exports.commands = [{
readOnly: true readOnly: true
}, { }, {
name: "selectleft", name: "selectleft",
bindKey: bindKey("Shift-Left", "Shift-Left"), bindKey: bindKey("Shift-Left", "Shift-Left|Ctrl-Shift-B"),
exec: function(editor) { editor.getSelection().selectLeft(); }, exec: function(editor) { editor.getSelection().selectLeft(); },
multiSelectAction: "forEach", multiSelectAction: "forEach",
scrollIntoView: "cursor", scrollIntoView: "cursor",
@ -11227,7 +11239,7 @@ exports.commands = [{
readOnly: true readOnly: true
}, { }, {
name: "selecttolineend", name: "selecttolineend",
bindKey: bindKey("Alt-Shift-Right", "Command-Shift-Right"), bindKey: bindKey("Alt-Shift-Right", "Command-Shift-Right|Shift-End|Ctrl-Shift-E"),
exec: function(editor) { editor.getSelection().selectLineEnd(); }, exec: function(editor) { editor.getSelection().selectLineEnd(); },
multiSelectAction: "forEach", multiSelectAction: "forEach",
scrollIntoView: "cursor", scrollIntoView: "cursor",
@ -12091,7 +12103,8 @@ var Editor = function(renderer, session) {
var row = iterator.getCurrentTokenRow(); var row = iterator.getCurrentTokenRow();
var column = iterator.getCurrentTokenColumn(); var column = iterator.getCurrentTokenColumn();
var range = new Range(row, column, row, column+token.value.length); var range = new Range(row, column, row, column+token.value.length);
if (session.$tagHighlight && range.compareRange(session.$backMarkers[session.$tagHighlight].range)!==0) { var sbm = session.$backMarkers[session.$tagHighlight];
if (session.$tagHighlight && sbm != undefined && range.compareRange(sbm.range) !== 0) {
session.removeMarker(session.$tagHighlight); session.removeMarker(session.$tagHighlight);
session.$tagHighlight = null; session.$tagHighlight = null;
} }
@ -19039,7 +19052,7 @@ exports.createEditSession = function(text, mode) {
} }
exports.EditSession = EditSession; exports.EditSession = EditSession;
exports.UndoManager = UndoManager; exports.UndoManager = UndoManager;
exports.version = "1.2.5"; exports.version = "1.2.6";
}); });
(function() { (function() {
window.require(["ace/ace"], function(a) { window.require(["ace/ace"], function(a) {