JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
vanilla ckeditor-3.4.2
[ckeditor.git] / _source / plugins / forms / plugin.js
index fcf639c..4668bef 100644 (file)
@@ -27,8 +27,8 @@ CKEDITOR.plugins.add( 'forms',
                                'background-position: center center;' +\r
                                'background-repeat: no-repeat;' +\r
                                'border: 1px solid #a9a9a9;' +\r
-                               'width: 16px;' +\r
-                               'height: 16px;' +\r
+                               'width: 16px !important;' +\r
+                               'height: 16px !important;' +\r
                        '}' );\r
 \r
                // All buttons use the same code to register. So, to avoid\r
@@ -131,13 +131,13 @@ CKEDITOR.plugins.add( 'forms',
                {\r
                        editor.contextMenu.addListener( function( element )\r
                                {\r
-                                       if ( element && element.hasAscendant( 'form', true ) )\r
+                                       if ( element && element.hasAscendant( 'form', true ) && !element.isReadOnly() )\r
                                                return { form : CKEDITOR.TRISTATE_OFF };\r
                                });\r
 \r
                        editor.contextMenu.addListener( function( element )\r
                                {\r
-                                       if ( element )\r
+                                       if ( element && !element.isReadOnly() )\r
                                        {\r
                                                var name = element.getName();\r
 \r
@@ -191,10 +191,13 @@ CKEDITOR.plugins.add( 'forms',
 \r
                                        switch ( type )\r
                                        {\r
-                                               case 'text' : case 'password':\r
+                                               case 'text' :\r
+                                               case 'password' :\r
                                                        evt.data.dialog = 'textfield';\r
                                                        break;\r
-                                               case 'button' : case 'submit' : case 'reset' :\r
+                                               case 'button' :\r
+                                               case 'submit' :\r
+                                               case 'reset' :\r
                                                        evt.data.dialog = 'button';\r
                                                        break;\r
                                                case 'checkbox' :\r