From 10c9811fc534a2738c19d8f74a447ed500b730a2 Mon Sep 17 00:00:00 2001
From: Wu Cheng-Han
Date: Thu, 2 Jul 2015 00:10:20 +0800
Subject: Jump to 0.3.1

---
 public/vendor/codemirror/lib/codemirror.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'public/vendor/codemirror/lib')

diff --git a/public/vendor/codemirror/lib/codemirror.js b/public/vendor/codemirror/lib/codemirror.js
index 1db591f9..bd544271 100755
--- a/public/vendor/codemirror/lib/codemirror.js
+++ b/public/vendor/codemirror/lib/codemirror.js
@@ -1318,11 +1318,13 @@
         minimal = hasCopyEvent &&
           (range.to().line - range.from().line > 100 || (selected = cm.getSelection()).length > 1000);
         var content = minimal ? "-" : selected || cm.getSelection();
-        this.textarea.value = content;
+        if(!this.composing)
+            this.textarea.value = content;
         if (cm.state.focused) selectInput(this.textarea);
         if (ie && ie_version >= 9) this.hasSelection = content;
       } else if (!typing) {
-        this.prevInput = this.textarea.value = "";
+        if(!this.composing)
+            this.prevInput = this.textarea.value = "";
         if (ie && ie_version >= 9) this.hasSelection = null;
       }
       this.inaccurateSelection = minimal;
-- 
cgit v1.2.3