vanilla ckeditor-3.5

[ckeditor.git] / _source / plugins / forms / plugin.js

diff --git a/_source/plugins/forms/plugin.js b/_source/plugins/forms/plugin.js
index daf36c6..b66a31d 100644 (file)
--- a/_source/plugins/forms/plugin.js
+++ b/_source/plugins/forms/plugin.js
@@ -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
@@ -167,7 +167,7 @@ CKEDITOR.plugins.add( 'forms',
                                                                return { imagebutton : CKEDITOR.TRISTATE_OFF };\r
                                                }\r
 \r
-                                               if ( name == 'img' && element.getAttribute( '_cke_real_element_type' ) == 'hiddenfield' )\r
+                                               if ( name == 'img' && element.data( 'cke-real-element-type' ) == 'hiddenfield' )\r
                                                        return { hiddenfield : CKEDITOR.TRISTATE_OFF };\r
                                        }\r
                                });\r
@@ -183,7 +183,7 @@ CKEDITOR.plugins.add( 'forms',
                                        evt.data.dialog = 'select';\r
                                else if ( element.is( 'textarea' ) )\r
                                        evt.data.dialog = 'textarea';\r
-                               else if ( element.is( 'img' ) && element.getAttribute( '_cke_real_element_type' ) == 'hiddenfield' )\r
+                               else if ( element.is( 'img' ) && element.data( 'cke-real-element-type' ) == 'hiddenfield' )\r
                                        evt.data.dialog = 'hiddenfield';\r
                                else if ( element.is( 'input' ) )\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