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

Gruntfile.js

@@ -291,7 +291,7 @@ module.exports = function (grunt) {
                 open: true,
                 livereload: 35729,
                 // Change this to '0.0.0.0' to access the server from outside
-                hostname: "localhost"
+                hostname: "0.0.0.0"
             },
             server: {
                 options: {

dist/base.css

@@ -1062,6 +1062,14 @@ li.CodeMirror-hint-active {
 .bi-pane {
   min-height: 25px;
 }
+.bi-nic-editor {
+  -webkit-user-select: text;
+  -khtml-user-select: text;
+  -moz-user-select: text;
+  -ms-user-select: text;
+  -o-user-select: text;
+  user-select: text;
+}
 .bi-rich-editor .rich-editor-param {
   -webkit-border-radius: 12px;
   -moz-border-radius: 12px;

dist/bundle.css

@@ -2908,6 +2908,14 @@ li.CodeMirror-hint-active {
 .bi-pane {
   min-height: 25px;
 }
+.bi-nic-editor {
+  -webkit-user-select: text;
+  -khtml-user-select: text;
+  -moz-user-select: text;
+  -ms-user-select: text;
+  -o-user-select: text;
+  user-select: text;
+}
 .bi-rich-editor .rich-editor-param {
   -webkit-border-radius: 12px;
   -moz-border-radius: 12px;

dist/bundle.js

@@ -83107,7 +83107,7 @@ BI.RichEditorParamAction = BI.inherit(BI.RichEditorAction, {
         $(image).addClass("rich-editor-param");
         $(image).attr("style", attrs.style);
         $(image).attr("name", name);
-        this.options.editor.insertHTML($("<div>").append(image).html());
+        instance.insertHTML($("<div>").append(image).html());
         // var sel = this._get$Sel();
         // var wrapper = o.editor.instance.getElm().element;
         // if (wrapper.find(sel).length <= 0) {
@@ -83354,6 +83354,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
                     // return false;
                 }
                 if (this.instance.checkToolbar(t)) {
+                    this.instance.saveRng();
                     return;
                 }
             } while (t = t.parentNode);
@@ -83501,10 +83502,21 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
         },
 
         saveRng: function () {
-            this.savedRange = this.getRng();
+            var range = this.getRng();
+            if (!this._isChildOf(this.getSelectionContainerElem(range), this.element[0])) {
+                return;
+            }
+            this.savedRange = range;
             this.savedSel = this.getSel();
         },
 
+        getSelectionContainerElem: function (range) {
+            if (range) {
+                var elem = range.commonAncestorContainer;
+                return elem.nodeType === 1 ? elem : elem.parentNode;
+            }
+        },
+
         setFocus: function (el) {
             try {
                 el.focus();
@@ -83619,7 +83631,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
         },
 
         insertHTML: function (html) {
-            var range = this.getRng();
+            var range = this.savedRange || this.getRng();
 
             try {
                 // w3c
@@ -83650,6 +83662,20 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
 
         nicCommand: function (cmd, args) {
             document.execCommand(cmd, false, args);
+        },
+
+        _isChildOf: function(child, parent) {
+            var parentNode;
+            if(child && parent) {
+                parentNode = child.parentNode;
+                while(parentNode) {
+                    if(parent === parentNode) {
+                        return true;
+                    }
+                    parentNode = parentNode.parentNode;
+                }
+            }
+            return false;
         }
     });
 }());
@@ -84102,7 +84128,11 @@ BI.RichEditorColorChooser = BI.inherit(BI.RichEditorAction, {
             }
         });
         this.colorchooser.on(BI.ColorChooser.EVENT_CHANGE, function () {
-            self.doCommand(this.getValue());
+            var value = this.getValue();
+            // 用span代替font
+            document.execCommand('styleWithCSS', null, true);
+            self.doCommand(this.getValue() || "inherit");
+            document.execCommand('styleWithCSS', null, false);
         });
 
     },

dist/case.js

@@ -10552,7 +10552,7 @@ BI.RichEditorParamAction = BI.inherit(BI.RichEditorAction, {
         $(image).addClass("rich-editor-param");
         $(image).attr("style", attrs.style);
         $(image).attr("name", name);
-        this.options.editor.insertHTML($("<div>").append(image).html());
+        instance.insertHTML($("<div>").append(image).html());
         // var sel = this._get$Sel();
         // var wrapper = o.editor.instance.getElm().element;
         // if (wrapper.find(sel).length <= 0) {
@@ -10799,6 +10799,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
                     // return false;
                 }
                 if (this.instance.checkToolbar(t)) {
+                    this.instance.saveRng();
                     return;
                 }
             } while (t = t.parentNode);
@@ -10946,10 +10947,21 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
         },
 
         saveRng: function () {
-            this.savedRange = this.getRng();
+            var range = this.getRng();
+            if (!this._isChildOf(this.getSelectionContainerElem(range), this.element[0])) {
+                return;
+            }
+            this.savedRange = range;
             this.savedSel = this.getSel();
         },
 
+        getSelectionContainerElem: function (range) {
+            if (range) {
+                var elem = range.commonAncestorContainer;
+                return elem.nodeType === 1 ? elem : elem.parentNode;
+            }
+        },
+
         setFocus: function (el) {
             try {
                 el.focus();
@@ -11064,7 +11076,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
         },
 
         insertHTML: function (html) {
-            var range = this.getRng();
+            var range = this.savedRange || this.getRng();
 
             try {
                 // w3c
@@ -11095,6 +11107,20 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
 
         nicCommand: function (cmd, args) {
             document.execCommand(cmd, false, args);
+        },
+
+        _isChildOf: function(child, parent) {
+            var parentNode;
+            if(child && parent) {
+                parentNode = child.parentNode;
+                while(parentNode) {
+                    if(parent === parentNode) {
+                        return true;
+                    }
+                    parentNode = parentNode.parentNode;
+                }
+            }
+            return false;
         }
     });
 }());
