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

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

* commit 'dbc12c9c1d04a51e67c574768b54483ea040404b':
  update
es6
imp 7 years ago
parent
e0f6850106 dbc12c9c1d
commit
74b551b1ae
8 changed files with 165 additions and 89 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. 38
      dist/_fineui.min.js
  2. 35
      dist/bundle.js
  3. 38
      dist/bundle.min.js
  4. 35
      dist/case.js
  5. 35
      dist/fineui.js
  6. 38
      dist/fineui.min.js
  7. 14
      src/case/richeditor/bar/action.richeditor.js
  8. 21
      src/case/richeditor/niceditor/niceditor.js

38
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

35
dist/bundle.js vendored
Unescape View File

@ -82903,13 +82903,13 @@ BI.RichEditorAction = BI.inherit(BI.Widget, {
self.key(e); self.key(e);
} }
}); });
o.editor.on(BI.NicEditor.EVENT_BLUR, function () { // o.editor.on(BI.NicEditor.EVENT_BLUR, function () {
self.setEnable(false); // self.setEnable(false);
}); // });
o.editor.on(BI.NicEditor.EVENT_KEYDOWN, BI.bind(this.keydown, this)); // o.editor.on(BI.NicEditor.EVENT_KEYDOWN, BI.bind(this.keydown, this));
if (o.used === false) { // if (o.used === false) {
this.setEnable(false); // this.setEnable(false);
} // }
}, },
checkNodes: function (e) { checkNodes: function (e) {
@ -83272,9 +83272,12 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
return; return;
// return false; // return false;
} }
if (this.instance.checkToolbar(t)) {
return;
}
} while (t = t.parentNode); } while (t = t.parentNode);
this.fireEvent("blur", t); this.fireEvent("blur", t);
this.lastSelectedInstance = this.selectedInstance; this.lastSelectedInstance = this.selectedInstance || this.lastSelectedInstance;
this.selectedInstance = null; this.selectedInstance = null;
// return false; // return false;
}, },
@ -83283,6 +83286,10 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
this.instance.focus(); this.instance.focus();
}, },
bindToolbar: function (toolbar) {
this.instance.bindToolbar(toolbar);
},
setValue: function (v) { setValue: function (v) {
this.instance.setContent(v); this.instance.setContent(v);
}, },
@ -83291,6 +83298,10 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
return this.instance.getContent(); return this.instance.getContent();
}, },
getInstance: function () {
return this.instance;
},
destroyed: function () { destroyed: function () {
$(document).unbind("mousedown." + this.getName()); $(document).unbind("mousedown." + this.getName());
} }
@ -83529,6 +83540,14 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
} }
}, },
bindToolbar: function (toolbar) {
this.toolbar = toolbar;
},
checkToolbar: function (element) {
return this.toolbar && this.toolbar.element[0] === element;
},
nicCommand: function (cmd, args) { nicCommand: function (cmd, args) {
document.execCommand(cmd, false, args); document.execCommand(cmd, false, args);
} }

38
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

35
dist/case.js vendored
Unescape View File

@ -10403,13 +10403,13 @@ BI.RichEditorAction = BI.inherit(BI.Widget, {
self.key(e); self.key(e);
} }
}); });
o.editor.on(BI.NicEditor.EVENT_BLUR, function () { // o.editor.on(BI.NicEditor.EVENT_BLUR, function () {
self.setEnable(false); // self.setEnable(false);
}); // });
o.editor.on(BI.NicEditor.EVENT_KEYDOWN, BI.bind(this.keydown, this)); // o.editor.on(BI.NicEditor.EVENT_KEYDOWN, BI.bind(this.keydown, this));
if (o.used === false) { // if (o.used === false) {
this.setEnable(false); // this.setEnable(false);
} // }
}, },
checkNodes: function (e) { checkNodes: function (e) {
@ -10772,9 +10772,12 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
return; return;
// return false; // return false;
} }
if (this.instance.checkToolbar(t)) {
return;
}
} while (t = t.parentNode); } while (t = t.parentNode);
this.fireEvent("blur", t); this.fireEvent("blur", t);
this.lastSelectedInstance = this.selectedInstance; this.lastSelectedInstance = this.selectedInstance || this.lastSelectedInstance;
this.selectedInstance = null; this.selectedInstance = null;
// return false; // return false;
}, },
@ -10783,6 +10786,10 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
this.instance.focus(); this.instance.focus();
}, },
bindToolbar: function (toolbar) {
this.instance.bindToolbar(toolbar);
},
setValue: function (v) { setValue: function (v) {
this.instance.setContent(v); this.instance.setContent(v);
}, },
@ -10791,6 +10798,10 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
return this.instance.getContent(); return this.instance.getContent();
}, },
getInstance: function () {
return this.instance;
},
destroyed: function () { destroyed: function () {
$(document).unbind("mousedown." + this.getName()); $(document).unbind("mousedown." + this.getName());
} }
@ -11029,6 +11040,14 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
} }
}, },
bindToolbar: function (toolbar) {
this.toolbar = toolbar;
},
checkToolbar: function (element) {
return this.toolbar && this.toolbar.element[0] === element;
},
nicCommand: function (cmd, args) { nicCommand: function (cmd, args) {
document.execCommand(cmd, false, args); document.execCommand(cmd, false, args);
} }

