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
commit 6ba3f217c8
2 zmienionych plików z 5 dodań i 3 usunięć

Wyświetl plik

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

Wyświetl plik

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