@@ -11547,7 +11573,11 @@ BI.RichEditorColorChooser = BI.inherit(BI.RichEditorAction, {
             }
         });
         this.colorchooser.on(BI.ColorChooser.EVENT_CHANGE, function () {
-            self.doCommand(this.getValue());
+            var value = this.getValue();
+            // 用span代替font
+            document.execCommand('styleWithCSS', null, true);
+            self.doCommand(this.getValue() || "inherit");
+            document.execCommand('styleWithCSS', null, false);
         });
 
     },

dist/fineui.css

@@ -2908,6 +2908,14 @@ li.CodeMirror-hint-active {
 .bi-pane {
   min-height: 25px;
 }
+.bi-nic-editor {
+  -webkit-user-select: text;
+  -khtml-user-select: text;
+  -moz-user-select: text;
+  -ms-user-select: text;
+  -o-user-select: text;
+  user-select: text;
+}
 .bi-rich-editor .rich-editor-param {
   -webkit-border-radius: 12px;
   -moz-border-radius: 12px;

dist/fineui.js

@@ -83356,7 +83356,7 @@ BI.RichEditorParamAction = BI.inherit(BI.RichEditorAction, {
         $(image).addClass("rich-editor-param");
         $(image).attr("style", attrs.style);
         $(image).attr("name", name);
-        this.options.editor.insertHTML($("<div>").append(image).html());
+        instance.insertHTML($("<div>").append(image).html());
         // var sel = this._get$Sel();
         // var wrapper = o.editor.instance.getElm().element;
         // if (wrapper.find(sel).length <= 0) {
@@ -83603,6 +83603,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
                     // return false;
                 }
                 if (this.instance.checkToolbar(t)) {
+                    this.instance.saveRng();
                     return;
                 }
             } while (t = t.parentNode);
@@ -83750,10 +83751,21 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
         },
 
         saveRng: function () {
-            this.savedRange = this.getRng();
+            var range = this.getRng();
+            if (!this._isChildOf(this.getSelectionContainerElem(range), this.element[0])) {
+                return;
+            }
+            this.savedRange = range;
             this.savedSel = this.getSel();
         },
 
+        getSelectionContainerElem: function (range) {
+            if (range) {
+                var elem = range.commonAncestorContainer;
+                return elem.nodeType === 1 ? elem : elem.parentNode;
+            }
+        },
+
         setFocus: function (el) {
             try {
                 el.focus();
@@ -83868,7 +83880,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
         },
 
         insertHTML: function (html) {
-            var range = this.getRng();
+            var range = this.savedRange || this.getRng();
 
             try {
                 // w3c
@@ -83899,6 +83911,20 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
 
         nicCommand: function (cmd, args) {
             document.execCommand(cmd, false, args);
+        },
+
+        _isChildOf: function(child, parent) {
+            var parentNode;
+            if(child && parent) {
+                parentNode = child.parentNode;
+                while(parentNode) {
+                    if(parent === parentNode) {
+                        return true;
+                    }
+                    parentNode = parentNode.parentNode;
+                }
+            }
+            return false;
         }
     });
 }());
