vanilla ckeditor-3.6.5

[ckeditor.git] / _source / plugins / styles / plugin.js

diff --git a/_source/plugins/styles/plugin.js b/_source/plugins/styles/plugin.js
index 26519c6..b0dab59 100644 (file)
--- a/_source/plugins/styles/plugin.js
+++ b/_source/plugins/styles/plugin.js
@@ -90,6 +90,16 @@ CKEDITOR.STYLE_OBJECT = 3;
 \r
        CKEDITOR.style = function( styleDefinition, variablesValues )\r
        {\r
+               // Inline style text as attribute should be converted\r
+               // to styles object.\r
+               var attrs = styleDefinition.attributes;\r
+               if ( attrs && attrs.style )\r
+               {\r
+                       styleDefinition.styles = CKEDITOR.tools.extend( {},\r
+                               styleDefinition.styles, parseStyleText( attrs.style ) );\r
+                       delete attrs.style;\r
+               }\r
+\r
                if ( variablesValues )\r
                {\r
                        styleDefinition = CKEDITOR.tools.clone( styleDefinition );\r