Ticket #4056: 4056_3.patch

_source/plugins/forms/dialogs/hiddenfield.js

@@ -6 +6 @@
 {
         return {
                 title : editor.lang.hidden.title,
+                hiddenField : null,
                 minWidth : 350,
                 minHeight : 110,
                 onShow : function()
                 {
                         delete this.hiddenField;
 
-                        var element = this.getParentEditor().getSelection().getSelectedElement();
-                        if ( element && element.getName() == "input" && element.getAttribute( 'type' ) == "checkbox" )
-                        {
-                                this.hiddenField = element;
+                        var editor = this.getParentEditor(), 
+                        selection = editor.getSelection(), 
+                        element = selection.getSelectedElement(); 
+                                 
+                if ( element && element.getAttribute( '_cke_real_element_type' ) && element.getAttribute( '_cke_real_element_type' ) == 'hiddenfield' ) 
+            { 
+                                this.hiddenField = element; 
+                                element = editor.restoreRealElement( this.hiddenField ); 
                                 this.setupContent( element );
-                        }
+                                selection.selectElement( this.hiddenField ); 
+                } 
                 },
                 onOk : function()
                 {
-                        var editor,
-                                element = this.hiddenField,
-                                isInsertMode = !element;
+                        var name = this.getValueOf( 'info', '_cke_saved_name' ), 
+                                value = this.getValueOf( 'info', 'value' ), 
+                                editor = this.getParentEditor(), 
+                                element = CKEDITOR.env.ie ? 
+                                        editor.document.createElement( '<input name="' + CKEDITOR.tools.htmlEncode( name ) + '">' ) : 
+                                                editor.document.createElement( 'input' ); 
 
-                        if ( isInsertMode )
-                        {
-                                editor = this.getParentEditor();
-                                element = editor.document.createElement( 'input' );
-                                element.setAttribute( 'type', 'hidden' );
-                        }
-
-                        if ( isInsertMode )
-                                editor.insertElement( element );
+                        element.setAttribute( 'type', 'hidden' ); 
                         this.commitContent( element );
+                        var fakeElement = editor.createFakeElement( element, 'cke_hidden', 'hiddenfield' ); 
+                        
+                        if ( !this.hiddenField ) 
+                                editor.insertElement( fakeElement ); 
+                        else 
+                        { 
+                                fakeElement.replace( this.hiddenField ); 
+                                editor.getSelection().selectElement( fakeElement );
+            }
+                        
+                        return true; 
                 },
                 contents : [
                         {
@@ -50 +62 @@
                                                 accessKey : 'N',
                                                 setup : function( element )
                                                 {
+                                                        
                                                         this.setValue(
                                                                         element.getAttribute( '_cke_saved_name' ) ||
                                                                         element.getAttribute( 'name' ) ||
@@ -58 +71 @@
                                                 commit : function( element )
                                                 {
                                                         if ( this.getValue() )
-                                                                element.setAttribute( '_cke_saved_name', this.getValue() );
+                                                                element.setAttribute( 'name', this.getValue() );
                                                         else
                                                         {
-                                                                element.removeAttribute( '_cke_saved_name' );
                                                                 element.removeAttribute( 'name' );
                                                         }
                                                 }

_source/plugins/forms/plugin.js

@@ -18 +18 @@
                         '{' +
                                 'border: 1px dotted #FF0000;' +
                                 'padding: 2px;' +
-                        '}' );
+                        '}\n' );
+                        
+                editor.addCss(
+                        'img.cke_hidden' +
+                        '{' +
+                                'background-image: url(' + CKEDITOR.getUrl( this.path + 'images/hiddenfield.gif' ) + ');' +
+                                'background-position: center center;' +
+                                'background-repeat: no-repeat;' +
+                                'border: 1px solid #a9a9a9;' +
+                                'width: 16px;' +
+                                'height: 16px;' +
+                        '}' );  
 
                 // All buttons use the same code to register. So, to avoid
                 // duplications, let's use this tool function.
@@ -165 +176 @@
 
         afterInit : function( editor )
         {
+                var dataProcessor = editor.dataProcessor, 
+                                htmlFilter = dataProcessor && dataProcessor.htmlFilter, 
+                                dataFilter = dataProcessor && dataProcessor.dataFilter;
+                                
                 // Cleanup certain IE form elements default values.
                 if ( CKEDITOR.env.ie )
                 {
@@ -185 +200 @@
                                 }
                         } );
                 }
+                
+                if ( dataFilter ) 
+                { 
+                        dataFilter.addRules( 
+                        { 
+                                elements : 
+                                { 
+                                        input : function( element ) 
+                                        { 
+                                                if ( element.attributes.type == 'hidden' ) { 
+                                                                return editor.createFakeParserElement( element, 'cke_hidden', 'hiddenfield' ); 
+                                                } 
+                                        } 
+                                } 
+                        } ); 
+                } 
         },
-        requires : [ 'image' ]
+        
+        requires : [ 'image', 'fakeobjects' ]
 } );
 
 if ( CKEDITOR.env.ie )