vanilla ckeditor-3.2

[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 c63e061..e3b39c3 100644 (file)
--- a/_source/plugins/div/dialogs/div.js
+++ b/_source/plugins/div/dialogs/div.js
@@ -259,6 +259,29 @@
                        return groups;\r
                }\r
 \r
+               // Synchronous field values to other impacted fields is required, e.g. div styles\r
+               // change should also alter inline-style text.\r
+               function commitInternally( targetFields )\r
+               {\r
+                       var dialog = this.getDialog(),\r
+                                element = dialog._element && dialog._element.clone()\r
+                                                || new CKEDITOR.dom.element( 'div', editor.document );\r
+\r
+                       // Commit this field and broadcast to target fields.\r
+                       this.commit( element, true );\r
+\r
+                       targetFields = [].concat( targetFields );\r
+                       var length = targetFields.length, field;\r
+                       for ( var i = 0; i < length; i++ )\r
+                       {\r
+                               field = dialog.getContentElement.apply( dialog, targetFields[ i ].split( ':' ) );\r
+                               field && field.setup && field.setup( element, true );\r
+                       }\r
+               }\r
+\r
+\r
+               // Registered 'CKEDITOR.style' instances.\r
+               var styles = {} ;\r
                /**\r
                 * Hold a collection of created block container elements.\r
                 */\r
@@ -289,17 +312,25 @@
                                                                style :'width: 100%;',\r
                                                                label :editor.lang.div.styleSelectLabel,\r
                                                                'default' : '',\r
-                                                               items : [],\r
+                                                               // Options are loaded dynamically.\r
+                                                               items :\r
+                                                               [\r
+                                                                       [ editor.lang.common.notSet , '' ]\r
+                                                               ],\r
+                                                               onChange : function()\r
+                                                               {\r
+                                                                       commitInternally.call( this, [ 'info:class', 'advanced:dir', 'advanced:style' ] );\r
+                                                               },\r
                                                                setup : function( element )\r
                                                                {\r
-                                                                       this.setValue( element.$.style.cssText || '' );\r
+                                                                       for ( var name in styles )\r
+                                                                               styles[ name ].checkElementRemovable( element, true ) && this.setValue( name );\r
                                                                },\r
                                                                commit: function( element )\r
                                                                {\r
-                                                                       if ( this.getValue() )\r
-                                                                               element.$.style.cssText = this.getValue();\r
-                                                                       else\r
-                                                                               element.removeAttribute( 'style' );\r
+                                                                       var styleName;\r
+                                                                       if ( ( styleName = this.getValue() ) )\r
+                                                                               styles[ styleName ].applyToObject( element );\r
                                                                }\r
                                                        },\r
                                                        {\r
@@ -351,7 +382,14 @@
                                                                                        id :'style',\r
                                                                                        style :'width: 100%;',\r
                                                                                        label :editor.lang.common.cssStyle,\r
-                                                                                       'default' : ''\r
+                                                                                       'default' : '',\r
+                                                                                       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
+                                                                                       }\r
                                                                                }\r
                                                                ]\r
                                                        },\r
@@ -376,6 +414,7 @@
                                                                'default' : '',\r
                                                                items :\r
                                                                [\r
+                                                                       [ editor.lang.common.notSet , '' ],\r
                                                                        [\r
                                                                                editor.lang.common.langDirLtr,\r
                                                                                'ltr'\r
@@ -394,6 +433,49 @@
                        onLoad : function()\r
                        {\r
                                setupFields.call(this);\r
+\r
+                               // Preparing for the 'elementStyle' field.\r
+                               var dialog = this,\r
+                                        stylesField = this.getContentElement( 'info', 'elementStyle' ),\r
+                                        // Reuse the 'stylescombo' plugin's styles definition.\r
+                                        customStylesConfig =  editor.config.stylesCombo_stylesSet,\r
+                                        stylesSetName = customStylesConfig && customStylesConfig.split( ':' )[ 0 ];\r
+\r
+                               if ( stylesSetName )\r
+                               {\r
+                                       CKEDITOR.stylesSet.load( stylesSetName,\r
+                                               function( stylesSet )\r
+                                               {\r
+                                                       var stylesDefinitions = stylesSet[ stylesSetName ],\r
+                                                               styleName;\r
+\r
+                                                       if ( stylesDefinitions )\r
+                                                       {\r
+                                                               // Digg only those styles that apply to 'div'.\r
+                                                               for ( var i = 0 ; i < stylesDefinitions.length ; i++ )\r
+                                                               {\r
+                                                                       var styleDefinition = stylesDefinitions[ i ];\r
+                                                                       if ( styleDefinition.element && styleDefinition.element == 'div' )\r
+                                                                       {\r
+                                                                               styleName = styleDefinition.name;\r
+                                                                               styles[ styleName ] = new CKEDITOR.style( styleDefinition );\r
+\r
+                                                                               // Populate the styles field options with style name.\r
+                                                                               stylesField.items.push( [ styleName, styleName ] );\r
+                                                                               stylesField.add( styleName, styleName );\r
+                                                                       }\r
+                                                               }\r
+                                                       }\r
+\r
+\r
+                                                       // We should disable the content element\r
+                                                       // it if no options are available at all.\r
+                                                       stylesField[ stylesField.items.length > 1 ? 'enable' : 'disable' ]();\r
+\r
+                                                       // Now setup the field value manually.\r
+                                                       setTimeout( function() { stylesField.setup( dialog._element ); }, 0 );\r
+                                               } );\r
+                               }\r
                        },\r
                        onShow : function()\r
                        {\r
@@ -416,9 +498,20 @@
                                        containers = createDiv( editor, true );\r
 \r
                                // Update elements attributes\r
-                               for ( var i = 0 ; i < containers.length ; i++ )\r
+                               var size = containers.length;\r
+                               for ( var i = 0; i < size; i++ )\r
+                               {\r
                                        this.commitContent( containers[ i ] );\r
+\r
+                                       // Remove empty 'style' attribute.\r
+                                       !containers[ i ].getAttribute( 'style' ) && containers[ i ].removeAttribute( 'style' );\r
+                               }\r
+\r
                                this.hide();\r
+                       },\r
+                       onHide : function()\r
+                       {\r
+                               delete this._element;\r
                        }\r
                };\r
        }\r