Ticket #4527: 4527_2.patch

_source/plugins/forms/dialogs/checkbox.js

@@ -79 +79 @@
                                                 accessKey : 'V',
                                                 setup : function( element )
                                                 {
-                                                        this.setValue( element.getAttribute( 'value' ) || '' );
+                                                        var value = element.getAttribute( 'value' );
+                                                        // IE Return 'on' as default attr value.
+                                                        this.setValue(  CKEDITOR.env.ie && value == 'on' ? '' : value  );
                                                 },
                                                 commit : function( data )
                                                 {
-                                                        var element = data.element;
+                                                        var element = data.element,
+                                                                value = this.getValue();
 
-                                                        if ( this.getValue() )
-                                                                element.setAttribute( 'value', this.getValue() );
+                                                        if ( value && !( CKEDITOR.env.ie && value == 'on' ) )
+                                                                element.setAttribute( 'value', value );
                                                         else
                                                                 element.removeAttribute( 'value' );
                                                 }
@@ -115 +118 @@
                                                                 {
                                                                         var replace = CKEDITOR.dom.element.createFromHtml( '<input type="checkbox"'
                                                                                    + ( isChecked ? ' checked="checked"' : '' )
-                                                                                   + '></input>', editor.document );
+                                                                                   + '/>', editor.document );
+
                                                                         element.copyAttributes( replace, { type : 1, checked : 1 } );
                                                                         replace.replace( element );
                                                                         editor.getSelection().selectElement( replace );
@@ -124 +128 @@
                                                         }
                                                         else
                                                         {
-                                                                if ( this.getValue() )
-                                                                        element.setAttribute( 'checked', this.getValue() );
+                                                                var value = this.getValue();
+                                                                if ( value )
+                                                                        element.setAttribute( 'checked', 'checked' );
                                                                 else
                                                                         element.removeAttribute( 'checked' );
                                                         }

_source/core/dom/element.js

@@ -425 +425 @@
                                                         break;
 
                                                 case 'checked':
-                                                        return this.$.checked;
-                                                        break;
-
+                                                {
+                                                        var attr = this.$.attributes.getNamedItem( name ),
+                                                                attrValue = attr.specified ? attr.nodeValue     // For value given by parser.
+                                                                                                                         : this.$.checked;  // For value created via DOM interface.
+                                                        
+                                                        return attrValue ? 'checked' : null;
+                                                }
+
                                                 case 'style':
                                                         // IE does not return inline styles via getAttribute(). See #2947.
                                                         return this.$.style.cssText;
@@ -1323 +1328 @@
                         {
                                 var attribute = attributes[n];
 
-                                // IE BUG: value attribute is never specified even if it exists.
-                                if ( attribute.specified ||
-                                  ( CKEDITOR.env.ie && attribute.nodeValue && attribute.nodeName.toLowerCase() == 'value' ) )
-                                {
-                                        var attrName = attribute.nodeName;
-                                        // We can set the type only once, so do it with the proper value, not copying it.
-                                        if ( attrName in skipAttributes )
-                                                continue;
+                                // Lowercase attribute name hard rule is broken for
+                                // some attribute on IE, e.g. CHECKED.
+                                var attrName = attribute.nodeName.toLowerCase(),
+                                        attrValue;
+
+                                // We can set the type only once, so do it with the proper value, not copying it.
+                                if ( attrName in skipAttributes )
+                                        continue;
 
-                                        var attrValue = this.getAttribute( attrName );
+                                if( attrName == 'checked' && ( attrValue = this.getAttribute( attrName ) ) )
+                                        dest.setAttribute( attrName, attrValue );
+                                // IE BUG: value attribute is never specified even if it exists.
+                                else if ( attribute.specified ||
+                                  ( CKEDITOR.env.ie && attribute.nodeValue && attrName == 'value' ) )
+                                {
+                                        attrValue = this.getAttribute( attrName );
                                         if ( attrValue === null )
                                                 attrValue = attribute.nodeValue;
 

_source/plugins/forms/plugin.js

@@ -162 +162 @@
                                 });
                 }
         },
+
+        afterInit : function( editor )
+        {
+                // Cleanup certain IE form elements default values.
+                if( CKEDITOR.env.ie )
+                {
+                        var dataProcessor = editor.dataProcessor,
+                                htmlFilter = dataProcessor && dataProcessor.htmlFilter;
+
+                        htmlFilter && htmlFilter.addRules(
+                        {
+                                elements :
+                                {
+                                        input : function( input )
+                                        {
+                                                var attrs = input.attributes,
+                                                        type = attrs.type;
+                                                if( type == 'checkbox' || type == 'radio' )
+                                                        attrs.value == 'on' && delete attrs.value;
+                                        }
+                                }
+                        } );
+                }
+        },
         requires : [ 'image' ]
 } );