vanilla ckeditor-3.6.3

[ckeditor.git] / _source / plugins / forms / dialogs / checkbox.js

diff --git a/_source/plugins/forms/dialogs/checkbox.js b/_source/plugins/forms/dialogs/checkbox.js
index 021163b..5a44046 100644 (file)
--- a/_source/plugins/forms/dialogs/checkbox.js
+++ b/_source/plugins/forms/dialogs/checkbox.js
@@ -1,5 +1,5 @@
 /*\r
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.\r
 For licensing, see LICENSE.html or http://ckeditor.com/license\r
 */\r
 CKEDITOR.dialog.add( 'checkbox', function( editor )\r
@@ -14,7 +14,7 @@ CKEDITOR.dialog.add( 'checkbox', function( editor )
 \r
                        var element = this.getParentEditor().getSelection().getSelectedElement();\r
 \r
-                       if ( element && element.getAttribute( 'type' ) == "checkbox" )\r
+                       if ( element && element.getAttribute( 'type' ) == 'checkbox' )\r
                        {\r
                                this.checkbox = element;\r
                                this.setupContent( element );\r
@@ -31,10 +31,8 @@ CKEDITOR.dialog.add( 'checkbox', function( editor )
                                editor = this.getParentEditor();\r
                                element = editor.document.createElement( 'input' );\r
                                element.setAttribute( 'type', 'checkbox' );\r
-                       }\r
-\r
-                       if ( isInsertMode )\r
                                editor.insertElement( element );\r
+                       }\r
                        this.commitContent( { element : element } );\r
                },\r
                contents : [\r
@@ -53,7 +51,7 @@ CKEDITOR.dialog.add( 'checkbox', function( editor )
                                                setup : function( element )\r
                                                {\r
                                                        this.setValue(\r
-                                                                       element.getAttribute( '_cke_saved_name' ) ||\r
+                                                                       element.data( 'cke-saved-name' ) ||\r
                                                                        element.getAttribute( 'name' ) ||\r
                                                                        '' );\r
                                                },\r
@@ -63,10 +61,10 @@ CKEDITOR.dialog.add( 'checkbox', function( editor )
 \r
                                                        // IE failed to update 'name' property on input elements, protect it now.\r
                                                        if ( this.getValue() )\r
-                                                               element.setAttribute( '_cke_saved_name', this.getValue() );\r
+                                                               element.data( 'cke-saved-name', this.getValue() );\r
                                                        else\r
                                                        {\r
-                                                               element.removeAttribute( '_cke_saved_name' );\r
+                                                               element.data( 'cke-saved-name', false );\r
                                                                element.removeAttribute( 'name' );\r
                                                        }\r
                                                }\r
@@ -91,7 +89,19 @@ CKEDITOR.dialog.add( 'checkbox', function( editor )
                                                        if ( value && !( CKEDITOR.env.ie && value == 'on' ) )\r
                                                                element.setAttribute( 'value', value );\r
                                                        else\r
-                                                               element.removeAttribute( 'value' );\r
+                                                       {\r
+                                                               if ( CKEDITOR.env.ie )\r
+                                                               {\r
+                                                                       // Remove attribute 'value' of checkbox (#4721).\r
+                                                                       var checkbox = new CKEDITOR.dom.element( 'input', element.getDocument() );\r
+                                                                       element.copyAttributes( checkbox, { value: 1 } );\r
+                                                                       checkbox.replace( element );\r
+                                                                       editor.getSelection().selectElement( checkbox );\r
+                                                                       data.element = checkbox;\r
+                                                               }\r
+                                                               else\r
+                                                                       element.removeAttribute( 'value' );\r
+                                                       }\r
                                                }\r
                                        },\r
                                        {\r
@@ -111,8 +121,8 @@ CKEDITOR.dialog.add( 'checkbox', function( editor )
 \r
                                                        if ( CKEDITOR.env.ie )\r
                                                        {\r
-                                                               var isElementChecked = !!element.getAttribute( 'checked' );\r
-                                                               var isChecked = !!this.getValue();\r
+                                                               var isElementChecked = !!element.getAttribute( 'checked' ),\r
+                                                                       isChecked = !!this.getValue();\r
 \r
                                                                if ( isElementChecked != isChecked )\r
                                                                {\r