35
dist/fineui.js vendored
Unescape View File

@ -83152,13 +83152,13 @@ BI.RichEditorAction = BI.inherit(BI.Widget, {
self.key(e); self.key(e);
} }
}); });
o.editor.on(BI.NicEditor.EVENT_BLUR, function () { // o.editor.on(BI.NicEditor.EVENT_BLUR, function () {
self.setEnable(false); // self.setEnable(false);
}); // });
o.editor.on(BI.NicEditor.EVENT_KEYDOWN, BI.bind(this.keydown, this)); // o.editor.on(BI.NicEditor.EVENT_KEYDOWN, BI.bind(this.keydown, this));
if (o.used === false) { // if (o.used === false) {
this.setEnable(false); // this.setEnable(false);
} // }
}, },
checkNodes: function (e) { checkNodes: function (e) {
@ -83521,9 +83521,12 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
return; return;
// return false; // return false;
} }
if (this.instance.checkToolbar(t)) {
return;
}
} while (t = t.parentNode); } while (t = t.parentNode);
this.fireEvent("blur", t); this.fireEvent("blur", t);
this.lastSelectedInstance = this.selectedInstance; this.lastSelectedInstance = this.selectedInstance || this.lastSelectedInstance;
this.selectedInstance = null; this.selectedInstance = null;
// return false; // return false;
}, },
@ -83532,6 +83535,10 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
this.instance.focus(); this.instance.focus();
}, },
bindToolbar: function (toolbar) {
this.instance.bindToolbar(toolbar);
},
setValue: function (v) { setValue: function (v) {
this.instance.setContent(v); this.instance.setContent(v);
}, },
@ -83540,6 +83547,10 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
return this.instance.getContent(); return this.instance.getContent();
}, },
getInstance: function () {
return this.instance;
},
destroyed: function () { destroyed: function () {
$(document).unbind("mousedown." + this.getName()); $(document).unbind("mousedown." + this.getName());
} }
@ -83778,6 +83789,14 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
} }
}, },
bindToolbar: function (toolbar) {
this.toolbar = toolbar;
},
checkToolbar: function (element) {
return this.toolbar && this.toolbar.element[0] === element;
},
nicCommand: function (cmd, args) { nicCommand: function (cmd, args) {
document.execCommand(cmd, false, args); document.execCommand(cmd, false, args);
} }

38
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

14
src/case/richeditor/bar/action.richeditor.js
Unescape View File

@ -24,13 +24,13 @@ BI.RichEditorAction = BI.inherit(BI.Widget, {
self.key(e); self.key(e);
} }
}); });
o.editor.on(BI.NicEditor.EVENT_BLUR, function () { // o.editor.on(BI.NicEditor.EVENT_BLUR, function () {
self.setEnable(false); // self.setEnable(false);
}); // });
o.editor.on(BI.NicEditor.EVENT_KEYDOWN, BI.bind(this.keydown, this)); // o.editor.on(BI.NicEditor.EVENT_KEYDOWN, BI.bind(this.keydown, this));
if (o.used === false) { // if (o.used === false) {
this.setEnable(false); // this.setEnable(false);
} // }
}, },
checkNodes: function (e) { checkNodes: function (e) {

21
src/case/richeditor/niceditor/niceditor.js
Unescape View File

@ -65,9 +65,12 @@
return; return;
// return false; // return false;
} }
if (this.instance.checkToolbar(t)) {
return;
}
} while (t = t.parentNode); } while (t = t.parentNode);
this.fireEvent("blur", t); this.fireEvent("blur", t);
this.lastSelectedInstance = this.selectedInstance; this.lastSelectedInstance = this.selectedInstance || this.lastSelectedInstance;
this.selectedInstance = null; this.selectedInstance = null;
// return false; // return false;
}, },
@ -76,6 +79,10 @@
this.instance.focus(); this.instance.focus();
}, },
bindToolbar: function (toolbar) {
this.instance.bindToolbar(toolbar);
},
setValue: function (v) { setValue: function (v) {
this.instance.setContent(v); this.instance.setContent(v);
}, },
@ -84,6 +91,10 @@
return this.instance.getContent(); return this.instance.getContent();
}, },
getInstance: function () {
return this.instance;
},
destroyed: function () { destroyed: function () {
$(document).unbind("mousedown." + this.getName()); $(document).unbind("mousedown." + this.getName());
} }
@ -322,6 +333,14 @@
} }
}, },
bindToolbar: function (toolbar) {
this.toolbar = toolbar;
},
checkToolbar: function (element) {
return this.toolbar && this.toolbar.element[0] === element;
},
nicCommand: function (cmd, args) { nicCommand: function (cmd, args) {
document.execCommand(cmd, false, args); document.execCommand(cmd, false, args);
} }

Write Preview
Loading…
Cancel
Save