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.4.1
[ckeditor.git]
/
_source
/
plugins
/
stylescombo
/
plugin.js
diff --git
a/_source/plugins/stylescombo/plugin.js
b/_source/plugins/stylescombo/plugin.js
index
8ed7f9b
..
f3ebfd5
100644
(file)
--- a/
_source/plugins/stylescombo/plugin.js
+++ b/
_source/plugins/stylescombo/plugin.js
@@
-34,6
+34,7
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
style = styles[ styleName ] = new CKEDITOR.style( styleDefinition );
\r
style._name = styleName;
\r
\r
style = styles[ styleName ] = new CKEDITOR.style( styleDefinition );
\r
style._name = styleName;
\r
+ style._.enterMode = config.enterMode;
\r
\r
stylesList.push( style );
\r
}
\r
\r
stylesList.push( style );
\r
}
\r
@@
-107,6
+108,8
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
if ( style.type == CKEDITOR.STYLE_INLINE && style.checkActive( elementPath ) )
\r
style.remove( editor.document );
\r
\r
if ( style.type == CKEDITOR.STYLE_INLINE && style.checkActive( elementPath ) )
\r
style.remove( editor.document );
\r
+ else if ( style.type == CKEDITOR.STYLE_OBJECT && style.checkActive( elementPath ) )
\r
+ style.remove( editor.document );
\r
else
\r
style.apply( editor.document );
\r
\r
else
\r
style.apply( editor.document );
\r
\r