Update of
/var/cvs/contributions/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha
In directory james.mmbase.org:/tmp/cvs-serv10092
Modified Files:
my-htmlarea.js
Log Message:
CMSC-681 Asset Maintenance
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha
See also: http://www.mmbase.org/jira/browse/CMSC-681
Index: my-htmlarea.js
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/my-htmlarea.js,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- my-htmlarea.js 4 Dec 2008 11:22:09 -0000 1.7
+++ my-htmlarea.js 26 Dec 2008 09:08:20 -0000 1.8
@@ -206,30 +206,33 @@
var sel = editor._getSelection();
- if (link) outparam = {
+ if (link){
+ outparam = {
f_href : HTMLArea.is_ie ? editor.stripBaseURL(link.href) :
link.getAttribute("href"),
f_destination : HTMLArea.is_ie ? link.destination :
link.getAttribute("destination"),
- f_linkName : link.linkName ? link.linkName:sel,
+ f_linkName : sel,
f_title : link.title,
- f_target : link.target
+ f_target : link.target,
+ f_usetarget : editor.config.makeLinkShowsTarget
};
-
- else
+ }
+ else{
outparam = {
f_href : "Click \"New Url\" to enter URL",
f_destination : null,
f_linkName : sel,
f_title : null,
- f_target : null
+ f_target : null,
+ f_usetarget : editor.config.makeLinkShowsTarget
};
-
- this._popupDialog("insertinline_link.html", function(param) {
- if (!param)
- return false;
+ }
+ this._popupDialog(
+ "insertinline_link.html",
+ function(param) {
+ if (!param) { return false; }
var a = link;
if (!a) {
editor._doc.execCommand("createlink", false,
param.f_href);
-
a = editor.getParentElement();
while (a) {
if (/^a$/i.test(a.tagName)) break; //Search for the
enclosing A tag, if found: continue and use it.
@@ -244,12 +247,13 @@
editor.insertNodeAtSelection(aLink);
a = aLink;
a.href = param.f_href.trim();
+ a.innerHTML = param.f_linkName.trim();
}
}
else{
a.href = param.f_href.trim();
}
- a.innerHTML = param.f_linkName.trim();
+
a.title = param.f_title.trim();
if (HTMLArea.is_ie) {
@@ -268,7 +272,8 @@
a.target = param.f_target.trim();
editor.selectNodeContents(a);
editor.updateToolbar();
- }, outparam);
+ },
+ outparam);
};
HTMLArea.prototype._insertImage = function(image) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
