Ticket #6108: 6108.patch

_source/plugins/div/dialogs/div.js

@@ -330 +330 @@
                                                                 {
                                                                         var styleName;
                                                                         if ( ( styleName = this.getValue() ) )
-                                                                                styles[ styleName ].applyToObject( element );
-                                                                }
+                                                                        {
+                                                                                var style = styles[ styleName ];
+                                                                                var customData = element.getCustomData( 'elementStyle' ) || '';
+                                                                                
+                                                                                style.applyToObject( element );
+                                                                                element.setCustomData( 'elementStyle', customData + style._.definition.attributes.style );
+                                                                        }
+                                                                }
                                                         },
                                                         {
                                                                 id :'class',
@@ -386 +392 @@
                                                                                         commit : function( element )
                                                                                         {
                                                                                                 // Merge with 'elementStyle', which is of higher priority.
-                                                                                                var value = this.getValue(),
-                                                                                                                merged = [ value, element.getAttribute( 'style' ) ].join( ';' );
-                                                                                                value && element.setAttribute( 'style', merged );
+                                                                                                var merged = this.getValue() + ( element.getCustomData( 'elementStyle' ) || '' );
+                                                                                                element.setAttribute( 'style', merged );
                                                                                         }
                                                                                 }
                                                                 ]
@@ -503 +508 @@
                         },
                         onHide : function()
                         {
+                                this._element.removeCustomData( 'elementStyle' );
                                 delete this._element;
                         }
                 };