Skip to content

Commit

Permalink
package 06.07.20
Browse files Browse the repository at this point in the history
  • Loading branch information
nightwing committed Jul 6, 2020
1 parent bb63e64 commit 53be423
Show file tree
Hide file tree
Showing 130 changed files with 24,712 additions and 24,424 deletions.
5 changes: 5 additions & 0 deletions ChangeLog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2020.07.06 Version 1.4.12
* removed unused es5-shim
* imporved ruby and vbscript highlighting and folding
* workaround for double space being converted to dot on mobile keyboards

2020.04.15 Version 1.4.10
* added workaround for chrome bug causing memory leak after calling editor.destroy
* added code folding support for vbscript mode
Expand Down
3 changes: 2 additions & 1 deletion ace-modules.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
declare module 'ace-builds/webpack-resolver';
declare module 'ace-builds/src-noconflict/ace';
declare module 'ace-builds/src-noconflict/ext-beautify';
declare module 'ace-builds/src-noconflict/ext-code_lens';
declare module 'ace-builds/src-noconflict/ext-elastic_tabstops_lite';
Expand Down Expand Up @@ -403,4 +405,3 @@ declare module 'ace-builds/src-noconflict/snippets/xml';
declare module 'ace-builds/src-noconflict/snippets/xquery';
declare module 'ace-builds/src-noconflict/snippets/yaml';
declare module 'ace-builds/src-noconflict/snippets/zeek';
declare module 'ace-builds/webpack-resolver';
6 changes: 3 additions & 3 deletions ace.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ export namespace Ace {
}

export interface EditSessionOptions {
wrap: string | number;
wrap: "off" | "free" | "printmargin" | boolean | number;
wrapMethod: 'code' | 'text' | 'auto';
indentedSoftWrap: boolean;
firstLineNumber: number;
Expand Down Expand Up @@ -550,7 +550,7 @@ export namespace Ace {
toggleRecording(editor: Editor): void;
replay(editor: Editor): void;
addCommand(command: Command): void;
removeCommand(command: Command, keepCommand?: boolean): void;
removeCommand(command: Command | string, keepCommand?: boolean): void;
bindKey(key: string | { mac?: string, win?: string },
command: CommandLike,
position?: number): void;
Expand Down Expand Up @@ -747,7 +747,7 @@ export namespace Ace {
setFontSize(size: string): void;
focus(): void;
isFocused(): boolean;
flur(): void;
blur(): void;
getSelectedText(): string;
getCopyText(): string;
execCommand(command: string | string[], args?: any): boolean;
Expand Down
20 changes: 12 additions & 8 deletions demo/kitchen-sink/demo.js
Original file line number Diff line number Diff line change
Expand Up @@ -4586,7 +4586,9 @@ var SnippetManager = function() {
{regex: "\\|" + escape("\\|") + "*\\|", onMatch: function(val, state, stack) {
var choices = val.slice(1, -1).replace(/\\[,|\\]|,/g, function(operator) {
return operator.length == 2 ? operator[1] : "\x00";
}).split("\x00");
}).split("\x00").map(function(value){
return {value: value};
});
stack[0].choices = choices;
return [choices[0]];
}, next: "start"},
Expand Down Expand Up @@ -5284,18 +5286,17 @@ var TabstopManager = function(editor) {

this.selectedTabstop = ts;
var range = ts.firstNonLinked || ts;
if (ts.choices) range.cursor = range.start;
if (!this.editor.inVirtualSelectionMode) {
var sel = this.editor.multiSelect;
sel.toSingleRange(range.clone());
sel.toSingleRange(range);
for (var i = 0; i < ts.length; i++) {
if (ts.hasLinkedRanges && ts[i].linked)
continue;
sel.addRange(ts[i].clone(), true);
}
if (sel.ranges[0])
sel.addRange(sel.ranges[0].clone());
} else {
this.editor.selection.setRange(range);
this.editor.selection.fromOrientedRange(range);
}

this.editor.keyBinding.addKeyboardHandler(this.keyboardHandler);
Expand Down Expand Up @@ -6244,6 +6245,7 @@ var Autocomplete = function() {
} else if (keepPopupPosition && !prefix) {
this.detach();
}
this.changeTimer.cancel();
};

this.detach = function() {
Expand Down Expand Up @@ -6306,14 +6308,15 @@ var Autocomplete = function() {
if (!data)
return false;

var completions = this.completions;
this.editor.startOperation({command: {name: "insertMatch"}});
if (data.completer && data.completer.insertMatch) {
data.completer.insertMatch(this.editor, data);
} else {
if (this.completions.filterText) {
if (completions.filterText) {
var ranges = this.editor.selection.getAllRanges();
for (var i = 0, range; range = ranges[i]; i++) {
range.start.column -= this.completions.filterText.length;
range.start.column -= completions.filterText.length;
this.editor.session.remove(range);
}
}
Expand All @@ -6322,7 +6325,8 @@ var Autocomplete = function() {
else
this.editor.execCommand("insertstring", data.value || data);
}
this.detach();
if (this.completions == completions)
this.detach();
this.editor.endOperation();
};

Expand Down
2 changes: 1 addition & 1 deletion kitchen-sink.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<meta name="author" content="Fabian Jakobs">
<!--
Ace
version 1.4.10
version 1.4.12
commit
-->

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "ace-builds",
"main": "./src-noconflict/ace.js",
"typings": "ace.d.ts",
"version": "1.4.10",
"version": "1.4.12",
"description": "Ace (Ajax.org Cloud9 Editor)",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
Expand Down
2 changes: 1 addition & 1 deletion src-min-noconflict/ace.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/ext-emmet.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/ext-language_tools.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/ext-prompt.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min-noconflict/mode-abc.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 53be423

Please sign in to comment.