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

Merge pull request #191 in FUI/fineui from ~GUY/fineui:master to master 

* commit 'bb4dc01c84b305c614678e4b7e918f34e4d28fb7':
  update
es6
guy 7 years ago
parent
ad969b4387 bb4dc01c84
commit
e0813b5a7b
8 changed files with 34 additions and 110 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      bi/case.js
  2. 29
      dist/bundle.js
  3. 28
      dist/bundle.min.js
  4. 29
      dist/case.js
  5. 17
      src/case/richeditor/bar/texttoolbar.js
  6. 4
      src/case/richeditor/plugins/combo.backgroundcolorchooser.js
  7. 4
      src/case/richeditor/plugins/combo.colorchooser.js
  8. 4
      src/case/richeditor/plugins/combo.sizechooser.js

29
bi/case.js
Unescape View File

@ -9561,21 +9561,14 @@ BI.RichEditorTextToolbar = BI.inherit(BI.Widget, {
_init: function () { _init: function () {
BI.RichEditorTextToolbar.superclass._init.apply(this, arguments); BI.RichEditorTextToolbar.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
var operators = [];
BI.each(o.buttons, function (i, btn) {
operators.push(BI.createWidget(BI.extend(btn, {
editor: o.editor
})));
});
this.element.on("mousedown", function () {
BI.each(operators, function (i, op) {
op.start();
});
});
BI.createWidget({ BI.createWidget({
type: "bi.left", type: "bi.left",
element: this, element: this,
items: operators, items: BI.map(o.buttons, function (i, btn) {
return BI.extend(btn, {
editor: o.editor
});
}),
hgap: 3, hgap: 3,
vgap: 3 vgap: 3
}) })
@ -10288,10 +10281,6 @@ BI.RichEditorBackgroundColorChooser = BI.inherit(BI.RichEditorAction, {
}); });
}, },
start: function () {
this.colorchooser.hideView();
},
deactivate: function () { deactivate: function () {
} }
}); });
@ -10331,10 +10320,6 @@ BI.RichEditorColorChooser = BI.inherit(BI.RichEditorAction, {
}, },
start: function () {
this.colorchooser.hideView();
},
deactivate: function () { deactivate: function () {
this.colorchooser.setValue(""); this.colorchooser.setValue("");
} }
@ -10412,10 +10397,6 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
this.hideView(); this.hideView();
this.setValue([]); this.setValue([]);
}) })
},
start: function () {
this.combo.hideView();
} }
}); });
BI.shortcut('bi.rich_editor_size_chooser', BI.RichEditorSizeChooser);/** BI.shortcut('bi.rich_editor_size_chooser', BI.RichEditorSizeChooser);/**

29
dist/bundle.js vendored
Unescape View File

@ -70981,21 +70981,14 @@ BI.RichEditorTextToolbar = BI.inherit(BI.Widget, {
_init: function () { _init: function () {
BI.RichEditorTextToolbar.superclass._init.apply(this, arguments); BI.RichEditorTextToolbar.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
var operators = [];
BI.each(o.buttons, function (i, btn) {
operators.push(BI.createWidget(BI.extend(btn, {
editor: o.editor
})));
});
this.element.on("mousedown", function () {
BI.each(operators, function (i, op) {
op.start();
});
});
BI.createWidget({ BI.createWidget({
type: "bi.left", type: "bi.left",
element: this, element: this,
items: operators, items: BI.map(o.buttons, function (i, btn) {
return BI.extend(btn, {
editor: o.editor
});
}),
hgap: 3, hgap: 3,
vgap: 3 vgap: 3
}) })
@ -71708,10 +71701,6 @@ BI.RichEditorBackgroundColorChooser = BI.inherit(BI.RichEditorAction, {
}); });
}, },
start: function () {
this.colorchooser.hideView();
},
deactivate: function () { deactivate: function () {
} }
}); });
@ -71751,10 +71740,6 @@ BI.RichEditorColorChooser = BI.inherit(BI.RichEditorAction, {
}, },
start: function () {
this.colorchooser.hideView();
},
deactivate: function () { deactivate: function () {
this.colorchooser.setValue(""); this.colorchooser.setValue("");
} }
@ -71832,10 +71817,6 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
this.hideView(); this.hideView();
this.setValue([]); this.setValue([]);
}) })
},
start: function () {
this.combo.hideView();
} }
}); });
BI.shortcut('bi.rich_editor_size_chooser', BI.RichEditorSizeChooser);/** BI.shortcut('bi.rich_editor_size_chooser', BI.RichEditorSizeChooser);/**

28
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

29
dist/case.js vendored
Unescape View File

@ -9561,21 +9561,14 @@ BI.RichEditorTextToolbar = BI.inherit(BI.Widget, {
_init: function () { _init: function () {
BI.RichEditorTextToolbar.superclass._init.apply(this, arguments); BI.RichEditorTextToolbar.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
var operators = [];
BI.each(o.buttons, function (i, btn) {
operators.push(BI.createWidget(BI.extend(btn, {
editor: o.editor
})));
});
this.element.on("mousedown", function () {
BI.each(operators, function (i, op) {
op.start();
});
});
BI.createWidget({ BI.createWidget({
type: "bi.left", type: "bi.left",
element: this, element: this,
items: operators, items: BI.map(o.buttons, function (i, btn) {
return BI.extend(btn, {
editor: o.editor
});
}),
hgap: 3, hgap: 3,
vgap: 3 vgap: 3
}) })
@ -10288,10 +10281,6 @@ BI.RichEditorBackgroundColorChooser = BI.inherit(BI.RichEditorAction, {
}); });
}, },
start: function () {
this.colorchooser.hideView();
},
deactivate: function () { deactivate: function () {
} }
}); });
@ -10331,10 +10320,6 @@ BI.RichEditorColorChooser = BI.inherit(BI.RichEditorAction, {
}, },
start: function () {
this.colorchooser.hideView();
},
deactivate: function () { deactivate: function () {
this.colorchooser.setValue(""); this.colorchooser.setValue("");
} }
@ -10412,10 +10397,6 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
this.hideView(); this.hideView();
this.setValue([]); this.setValue([]);
}) })
},
start: function () {
this.combo.hideView();
} }
}); });
BI.shortcut('bi.rich_editor_size_chooser', BI.RichEditorSizeChooser);/** BI.shortcut('bi.rich_editor_size_chooser', BI.RichEditorSizeChooser);/**

17
src/case/richeditor/bar/texttoolbar.js
Unescape View File

@ -28,21 +28,14 @@ BI.RichEditorTextToolbar = BI.inherit(BI.Widget, {
_init: function () { _init: function () {
BI.RichEditorTextToolbar.superclass._init.apply(this, arguments); BI.RichEditorTextToolbar.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
var operators = [];
BI.each(o.buttons, function (i, btn) {
operators.push(BI.createWidget(BI.extend(btn, {
editor: o.editor
})));
});
this.element.on("mousedown", function () {
BI.each(operators, function (i, op) {
op.start();
});
});
BI.createWidget({ BI.createWidget({
type: "bi.left", type: "bi.left",
element: this, element: this,
items: operators, items: BI.map(o.buttons, function (i, btn) {
return BI.extend(btn, {
editor: o.editor
});
}),
hgap: 3, hgap: 3,
vgap: 3 vgap: 3
}) })

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

@ -37,10 +37,6 @@ BI.RichEditorBackgroundColorChooser = BI.inherit(BI.RichEditorAction, {
}); });
}, },
start: function () {
this.colorchooser.hideView();
},
deactivate: function () { deactivate: function () {
} }
}); });

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

@ -34,10 +34,6 @@ BI.RichEditorColorChooser = BI.inherit(BI.RichEditorAction, {
}, },
start: function () {
this.colorchooser.hideView();
},
deactivate: function () { deactivate: function () {
this.colorchooser.setValue(""); this.colorchooser.setValue("");
} }

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

@ -71,10 +71,6 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
this.hideView(); this.hideView();
this.setValue([]); this.setValue([]);
}) })
},
start: function () {
this.combo.hideView();
} }
}); });
BI.shortcut('bi.rich_editor_size_chooser', BI.RichEditorSizeChooser); BI.shortcut('bi.rich_editor_size_chooser', BI.RichEditorSizeChooser);
Write Preview
Loading…
Cancel
Save