vanilla ckeditor-3.4.1

[ckeditor.git] / _source / plugins / div / dialogs / div.js

diff --git a/_source/plugins/div/dialogs/div.js b/_source/plugins/div/dialogs/div.js
index 2ef3900..cf865f7 100644 (file)
--- a/_source/plugins/div/dialogs/div.js
+++ b/_source/plugins/div/dialogs/div.js
@@ -330,7 +330,13 @@
                                                                {\r
                                                                        var styleName;\r
                                                                        if ( ( styleName = this.getValue() ) )\r
-                                                                               styles[ styleName ].applyToObject( element );\r
+                                                                       {\r
+                                                                               var style = styles[ styleName ];\r
+                                                                               var customData = element.getCustomData( 'elementStyle' ) || '';\r
+\r
+                                                                               style.applyToObject( element );\r
+                                                                               element.setCustomData( 'elementStyle', customData + style._.definition.attributes.style );\r
+                                                                       }\r
                                                                }\r
                                                        },\r
                                                        {\r
@@ -386,9 +392,8 @@
                                                                                        commit : function( element )\r
                                                                                        {\r
                                                                                                // Merge with 'elementStyle', which is of higher priority.\r
-                                                                                               var value = this.getValue(),\r
-                                                                                                               merged = [ value, element.getAttribute( 'style' ) ].join( ';' );\r
-                                                                                               value && element.setAttribute( 'style', merged );\r
+                                                                                               var merged = this.getValue() + ( element.getCustomData( 'elementStyle' ) || '' );\r
+                                                                                               element.setAttribute( 'style', merged );\r
                                                                                        }\r
                                                                                }\r
                                                                ]\r
@@ -503,6 +508,9 @@
                        },\r
                        onHide : function()\r
                        {\r
+                               // Remove style only when editing existing DIV. (#6315)\r
+                               if ( command == 'editdiv' )\r
+                                       this._element.removeCustomData( 'elementStyle' );\r
                                delete this._element;\r
                        }\r
                };\r