@@ -84351,7 +84377,11 @@ BI.RichEditorColorChooser = BI.inherit(BI.RichEditorAction, {
             }
         });
         this.colorchooser.on(BI.ColorChooser.EVENT_CHANGE, function () {
-            self.doCommand(this.getValue());
+            var value = this.getValue();
+            // 用span代替font
+            document.execCommand('styleWithCSS', null, true);
+            self.doCommand(this.getValue() || "inherit");
+            document.execCommand('styleWithCSS', null, false);
         });
 
     },

dist/resource.css

@@ -1799,6 +1799,9 @@ textarea::-webkit-scrollbar-thumb:hover {
 .icon-size-24 .b-font {
   font-size: 24px;
 }
+.icon-size-40 .b-font {
+  font-size: 40px;
+}
 .icon-size-50 .b-font {
   font-size: 50px;
 }

src/case/richeditor/bar/action.richeditor.param.js

@@ -52,7 +52,7 @@ BI.RichEditorParamAction = BI.inherit(BI.RichEditorAction, {
         $(image).addClass("rich-editor-param");
         $(image).attr("style", attrs.style);
         $(image).attr("name", name);
-        this.options.editor.insertHTML($("<div>").append(image).html());
+        instance.insertHTML($("<div>").append(image).html());
         // var sel = this._get$Sel();
         // var wrapper = o.editor.instance.getElm().element;
         // if (wrapper.find(sel).length <= 0) {

src/case/richeditor/niceditor/niceditor.js

@@ -66,6 +66,7 @@
                     // return false;
                 }
                 if (this.instance.checkToolbar(t)) {
+                    this.instance.saveRng();
                     return;
                 }
             } while (t = t.parentNode);
@@ -213,10 +214,21 @@
         },
 
         saveRng: function () {
-            this.savedRange = this.getRng();
+            var range = this.getRng();
+            if (!this._isChildOf(this.getSelectionContainerElem(range), this.element[0])) {
+                return;
+            }
+            this.savedRange = range;
             this.savedSel = this.getSel();
         },
 
+        getSelectionContainerElem: function (range) {
+            if (range) {
+                var elem = range.commonAncestorContainer;
+                return elem.nodeType === 1 ? elem : elem.parentNode;
+            }
+        },
+
         setFocus: function (el) {
             try {
                 el.focus();
@@ -331,7 +343,7 @@
         },
 
         insertHTML: function (html) {
-            var range = this.getRng();
+            var range = this.savedRange || this.getRng();
 
             try {
                 // w3c
@@ -362,6 +374,20 @@
 
         nicCommand: function (cmd, args) {
             document.execCommand(cmd, false, args);
+        },
+
+        _isChildOf: function(child, parent) {
+            var parentNode;
+            if(child && parent) {
+                parentNode = child.parentNode;
+                while(parentNode) {
+                    if(parent === parentNode) {
+                        return true;
+                    }
+                    parentNode = parentNode.parentNode;
+                }
+            }
+            return false;
         }
     });
 }());

src/case/richeditor/plugins/combo.colorchooser.js

@@ -30,7 +30,11 @@ BI.RichEditorColorChooser = BI.inherit(BI.RichEditorAction, {
             }
         });
         this.colorchooser.on(BI.ColorChooser.EVENT_CHANGE, function () {
-            self.doCommand(this.getValue());
+            var value = this.getValue();
+            // 用span代替font
+            document.execCommand('styleWithCSS', null, true);
+            self.doCommand(this.getValue() || "inherit");
+            document.execCommand('styleWithCSS', null, false);
         });
 
     },

src/css/base/richeditor/niceditor/niceditor.css

@@ -0,0 +1,8 @@
+.bi-nic-editor {
+  -webkit-user-select: text;
+  -khtml-user-select: text;
+  -moz-user-select: text;
+  -ms-user-select: text;
+  -o-user-select: text;
+  user-select: text;
+}

src/css/resource/size.css

@@ -7,6 +7,9 @@
 .icon-size-24 .b-font {
   font-size: 24px;
 }
+.icon-size-40 .b-font {
+  font-size: 40px;
+}
 .icon-size-50 .b-font {
   font-size: 50px;
 }

src/less/base/richeditor/niceditor/niceditor.less

@@ -0,0 +1,5 @@
+@import "../../../index";
+
+.bi-nic-editor {
+    .user-select-enable();
+}

src/less/resource/size.less

@@ -4,5 +4,6 @@
 .iconSize(icon-size-12, @font-size-12);
 .iconSize(icon-size-16, @font-size-16);
 .iconSize(icon-size-24, @font-size-24);
+.iconSize(icon-size-40, @font-size-40);
 .iconSize(icon-size-50, @font-size-50);
 .iconSize(icon-size-70, @font-size-70);