fixed link activation in et2_description (activate_links parameter) to always use target _blank, also fixed docu in that extra_link_target is only for href attribute

This commit is contained in:
Ralf Becker 2014-03-06 10:41:22 +00:00
parent 5dadb463c8
commit f68a2ac1f5

View File

@ -43,7 +43,7 @@ var et2_description = et2_baseWidget.extend([et2_IDetachedDOM],
" renders the text bold and/or italic." " renders the text bold and/or italic."
}, },
"href": { "href": {
"name": "Link Target", "name": "Link URL",
"type": "string", "type": "string",
"description": "Link URL, empty if you don't wan't to display a link." "description": "Link URL, empty if you don't wan't to display a link."
}, },
@ -63,7 +63,7 @@ var et2_description = et2_baseWidget.extend([et2_IDetachedDOM],
"name": "Link target", "name": "Link target",
"type": "string", "type": "string",
"default": "_self", "default": "_self",
"description": "Link target descriptor" "description": "Link target for href attribute"
}, },
"extra_link_popup": { "extra_link_popup": {
"name": "Popup", "name": "Popup",
@ -100,7 +100,7 @@ var et2_description = et2_baseWidget.extend([et2_IDetachedDOM],
} }
et2_insertLinkText(this._parseText(this.options.value), this.span[0], et2_insertLinkText(this._parseText(this.options.value), this.span[0],
this.options.extra_link_target); this.options.href ? this.options.extra_link_target : '_blank');
this.setDOMNode(this.span[0]); this.setDOMNode(this.span[0]);
}, },
@ -128,7 +128,7 @@ var et2_description = et2_baseWidget.extend([et2_IDetachedDOM],
} }
et2_insertLinkText(this._parseText(_value), et2_insertLinkText(this._parseText(_value),
this.span[0], this.span[0],
this.options.extra_link_target this.options.href ? this.options.extra_link_target : '_blank'
); );
if(this.options.extra_link_popup) if(this.options.extra_link_popup)
{ {