Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
ckeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vanilla ckeditor-3.5.3
[ckeditor.git]
/
_source
/
plugins
/
link
/
dialogs
/
link.js
diff --git
a/_source/plugins/link/dialogs/link.js
b/_source/plugins/link/dialogs/link.js
index
56baa05
..
94ee042
100644
(file)
--- a/
_source/plugins/link/dialogs/link.js
+++ b/
_source/plugins/link/dialogs/link.js
@@
-196,7
+196,8
@@
CKEDITOR.dialog.add( 'link', function( editor )
var featureMatch;
\r
while ( ( featureMatch = popupFeaturesRegex.exec( onclickMatch[2] ) ) )
\r
{
\r
var featureMatch;
\r
while ( ( featureMatch = popupFeaturesRegex.exec( onclickMatch[2] ) ) )
\r
{
\r
- if ( featureMatch[2] == 'yes' || featureMatch[2] == '1' )
\r
+ // Some values should remain numbers (#7300)
\r
+ if ( ( featureMatch[2] == 'yes' || featureMatch[2] == '1' ) && !( featureMatch[1] in { height:1, width:1, top:1, left:1 } ) )
\r
retval.target[ featureMatch[1] ] = true;
\r
else if ( isFinite( featureMatch[2] ) )
\r
retval.target[ featureMatch[1] ] = featureMatch[2];
\r
retval.target[ featureMatch[1] ] = true;
\r
else if ( isFinite( featureMatch[2] ) )
\r
retval.target[ featureMatch[1] ] = featureMatch[2];
\r
@@
-237,6
+238,7
@@
CKEDITOR.dialog.add( 'link', function( editor )
advAttr( 'advCSSClasses', 'class' );
\r
advAttr( 'advCharset', 'charset' );
\r
advAttr( 'advStyles', 'style' );
\r
advAttr( 'advCSSClasses', 'class' );
\r
advAttr( 'advCharset', 'charset' );
\r
advAttr( 'advStyles', 'style' );
\r
+ advAttr( 'advRel', 'rel' );
\r
}
\r
\r
// Find out whether we have any anchors in the editor.
\r
}
\r
\r
// Find out whether we have any anchors in the editor.
\r
@@
-1121,16
+1123,24
@@
CKEDITOR.dialog.add( 'link', function( editor )
},
\r
{
\r
type : 'hbox',
\r
},
\r
{
\r
type : 'hbox',
\r
+ widths : [ '45%', '55%' ],
\r
children :
\r
[
\r
{
\r
type : 'text',
\r
children :
\r
[
\r
{
\r
type : 'text',
\r
+ label : linkLang.rel,
\r
+ 'default' : '',
\r
+ id : 'advRel',
\r
+ setup : setupAdvParams,
\r
+ commit : commitAdvParams
\r
+ },
\r
+ {
\r
+ type : 'text',
\r
label : linkLang.styles,
\r
'default' : '',
\r
id : 'advStyles',
\r
setup : setupAdvParams,
\r
commit : commitAdvParams
\r
label : linkLang.styles,
\r
'default' : '',
\r
id : 'advStyles',
\r
setup : setupAdvParams,
\r
commit : commitAdvParams
\r
-
\r
}
\r
]
\r
}
\r
}
\r
]
\r
}
\r
@@
-1306,6
+1316,7
@@
CKEDITOR.dialog.add( 'link', function( editor )
advAttr( 'advCSSClasses', 'class' );
\r
advAttr( 'advCharset', 'charset' );
\r
advAttr( 'advStyles', 'style' );
\r
advAttr( 'advCSSClasses', 'class' );
\r
advAttr( 'advCharset', 'charset' );
\r
advAttr( 'advStyles', 'style' );
\r
+ advAttr( 'advRel', 'rel' );
\r
}
\r
\r
\r
}
\r
\r
\r
@@
-1341,7
+1352,7
@@
CKEDITOR.dialog.add( 'link', function( editor )
\r
// IE BUG: Setting the name attribute to an existing link doesn't work.
\r
// Must re-create the link from weired syntax to workaround.
\r
\r
// IE BUG: Setting the name attribute to an existing link doesn't work.
\r
// Must re-create the link from weired syntax to workaround.
\r
- if ( CKEDITOR.env.ie && attributes.name != element.getAttribute( 'name' ) )
\r
+ if ( CKEDITOR.env.ie && !( CKEDITOR.document.$.documentMode >= 8 ) && attributes.name != element.getAttribute( 'name' ) )
\r
{
\r
var newElement = new CKEDITOR.dom.element( '<a name="' + CKEDITOR.tools.htmlEncode( attributes.name ) + '">',
\r
editor.document );
\r
{
\r
var newElement = new CKEDITOR.dom.element( '<a name="' + CKEDITOR.tools.htmlEncode( attributes.name ) + '">',
\r
editor.document );
\r