mirror
/
c9-core
kopia lustrzana https://github.com/c9/core
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge pull request +14014 from c9/ide-terminal-ime 

minimal fix for ime in terminal
pull/312/head
Harutyun Amirjanyan 2016-05-27 11:16:47 +04:00
rodzic 0bce10476e 40605976ec
commit 6ba3f217c8
2 zmienionych plików z 5 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
node_modules/ace/lib/ace/edit_session.js wygenerowano vendored
Wyświetl plik

@ -148,7 +148,7 @@ var EditSession = function(text, mode) {
this.$undoSelect = true; this.$undoSelect = true;
this.$foldData = []; this.$foldData = [];
this.id = "session" + EditSession.$uid; this.id = "session" + (++EditSession.$uid);
this.$foldData.toString = function() { this.$foldData.toString = function() {
return this.join("\n"); return this.join("\n");
}; };

4
node_modules/ace/lib/ace/keyboard/textinput.js wygenerowano vendored
Wyświetl plik

@ -364,10 +364,11 @@ var TextInput = function(parentNode, host) {
return; return;
// console.log("onCompositionStart", inComposition) // console.log("onCompositionStart", inComposition)
inComposition = {}; inComposition = {};
inComposition.canUndo = host.session.$undoManager;
host.onCompositionStart(); host.onCompositionStart();
setTimeout(onCompositionUpdate, 0); setTimeout(onCompositionUpdate, 0);
host.on("mousedown", onCompositionEnd); host.on("mousedown", onCompositionEnd);
if (!host.selection.isEmpty()) { if (inComposition.canUndo && !host.selection.isEmpty()) {
host.insert(""); host.insert("");
host.session.markUndoGroup(); host.session.markUndoGroup();
host.selection.clearSelection(); host.selection.clearSelection();
@ -385,6 +386,7 @@ var TextInput = function(parentNode, host) {
host.onCompositionUpdate(val); host.onCompositionUpdate(val);
if (inComposition.lastValue) if (inComposition.lastValue)
host.undo(); host.undo();
if (inComposition.canUndo)
inComposition.lastValue = val; inComposition.lastValue = val;
if (inComposition.lastValue) { if (inComposition.lastValue) {
var r = host.selection.getRange(); var r = host.selection.getRange();