Changeset 5295

Timestamp:

03/25/10 17:53:38 (3 years ago)

Author:

m.nguyen

Message:

Fixing #4056: Created face object for hiddenfield.

Location:

CKEditor/branches/versions/3.3.x

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/forms/dialogs/hiddenfield.js (modified) (3 diffs)
• _source/plugins/forms/images (added)
• _source/plugins/forms/images/hiddenfield.gif (added)
• _source/plugins/forms/plugin.js (modified) (3 diffs)

CKEditor/branches/versions/3.3.x/CHANGES.html

@@ -45 +45 @@
                 Fixed issues:</p>
         <ul>
-                <li></li>
+                <li><a href="http://dev.fckeditor.net/ticket/4056">#4056</a> : Fixed hiddenfield problem.</li>
         </ul>
         <h3>

CKEditor/branches/versions/3.3.x/_source/plugins/forms/dialogs/hiddenfield.js

@@ -7 +7 @@
         return {
                 title : editor.lang.hidden.title,
+                hiddenField : null,
                 minWidth : 350,
                 minHeight : 110,
@@ -13 +14 @@
                         delete this.hiddenField;
 
-                        var element = this.getParentEditor().getSelection().getSelectedElement();
-                        if ( element && element.getName() == "input" && element.getAttribute( 'type' ) == "checkbox" )
+                        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 )
+                        element.setAttribute( 'type', 'hidden' );
+                        this.commitContent( element );
+                        var fakeElement = editor.createFakeElement( element, 'cke_hidden', 'hiddenfield' );
+                        if ( !this.hiddenField )
+                                editor.insertElement( fakeElement );
+                        else
                         {
-                                editor = this.getParentEditor();
-                                element = editor.document.createElement( 'input' );
-                                element.setAttribute( 'type', 'hidden' );
+                                fakeElement.replace( this.hiddenField );
+                                editor.getSelection().selectElement( fakeElement );
                         }
-
-                        if ( isInsertMode )
-                                editor.insertElement( element );
-                        this.commitContent( element );
+                        return true;
                 },
                 contents : [
@@ -59 +67 @@
                                                 {
                                                         if ( this.getValue() )
-                                                                element.setAttribute( '_cke_saved_name', this.getValue() );
+                                                                element.setAttribute( 'name', this.getValue() );
                                                         else
                                                         {
-                                                                element.removeAttribute( '_cke_saved_name' );
                                                                 element.removeAttribute( 'name' );
                                                         }

CKEditor/branches/versions/3.3.x/_source/plugins/forms/plugin.js

@@ -19 +19 @@
                                 '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.
@@ -166 +177 @@
         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 )
                 {
-                        var dataProcessor = editor.dataProcessor,
-                                htmlFilter = dataProcessor && dataProcessor.htmlFilter;
-
                         htmlFilter && htmlFilter.addRules(
                         {
@@ -186 +198 @@
                         } );
                 }
+                
+                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' ]
 } );