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.6
[ckeditor.git]
/
_source
/
plugins
/
styles
/
plugin.js
diff --git
a/_source/plugins/styles/plugin.js
b/_source/plugins/styles/plugin.js
index
4d75b2d
..
98b3eba
100644
(file)
--- a/
_source/plugins/styles/plugin.js
+++ b/
_source/plugins/styles/plugin.js
@@
-213,7
+213,7
@@
CKEDITOR.STYLE_OBJECT = 3;
// current style definition.
\r
checkElementRemovable : function( element, fullMatch )
\r
{
\r
// current style definition.
\r
checkElementRemovable : function( element, fullMatch )
\r
{
\r
- if ( !element )
\r
+ if ( !element || element.isReadOnly() )
\r
return false;
\r
\r
var def = this._.definition,
\r
return false;
\r
\r
var def = this._.definition,
\r
@@
-288,7
+288,7
@@
CKEDITOR.STYLE_OBJECT = 3;
},
\r
\r
// Builds the preview HTML based on the styles definition.
\r
},
\r
\r
// Builds the preview HTML based on the styles definition.
\r
- buildPreview : function()
\r
+ buildPreview : function( label )
\r
{
\r
var styleDefinition = this._.definition,
\r
html = [],
\r
{
\r
var styleDefinition = this._.definition,
\r
html = [],
\r
@@
-315,7
+315,7
@@
CKEDITOR.STYLE_OBJECT = 3;
if ( cssStyle )
\r
html.push( ' style="', cssStyle, '"' );
\r
\r
if ( cssStyle )
\r
html.push( ' style="', cssStyle, '"' );
\r
\r
- html.push( '>', styleDefinition.name, '</', elementName, '>' );
\r
+ html.push( '>', ( label || styleDefinition.name ), '</', elementName, '>' );
\r
\r
return html.join( '' );
\r
}
\r
\r
return html.join( '' );
\r
}
\r