diff -r fbfdcea634a7 -r fa4c5ecb7c9a includes/clientside/tinymce/plugins/advlink/editor_plugin_src.js --- a/includes/clientside/tinymce/plugins/advlink/editor_plugin_src.js Thu Jan 31 22:29:07 2008 -0500 +++ b/includes/clientside/tinymce/plugins/advlink/editor_plugin_src.js Sat Feb 02 11:54:16 2008 -0500 @@ -1,8 +1,8 @@ /** - * $Id: editor_plugin_src.js 482 2007-12-10 16:51:29Z spocke $ + * $Id: editor_plugin_src.js 539 2008-01-14 19:08:58Z spocke $ * * @author Moxiecode - * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved. + * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved. */ (function() { @@ -15,13 +15,13 @@ var se = ed.selection; // No selection and not in link - if (se.isCollapsed() && se.getNode().nodeName != 'A') + if (se.isCollapsed() && !ed.dom.getParent(se.getNode(), 'A')) return; ed.windowManager.open({ file : url + '/link.htm', - width : 480 + ed.getLang('advlink.delta_width', 0), - height : 400 + ed.getLang('advlink.delta_height', 0), + width : 480 + parseInt(ed.getLang('advlink.delta_width', 0)), + height : 400 + parseInt(ed.getLang('advlink.delta_height', 0)), inline : 1 }, { plugin_url : url @@ -38,7 +38,7 @@ ed.onNodeChange.add(function(ed, cm, n, co) { cm.setDisabled('link', co && n.nodeName != 'A'); - cm.setActive('link', n.nodeName == 'A'); + cm.setActive('link', n.nodeName == 'A' && !n.name); }); },