Browse Source

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

* commit 'f8a1bb2e49e89b3e39481ee13173b06d0012a1b0':
  update
es6
guy 7 years ago
parent
commit
6a0f641421
  1. 10
      bi/base.js
  2. 10
      dist/base.js
  3. 10
      dist/bundle.js
  4. 56
      dist/bundle.min.js
  5. 8
      src/base/richeditor/bar/action.richeditor.param.js
  6. 2
      src/base/richeditor/niceditor/niceditor.js

10
bi/base.js

@ -16329,9 +16329,11 @@ BI.RichEditorParamAction = BI.inherit(BI.RichEditorAction, {
var instance = o.editor.selectedInstance; var instance = o.editor.selectedInstance;
var next = $param.next(); var next = $param.next();
if (next.length === 0 || this._isParam(next)) { if (next.length === 0 || this._isParam(next)) {
var node = this._createBlankNode(); var preNode = this._createBlankNode();
$param.after(node); var nextNode = this._createBlankNode();
instance.setFocus(node[0]); $param.before(preNode);
$param.after(nextNode);
instance.setFocus(nextNode[0]);
} else { } else {
instance.setFocus(next[0]); instance.setFocus(next[0]);
} }
@ -16585,7 +16587,7 @@ BI.shortcut('bi.rich_editor_text_toolbar', BI.RichEditorTextToolbar);/**
start: function () { start: function () {
this.elm.element.attr("contentEditable", true); this.elm.element.attr("contentEditable", true);
if (this.getContent() == "") { if (this.getContent() == "") {
this.setContent("<br />"); // this.setContent("<br />");
} }
this.instanceDoc = document.defaultView; this.instanceDoc = document.defaultView;
this.elm.element.on('mousedown', BI.bind(this.selected, this)); this.elm.element.on('mousedown', BI.bind(this.selected, this));

10
dist/base.js vendored

@ -16329,9 +16329,11 @@ BI.RichEditorParamAction = BI.inherit(BI.RichEditorAction, {
var instance = o.editor.selectedInstance; var instance = o.editor.selectedInstance;
var next = $param.next(); var next = $param.next();
if (next.length === 0 || this._isParam(next)) { if (next.length === 0 || this._isParam(next)) {
var node = this._createBlankNode(); var preNode = this._createBlankNode();
$param.after(node); var nextNode = this._createBlankNode();
instance.setFocus(node[0]); $param.before(preNode);
$param.after(nextNode);
instance.setFocus(nextNode[0]);
} else { } else {
instance.setFocus(next[0]); instance.setFocus(next[0]);
} }
@ -16585,7 +16587,7 @@ BI.shortcut('bi.rich_editor_text_toolbar', BI.RichEditorTextToolbar);/**
start: function () { start: function () {
this.elm.element.attr("contentEditable", true); this.elm.element.attr("contentEditable", true);
if (this.getContent() == "") { if (this.getContent() == "") {
this.setContent("<br />"); // this.setContent("<br />");
} }
this.instanceDoc = document.defaultView; this.instanceDoc = document.defaultView;
this.elm.element.on('mousedown', BI.bind(this.selected, this)); this.elm.element.on('mousedown', BI.bind(this.selected, this));

10
dist/bundle.js vendored

@ -45334,9 +45334,11 @@ BI.RichEditorParamAction = BI.inherit(BI.RichEditorAction, {
var instance = o.editor.selectedInstance; var instance = o.editor.selectedInstance;
var next = $param.next(); var next = $param.next();
if (next.length === 0 || this._isParam(next)) { if (next.length === 0 || this._isParam(next)) {
var node = this._createBlankNode(); var preNode = this._createBlankNode();
$param.after(node); var nextNode = this._createBlankNode();
instance.setFocus(node[0]); $param.before(preNode);
$param.after(nextNode);
instance.setFocus(nextNode[0]);
} else { } else {
instance.setFocus(next[0]); instance.setFocus(next[0]);
} }
@ -45590,7 +45592,7 @@ BI.shortcut('bi.rich_editor_text_toolbar', BI.RichEditorTextToolbar);/**
start: function () { start: function () {
this.elm.element.attr("contentEditable", true); this.elm.element.attr("contentEditable", true);
if (this.getContent() == "") { if (this.getContent() == "") {
this.setContent("<br />"); // this.setContent("<br />");
} }
this.instanceDoc = document.defaultView; this.instanceDoc = document.defaultView;
this.elm.element.on('mousedown', BI.bind(this.selected, this)); this.elm.element.on('mousedown', BI.bind(this.selected, this));

56
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

8
src/base/richeditor/bar/action.richeditor.param.js

@ -26,9 +26,11 @@ BI.RichEditorParamAction = BI.inherit(BI.RichEditorAction, {
var instance = o.editor.selectedInstance; var instance = o.editor.selectedInstance;
var next = $param.next(); var next = $param.next();
if (next.length === 0 || this._isParam(next)) { if (next.length === 0 || this._isParam(next)) {
var node = this._createBlankNode(); var preNode = this._createBlankNode();
$param.after(node); var nextNode = this._createBlankNode();
instance.setFocus(node[0]); $param.before(preNode);
$param.after(nextNode);
instance.setFocus(nextNode[0]);
} else { } else {
instance.setFocus(next[0]); instance.setFocus(next[0]);
} }

2
src/base/richeditor/niceditor/niceditor.js

@ -121,7 +121,7 @@
start: function () { start: function () {
this.elm.element.attr("contentEditable", true); this.elm.element.attr("contentEditable", true);
if (this.getContent() == "") { if (this.getContent() == "") {
this.setContent("<br />"); // this.setContent("<br />");
} }
this.instanceDoc = document.defaultView; this.instanceDoc = document.defaultView;
this.elm.element.on('mousedown', BI.bind(this.selected, this)); this.elm.element.on('mousedown', BI.bind(this.selected, this));

Loading…
Cancel
Save