From 9ca76e7438812f032b87bdd3cdb7a327fa26d8e0 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Tue, 27 Mar 2018 11:26:46 +0800 Subject: [PATCH] update --- demo/js/base/editor/demo.rich_editor.js | 9 +- dist/_fineui.min.js | 32 +-- dist/bundle.js | 92 +++--- dist/bundle.min.js | 34 +-- dist/case.js | 92 +++--- dist/demo.js | 24 +- dist/fineui.min.js | 32 +-- dist/font/iconfont.eot | Bin 50436 -> 65028 bytes dist/font/iconfont.svg | 265 ++++++++++++++++-- dist/font/iconfont.ttf | Bin 50268 -> 64860 bytes dist/font/iconfont.woff | Bin 27108 -> 34176 bytes src/case/richeditor/niceditor/niceditor.js | 1 + .../trigger.backgroundchooser.js | 37 +-- .../colorchooser/trigger.colorchooser.js | 37 +-- src/case/richeditor/richeditor.js | 17 +- 15 files changed, 455 insertions(+), 217 deletions(-) diff --git a/demo/js/base/editor/demo.rich_editor.js b/demo/js/base/editor/demo.rich_editor.js index eef20d09b1..72dbfdbd11 100644 --- a/demo/js/base/editor/demo.rich_editor.js +++ b/demo/js/base/editor/demo.rich_editor.js @@ -3,6 +3,7 @@ Demo.RichEditor = BI.inherit(BI.Widget, { baseCls: "demo-rich-editor" }, render: function () { + var self = this; this.editor = BI.createWidget({ type: "bi.rich_editor", cls: "mvc-border", @@ -14,7 +15,13 @@ Demo.RichEditor = BI.inherit(BI.Widget, { element: this, hgap: 30, vgap: 50, - items: [this.editor] + items: [this.editor, { + type: "bi.button", + text: "focus", + handler: function () { + self.editor.focus(); + } + }] }); }, diff --git a/dist/_fineui.min.js b/dist/_fineui.min.js index 5483ac23a2..bf149bfe95 100644 --- a/dist/_fineui.min.js +++ b/dist/_fineui.min.js @@ -34,19 +34,19 @@ var j=new Error("Cannot find module '"+g+"'");throw j.code="MODULE_NOT_FOUND",j} BI.Farbtastic.superclass._init.apply(this,arguments)},mounted:function(){var a=this;this.farbtastic=$.farbtastic(this.element,function(b){a.fireEvent(BI.Farbtastic.EVENT_CHANGE,a.getValue(),a)})},setValue:function(a){this.farbtastic.setColor(a)},getValue:function(){return this.farbtastic.color}}),BI.Farbtastic.EVENT_CHANGE="Farbtastic.EVENT_CHANGE",BI.shortcut("bi.farbtastic",BI.Farbtastic),jQuery.fn.farbtastic=function(a){return $.farbtastic(this,a),this},jQuery.farbtastic=function(a,b){var a=$(a).get(0);return a.farbtastic||(a.farbtastic=new jQuery._farbtastic(a,b))},jQuery._farbtastic=function(a,b){var c=this;$(a).html('