Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~windy/fineui

# Conflicts:
#	dist/bundle.min.js

dist/bundle.js

@@ -83513,16 +83513,18 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
         insertHTML: function (html) {
             var range = this.getRng();
 
-            if (document.queryCommandState("insertHTML")) {
+            try {
-                // W3C
+                // w3c
                 this.nicCommand("insertHTML", html);
-            } else if (range.insertNode) {
+            } catch(e) {
-                // IE
+                if (range.insertNode) {
-                range.deleteContents();
+                    // IE
-                range.insertNode($(html)[0]);
+                    range.deleteContents();
-            } else if (range.pasteHTML) {
+                    range.insertNode($(html)[0]);
-                // IE <= 10
+                } else if (range.pasteHTML) {
-                range.pasteHTML(html);
+                    // IE <= 10
+                    range.pasteHTML(html);
+                }
             }
         },
 

dist/case.js

@@ -11014,16 +11014,18 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
         insertHTML: function (html) {
             var range = this.getRng();
 
-            if (document.queryCommandState("insertHTML")) {
+            try {
-                // W3C
+                // w3c
                 this.nicCommand("insertHTML", html);
-            } else if (range.insertNode) {
+            } catch(e) {
-                // IE
+                if (range.insertNode) {
-                range.deleteContents();
+                    // IE
-                range.insertNode($(html)[0]);
+                    range.deleteContents();
-            } else if (range.pasteHTML) {
+                    range.insertNode($(html)[0]);
-                // IE <= 10
+                } else if (range.pasteHTML) {
-                range.pasteHTML(html);
+                    // IE <= 10
+                    range.pasteHTML(html);
+                }
             }
         },
 

dist/fineui.js

@@ -83756,16 +83756,18 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
         insertHTML: function (html) {
             var range = this.getRng();
 
-            if (document.queryCommandState("insertHTML")) {
+            try {
-                // W3C
+                // w3c
                 this.nicCommand("insertHTML", html);
-            } else if (range.insertNode) {
+            } catch(e) {
-                // IE
+                if (range.insertNode) {
-                range.deleteContents();
+                    // IE
-                range.insertNode($(html)[0]);
+                    range.deleteContents();
-            } else if (range.pasteHTML) {
+                    range.insertNode($(html)[0]);
-                // IE <= 10
+                } else if (range.pasteHTML) {
-                range.pasteHTML(html);
+                    // IE <= 10
+                    range.pasteHTML(html);
+                }
             }
         },
 

src/case/richeditor/niceditor/niceditor.js

@@ -307,16 +307,18 @@
         insertHTML: function (html) {
             var range = this.getRng();
 
-            if (document.queryCommandState("insertHTML")) {
+            try {
-                // W3C
+                // w3c
                 this.nicCommand("insertHTML", html);
-            } else if (range.insertNode) {
+            } catch(e) {
-                // IE
+                if (range.insertNode) {
-                range.deleteContents();
+                    // IE
-                range.insertNode($(html)[0]);
+                    range.deleteContents();
-            } else if (range.pasteHTML) {
+                    range.insertNode($(html)[0]);
-                // IE <= 10
+                } else if (range.pasteHTML) {
-                range.pasteHTML(html);
+                    // IE <= 10
+                    range.pasteHTML(html);
+                }
             }
         },