caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #549 in VISUAL/fineui from ~FAY/fineui:master to master 

* commit '77ba32f3c28f3508eab5eed788bafd4fe87be0d6':
  update
  update
  update
es6
fay 6 years ago
parent
b77d4e2e4c 77ba32f3c2
commit
2e943e9017
11 changed files with 93 additions and 61 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      dist/_fineui.min.js
  2. 14
      dist/bundle.js
  3. 34
      dist/bundle.min.js
  4. 14
      dist/case.js
  5. 14
      dist/fineui.js
  6. 32
      dist/fineui.min.js
  7. 1
      src/case/richeditor/plugins/combo.backgroundcolorchooser.js
  8. 1
      src/case/richeditor/plugins/combo.colorchooser.js
  9. 2
      src/case/richeditor/plugins/combo.fontfamily.js
  10. 2
      src/case/richeditor/plugins/combo.sizechooser.js
  11. 8
      src/case/richeditor/richeditor.js

32
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

14
dist/bundle.js vendored
Unescape View File

@ -84331,6 +84331,7 @@ BI.RichEditorBackgroundColorChooser = BI.inherit(BI.RichEditorAction, {
var self = this, o = this.options;
this.colorchooser = BI.createWidget({
type: "bi.color_chooser",
container: null,
element: this,
width: o.width,
height: o.height,
@ -84377,6 +84378,7 @@ BI.RichEditorColorChooser = BI.inherit(BI.RichEditorAction, {
var self = this, o = this.options;
this.colorchooser = BI.createWidget({
type: "bi.color_chooser",
container: null,
element: this,
width: o.width,
height: o.height,
@ -84437,7 +84439,7 @@ BI.shortcut("bi.rich_editor_color_chooser", BI.RichEditorColorChooser);BI.RichEd
this.combo = BI.createWidget({
type: "bi.combo",
container: o.container,
container: null,
element: this,
el: this.trigger,
adjustLength: 1,
@ -84592,7 +84594,7 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
this.combo = BI.createWidget({
type: "bi.combo",
container: o.container,
container: null,
element: this,
el: this.trigger,
adjustLength: 1,
@ -84716,7 +84718,10 @@ BI.RichEditor = BI.inherit(BI.Widget, {
popup: {
el: BI.extend({
type: "bi.rich_editor_text_toolbar",
editor: this.editor
editor: this.editor,
ref: function (_ref) {
self.toolbar = _ref;
}
}, o.toolbar),
height: 34,
stopPropagation: true,
@ -84736,6 +84741,9 @@ BI.RichEditor = BI.inherit(BI.Widget, {
if(BI.isNull(o.value)) {
this.editor.setValue(o.value);
}
if(o.toolbar) {
this.editor.bindToolbar(this.toolbar);
}
},
focus: function () {

34
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

14
dist/case.js vendored
Unescape View File

@ -11648,6 +11648,7 @@ BI.RichEditorBackgroundColorChooser = BI.inherit(BI.RichEditorAction, {
var self = this, o = this.options;
this.colorchooser = BI.createWidget({
type: "bi.color_chooser",
container: null,
element: this,
width: o.width,
height: o.height,
@ -11694,6 +11695,7 @@ BI.RichEditorColorChooser = BI.inherit(BI.RichEditorAction, {
var self = this, o = this.options;
this.colorchooser = BI.createWidget({
type: "bi.color_chooser",
container: null,
element: this,
width: o.width,
height: o.height,
@ -11754,7 +11756,7 @@ BI.shortcut("bi.rich_editor_color_chooser", BI.RichEditorColorChooser);BI.RichEd
this.combo = BI.createWidget({
type: "bi.combo",
container: o.container,
container: null,
element: this,
el: this.trigger,
adjustLength: 1,
@ -11909,7 +11911,7 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
this.combo = BI.createWidget({
type: "bi.combo",
container: o.container,
container: null,
element: this,
el: this.trigger,
adjustLength: 1,
@ -12033,7 +12035,10 @@ BI.RichEditor = BI.inherit(BI.Widget, {
popup: {
el: BI.extend({
type: "bi.rich_editor_text_toolbar",
editor: this.editor
editor: this.editor,
ref: function (_ref) {
self.toolbar = _ref;
}
}, o.toolbar),
height: 34,
stopPropagation: true,
@ -12053,6 +12058,9 @@ BI.RichEditor = BI.inherit(BI.Widget, {
if(BI.isNull(o.value)) {
this.editor.setValue(o.value);
}
if(o.toolbar) {
this.editor.bindToolbar(this.toolbar);
}
},
focus: function () {

14
dist/fineui.js vendored
Unescape View File

@ -84580,6 +84580,7 @@ BI.RichEditorBackgroundColorChooser = BI.inherit(BI.RichEditorAction, {
var self = this, o = this.options;
this.colorchooser = BI.createWidget({
type: "bi.color_chooser",
container: null,
element: this,
width: o.width,
height: o.height,
@ -84626,6 +84627,7 @@ BI.RichEditorColorChooser = BI.inherit(BI.RichEditorAction, {
var self = this, o = this.options;
this.colorchooser = BI.createWidget({
type: "bi.color_chooser",
container: null,
element: this,
width: o.width,
height: o.height,
@ -84686,7 +84688,7 @@ BI.shortcut("bi.rich_editor_color_chooser", BI.RichEditorColorChooser);BI.RichEd
this.combo = BI.createWidget({
type: "bi.combo",
container: o.container,
container: null,
element: this,
el: this.trigger,
adjustLength: 1,
@ -84841,7 +84843,7 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
this.combo = BI.createWidget({
type: "bi.combo",
container: o.container,
container: null,
element: this,
el: this.trigger,
adjustLength: 1,
@ -84965,7 +84967,10 @@ BI.RichEditor = BI.inherit(BI.Widget, {
popup: {
el: BI.extend({
type: "bi.rich_editor_text_toolbar",
editor: this.editor
editor: this.editor,
ref: function (_ref) {
self.toolbar = _ref;
}
}, o.toolbar),
height: 34,
stopPropagation: true,
@ -84985,6 +84990,9 @@ BI.RichEditor = BI.inherit(BI.Widget, {
if(BI.isNull(o.value)) {
this.editor.setValue(o.value);
}
if(o.toolbar) {
this.editor.bindToolbar(this.toolbar);
}
},
focus: function () {

32
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
src/case/richeditor/plugins/combo.backgroundcolorchooser.js
Unescape View File

@ -18,6 +18,7 @@ BI.RichEditorBackgroundColorChooser = BI.inherit(BI.RichEditorAction, {
var self = this, o = this.options;
this.colorchooser = BI.createWidget({
type: "bi.color_chooser",
container: null,
element: this,
width: o.width,
height: o.height,

1
src/case/richeditor/plugins/combo.colorchooser.js
Unescape View File

@ -20,6 +20,7 @@ BI.RichEditorColorChooser = BI.inherit(BI.RichEditorAction, {
var self = this, o = this.options;
this.colorchooser = BI.createWidget({
type: "bi.color_chooser",
container: null,
element: this,
width: o.width,
height: o.height,

2
src/case/richeditor/plugins/combo.fontfamily.js
Unescape View File

@ -21,7 +21,7 @@ BI.RichEditorFontChooser = BI.inherit(BI.RichEditorAction, {
this.combo = BI.createWidget({
type: "bi.combo",
container: o.container,
container: null,
element: this,
el: this.trigger,
adjustLength: 1,

2
src/case/richeditor/plugins/combo.sizechooser.js
Unescape View File

@ -110,7 +110,7 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
this.combo = BI.createWidget({
type: "bi.combo",
container: o.container,
container: null,
element: this,
el: this.trigger,
adjustLength: 1,

8
src/case/richeditor/richeditor.js
Unescape View File

@ -68,7 +68,10 @@ BI.RichEditor = BI.inherit(BI.Widget, {
popup: {
el: BI.extend({
type: "bi.rich_editor_text_toolbar",
editor: this.editor
editor: this.editor,
ref: function (_ref) {
self.toolbar = _ref;
}
}, o.toolbar),
height: 34,
stopPropagation: true,
@ -88,6 +91,9 @@ BI.RichEditor = BI.inherit(BI.Widget, {
if(BI.isNull(o.value)) {
this.editor.setValue(o.value);
}
if(o.toolbar) {
this.editor.bindToolbar(this.toolbar);
}
},
focus: function () {

Write Preview
Loading…
Cancel
Save