Merge pull request #181 in ~GUY/fineui from ~WINDY/fineui:master to master

* commit '7ab03d77c340d00aebe2061f8b00866c5fb35c0c': codemirror与IE11
7 years ago · b0b201283e
5 changed files with 71 additions and 39 deletions
--- a/bi/base.js
+++ b/bi/base.js
@ -19054,6 +19054,14 @@ BI.CodeEditor = BI.inherit(BI.Single, {
            self.fireEvent(BI.CodeEditor.EVENT_BLUR);
        });

+        this.editor.on("mousedown", function (cm, e) {
+            //IE下mousedown之后会触发blur,所以nextTick后再做focus
+            BI.nextTick(function () {
+                self.fireEvent(BI.CodeEditor.EVENT_FOCUS);
+            });
+            e.stopPropagation();
+        });
+
        // this.editor.on("blur", function () {
        //     self.editor.execCommand("goLineEnd");
        // });
--- a/dist/base.js
+++ b/dist/base.js
@ -19054,6 +19054,14 @@ BI.CodeEditor = BI.inherit(BI.Single, {
            self.fireEvent(BI.CodeEditor.EVENT_BLUR);
        });

+        this.editor.on("mousedown", function (cm, e) {
+            //IE下mousedown之后会触发blur,所以nextTick后再做focus
+            BI.nextTick(function () {
+                self.fireEvent(BI.CodeEditor.EVENT_FOCUS);
+            });
+            e.stopPropagation();
+        });
+
        // this.editor.on("blur", function () {
        //     self.editor.execCommand("goLineEnd");
        // });
--- a/dist/bundle.js
+++ b/dist/bundle.js
@ -48081,6 +48081,14 @@ BI.CodeEditor = BI.inherit(BI.Single, {
            self.fireEvent(BI.CodeEditor.EVENT_BLUR);
        });

+        this.editor.on("mousedown", function (cm, e) {
+            //IE下mousedown之后会触发blur,所以nextTick后再做focus
+            BI.nextTick(function () {
+                self.fireEvent(BI.CodeEditor.EVENT_FOCUS);
+            });
+            e.stopPropagation();
+        });
+
        // this.editor.on("blur", function () {
        //     self.editor.execCommand("goLineEnd");
        // });
--- a/dist/bundle.min.js
+++ b/dist/bundle.min.js
--- a/src/base/single/editor/editor.code.js
+++ b/src/base/single/editor/editor.code.js
@ -44,6 +44,14 @@ BI.CodeEditor = BI.inherit(BI.Single, {
            self.fireEvent(BI.CodeEditor.EVENT_BLUR);
        });

+        this.editor.on("mousedown", function (cm, e) {
+            //IE下mousedown之后会触发blur,所以nextTick后再做focus
+            BI.nextTick(function () {
+                self.fireEvent(BI.CodeEditor.EVENT_FOCUS);
+            });
+            e.stopPropagation();
+        });
+
        // this.editor.on("blur", function () {
        //     self.editor.execCommand("goLineEnd");
        // });