guy 7 years ago
parent
commit
11ad84b8f8
  1. 24
      bi/base.js
  2. 24
      dist/base.js
  3. 24
      dist/bundle.js
  4. 5
      src/base/richeditor/bar/button.richeditor.js
  5. 11
      src/base/richeditor/bar/texttoolbar.js
  6. 1
      src/base/richeditor/niceditor/niceditor.js
  7. 7
      src/base/richeditor/richeditor.js

24
bi/base.js

@ -16113,6 +16113,7 @@ BI.RichEditorAction = BI.inherit(BI.Widget, {
o.editor.on(BI.NicEditor.EVENT_BLUR, function () {
self.setEnable(false);
});
o.editor.on(BI.NicEditor.EVENT_KEY, BI.bind(this.key, this));
},
checkNodes: function (e) {
@ -16142,6 +16143,10 @@ BI.RichEditorAction = BI.inherit(BI.Widget, {
return false;
},
key: function () {
},
activate: function () {
},
@ -16158,12 +16163,12 @@ BI.RichEditorAction = BI.inherit(BI.Widget, {
* 颜色选择
*
* Created by GUY on 2015/11/26.
* @class BI.TextToolbar
* @class BI.RichEditorTextToolbar
* @extends BI.Widget
*/
BI.TextToolbar = BI.inherit(BI.Widget, {
BI.RichEditorTextToolbar = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.TextToolbar.superclass._defaultConfig.apply(this, arguments), {
return BI.extend(BI.RichEditorTextToolbar.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-text-toolbar bi-background",
buttons: [
{type: "bi.rich_editor_size_chooser"},
@ -16181,7 +16186,7 @@ BI.TextToolbar = BI.inherit(BI.Widget, {
},
_init: function () {
BI.TextToolbar.superclass._init.apply(this, arguments);
BI.RichEditorTextToolbar.superclass._init.apply(this, arguments);
var self = this, o = this.options;
BI.createWidget({
type: "bi.left",
@ -16196,8 +16201,7 @@ BI.TextToolbar = BI.inherit(BI.Widget, {
})
},
});
BI.TextToolbar.EVENT_CHANGE = "BI.TextToolbar.EVENT_CHANGE";
BI.shortcut('bi.text_toolbar', BI.TextToolbar);/**
BI.shortcut('bi.rich_editor_text_toolbar', BI.RichEditorTextToolbar);/**
* 富文本编辑器
*
* Created by GUY on 2017/9/15.
@ -16271,6 +16275,7 @@ BI.shortcut('bi.text_toolbar', BI.TextToolbar);/**
});
BI.NicEditor.EVENT_SELECTED = "selected";
BI.NicEditor.EVENT_BLUR = "blur";
BI.NicEditor.EVENT_KEY = "key";
BI.shortcut('bi.nic_editor', BI.NicEditor);
var prefix = "niceditor-";
@ -17037,14 +17042,10 @@ BI.RichEditor = BI.inherit(BI.Widget, {
});
this.toolbar = BI.createWidget({
type: "bi.text_toolbar",
type: "bi.rich_editor_text_toolbar",
editor: this.editor
});
this.toolbar.on(BI.TextToolbar.EVENT_CHANGE, function () {
var style = this.getValue();
});
this.combo = BI.createWidget({
type: "bi.combo",
element: this,
@ -17057,6 +17058,7 @@ BI.RichEditor = BI.inherit(BI.Widget, {
popup: {
el: this.toolbar,
height: 30,
stopPropagation: true,
stopEvent: true
}
});

24
dist/base.js vendored

@ -16113,6 +16113,7 @@ BI.RichEditorAction = BI.inherit(BI.Widget, {
o.editor.on(BI.NicEditor.EVENT_BLUR, function () {
self.setEnable(false);
});
o.editor.on(BI.NicEditor.EVENT_KEY, BI.bind(this.key, this));
},
checkNodes: function (e) {
@ -16142,6 +16143,10 @@ BI.RichEditorAction = BI.inherit(BI.Widget, {
return false;
},
key: function () {
},
activate: function () {
},
@ -16158,12 +16163,12 @@ BI.RichEditorAction = BI.inherit(BI.Widget, {
* 颜色选择
*
* Created by GUY on 2015/11/26.
* @class BI.TextToolbar
* @class BI.RichEditorTextToolbar
* @extends BI.Widget
*/
BI.TextToolbar = BI.inherit(BI.Widget, {
BI.RichEditorTextToolbar = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.TextToolbar.superclass._defaultConfig.apply(this, arguments), {
return BI.extend(BI.RichEditorTextToolbar.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-text-toolbar bi-background",
buttons: [
{type: "bi.rich_editor_size_chooser"},
@ -16181,7 +16186,7 @@ BI.TextToolbar = BI.inherit(BI.Widget, {
},
_init: function () {
BI.TextToolbar.superclass._init.apply(this, arguments);
BI.RichEditorTextToolbar.superclass._init.apply(this, arguments);
var self = this, o = this.options;
BI.createWidget({
type: "bi.left",
@ -16196,8 +16201,7 @@ BI.TextToolbar = BI.inherit(BI.Widget, {
})
},
});
BI.TextToolbar.EVENT_CHANGE = "BI.TextToolbar.EVENT_CHANGE";
BI.shortcut('bi.text_toolbar', BI.TextToolbar);/**
BI.shortcut('bi.rich_editor_text_toolbar', BI.RichEditorTextToolbar);/**
* 富文本编辑器
*
* Created by GUY on 2017/9/15.
@ -16271,6 +16275,7 @@ BI.shortcut('bi.text_toolbar', BI.TextToolbar);/**
});
BI.NicEditor.EVENT_SELECTED = "selected";
BI.NicEditor.EVENT_BLUR = "blur";
BI.NicEditor.EVENT_KEY = "key";
BI.shortcut('bi.nic_editor', BI.NicEditor);
var prefix = "niceditor-";
@ -17037,14 +17042,10 @@ BI.RichEditor = BI.inherit(BI.Widget, {
});
this.toolbar = BI.createWidget({
type: "bi.text_toolbar",
type: "bi.rich_editor_text_toolbar",
editor: this.editor
});
this.toolbar.on(BI.TextToolbar.EVENT_CHANGE, function () {
var style = this.getValue();
});
this.combo = BI.createWidget({
type: "bi.combo",
element: this,
@ -17057,6 +17058,7 @@ BI.RichEditor = BI.inherit(BI.Widget, {
popup: {
el: this.toolbar,
height: 30,
stopPropagation: true,
stopEvent: true
}
});

24
dist/bundle.js vendored

@ -44919,6 +44919,7 @@ BI.RichEditorAction = BI.inherit(BI.Widget, {
o.editor.on(BI.NicEditor.EVENT_BLUR, function () {
self.setEnable(false);
});
o.editor.on(BI.NicEditor.EVENT_KEY, BI.bind(this.key, this));
},
checkNodes: function (e) {
@ -44948,6 +44949,10 @@ BI.RichEditorAction = BI.inherit(BI.Widget, {
return false;
},
key: function () {
},
activate: function () {
},
@ -44964,12 +44969,12 @@ BI.RichEditorAction = BI.inherit(BI.Widget, {
* 颜色选择
*
* Created by GUY on 2015/11/26.
* @class BI.TextToolbar
* @class BI.RichEditorTextToolbar
* @extends BI.Widget
*/
BI.TextToolbar = BI.inherit(BI.Widget, {
BI.RichEditorTextToolbar = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.TextToolbar.superclass._defaultConfig.apply(this, arguments), {
return BI.extend(BI.RichEditorTextToolbar.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-text-toolbar bi-background",
buttons: [
{type: "bi.rich_editor_size_chooser"},
@ -44987,7 +44992,7 @@ BI.TextToolbar = BI.inherit(BI.Widget, {
},
_init: function () {
BI.TextToolbar.superclass._init.apply(this, arguments);
BI.RichEditorTextToolbar.superclass._init.apply(this, arguments);
var self = this, o = this.options;
BI.createWidget({
type: "bi.left",
@ -45002,8 +45007,7 @@ BI.TextToolbar = BI.inherit(BI.Widget, {
})
},
});
BI.TextToolbar.EVENT_CHANGE = "BI.TextToolbar.EVENT_CHANGE";
BI.shortcut('bi.text_toolbar', BI.TextToolbar);/**
BI.shortcut('bi.rich_editor_text_toolbar', BI.RichEditorTextToolbar);/**
* 富文本编辑器
*
* Created by GUY on 2017/9/15.
@ -45077,6 +45081,7 @@ BI.shortcut('bi.text_toolbar', BI.TextToolbar);/**
});
BI.NicEditor.EVENT_SELECTED = "selected";
BI.NicEditor.EVENT_BLUR = "blur";
BI.NicEditor.EVENT_KEY = "key";
BI.shortcut('bi.nic_editor', BI.NicEditor);
var prefix = "niceditor-";
@ -45843,14 +45848,10 @@ BI.RichEditor = BI.inherit(BI.Widget, {
});
this.toolbar = BI.createWidget({
type: "bi.text_toolbar",
type: "bi.rich_editor_text_toolbar",
editor: this.editor
});
this.toolbar.on(BI.TextToolbar.EVENT_CHANGE, function () {
var style = this.getValue();
});
this.combo = BI.createWidget({
type: "bi.combo",
element: this,
@ -45863,6 +45864,7 @@ BI.RichEditor = BI.inherit(BI.Widget, {
popup: {
el: this.toolbar,
height: 30,
stopPropagation: true,
stopEvent: true
}
});

5
src/base/richeditor/bar/button.richeditor.js

@ -25,6 +25,7 @@ BI.RichEditorAction = BI.inherit(BI.Widget, {
o.editor.on(BI.NicEditor.EVENT_BLUR, function () {
self.setEnable(false);
});
o.editor.on(BI.NicEditor.EVENT_KEY, BI.bind(this.key, this));
},
checkNodes: function (e) {
@ -54,6 +55,10 @@ BI.RichEditorAction = BI.inherit(BI.Widget, {
return false;
},
key: function () {
},
activate: function () {
},

11
src/base/richeditor/bar/texttoolbar.js

@ -2,12 +2,12 @@
* 颜色选择
*
* Created by GUY on 2015/11/26.
* @class BI.TextToolbar
* @class BI.RichEditorTextToolbar
* @extends BI.Widget
*/
BI.TextToolbar = BI.inherit(BI.Widget, {
BI.RichEditorTextToolbar = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.TextToolbar.superclass._defaultConfig.apply(this, arguments), {
return BI.extend(BI.RichEditorTextToolbar.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-text-toolbar bi-background",
buttons: [
{type: "bi.rich_editor_size_chooser"},
@ -25,7 +25,7 @@ BI.TextToolbar = BI.inherit(BI.Widget, {
},
_init: function () {
BI.TextToolbar.superclass._init.apply(this, arguments);
BI.RichEditorTextToolbar.superclass._init.apply(this, arguments);
var self = this, o = this.options;
BI.createWidget({
type: "bi.left",
@ -40,5 +40,4 @@ BI.TextToolbar = BI.inherit(BI.Widget, {
})
},
});
BI.TextToolbar.EVENT_CHANGE = "BI.TextToolbar.EVENT_CHANGE";
BI.shortcut('bi.text_toolbar', BI.TextToolbar);
BI.shortcut('bi.rich_editor_text_toolbar', BI.RichEditorTextToolbar);

1
src/base/richeditor/niceditor/niceditor.js

@ -72,6 +72,7 @@
});
BI.NicEditor.EVENT_SELECTED = "selected";
BI.NicEditor.EVENT_BLUR = "blur";
BI.NicEditor.EVENT_KEY = "key";
BI.shortcut('bi.nic_editor', BI.NicEditor);
var prefix = "niceditor-";

7
src/base/richeditor/richeditor.js

@ -25,14 +25,10 @@ BI.RichEditor = BI.inherit(BI.Widget, {
});
this.toolbar = BI.createWidget({
type: "bi.text_toolbar",
type: "bi.rich_editor_text_toolbar",
editor: this.editor
});
this.toolbar.on(BI.TextToolbar.EVENT_CHANGE, function () {
var style = this.getValue();
});
this.combo = BI.createWidget({
type: "bi.combo",
element: this,
@ -45,6 +41,7 @@ BI.RichEditor = BI.inherit(BI.Widget, {
popup: {
el: this.toolbar,
height: 30,
stopPropagation: true,
stopEvent: true
}
});

Loading…
Cancel
Save