Browse Source

Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/fui/fineui

# Conflicts:
#	dist/bundle.min.js
#	dist/fineui.min.js
es6
windy 7 years ago
parent
commit
c9501fe067
  1. 16
      dist/bundle.js
  2. 16
      dist/case.js
  3. 16
      dist/fineui.js
  4. 16
      src/case/richeditor/bar/action.richeditor.param.js

16
dist/bundle.js vendored

@ -80161,6 +80161,13 @@ BI.RichEditorParamAction = BI.inherit(BI.RichEditorAction, {
} }
}, },
_get$Sel: function () {
var o = this.options;
var instance = o.editor.selectedInstance;
var sel = $(instance.selElm());
return sel;
},
addParam: function (param) { addParam: function (param) {
var o = this.options; var o = this.options;
var instance = o.editor.instance; var instance = o.editor.instance;
@ -80169,7 +80176,14 @@ BI.RichEditorParamAction = BI.inherit(BI.RichEditorAction, {
image.src = attrs.src; image.src = attrs.src;
image.alt = param; image.alt = param;
image.style = attrs.style; image.style = attrs.style;
instance.getElm().element.append(image);
var sel = this._get$Sel();
var wrapper = o.editor.instance.getElm().element;
if (wrapper.find(sel).length <= 0) {
wrapper.append(image);
} else {
sel.after(image);
}
this._addBlank($(image)); this._addBlank($(image));
} }
}); });

16
dist/case.js vendored

@ -9959,6 +9959,13 @@ BI.RichEditorParamAction = BI.inherit(BI.RichEditorAction, {
} }
}, },
_get$Sel: function () {
var o = this.options;
var instance = o.editor.selectedInstance;
var sel = $(instance.selElm());
return sel;
},
addParam: function (param) { addParam: function (param) {
var o = this.options; var o = this.options;
var instance = o.editor.instance; var instance = o.editor.instance;
@ -9967,7 +9974,14 @@ BI.RichEditorParamAction = BI.inherit(BI.RichEditorAction, {
image.src = attrs.src; image.src = attrs.src;
image.alt = param; image.alt = param;
image.style = attrs.style; image.style = attrs.style;
instance.getElm().element.append(image);
var sel = this._get$Sel();
var wrapper = o.editor.instance.getElm().element;
if (wrapper.find(sel).length <= 0) {
wrapper.append(image);
} else {
sel.after(image);
}
this._addBlank($(image)); this._addBlank($(image));
} }
}); });

16
dist/fineui.js vendored

@ -81925,6 +81925,13 @@ BI.RichEditorParamAction = BI.inherit(BI.RichEditorAction, {
} }
}, },
_get$Sel: function () {
var o = this.options;
var instance = o.editor.selectedInstance;
var sel = $(instance.selElm());
return sel;
},
addParam: function (param) { addParam: function (param) {
var o = this.options; var o = this.options;
var instance = o.editor.instance; var instance = o.editor.instance;
@ -81933,7 +81940,14 @@ BI.RichEditorParamAction = BI.inherit(BI.RichEditorAction, {
image.src = attrs.src; image.src = attrs.src;
image.alt = param; image.alt = param;
image.style = attrs.style; image.style = attrs.style;
instance.getElm().element.append(image);
var sel = this._get$Sel();
var wrapper = o.editor.instance.getElm().element;
if (wrapper.find(sel).length <= 0) {
wrapper.append(image);
} else {
sel.after(image);
}
this._addBlank($(image)); this._addBlank($(image));
} }
}); });

16
src/case/richeditor/bar/action.richeditor.param.js

@ -30,6 +30,13 @@ BI.RichEditorParamAction = BI.inherit(BI.RichEditorAction, {
} }
}, },
_get$Sel: function () {
var o = this.options;
var instance = o.editor.selectedInstance;
var sel = $(instance.selElm());
return sel;
},
addParam: function (param) { addParam: function (param) {
var o = this.options; var o = this.options;
var instance = o.editor.instance; var instance = o.editor.instance;
@ -38,7 +45,14 @@ BI.RichEditorParamAction = BI.inherit(BI.RichEditorAction, {
image.src = attrs.src; image.src = attrs.src;
image.alt = param; image.alt = param;
image.style = attrs.style; image.style = attrs.style;
instance.getElm().element.append(image);
var sel = this._get$Sel();
var wrapper = o.editor.instance.getElm().element;
if (wrapper.find(sel).length <= 0) {
wrapper.append(image);
} else {
sel.after(image);
}
this._addBlank($(image)); this._addBlank($(image));
} }
}); });

Loading…
Cancel
Save