Index: /CKEditor/trunk/_source/plugins/dialogui/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/dialogui/plugin.js (revision 3480)
+++ /CKEditor/trunk/_source/plugins/dialogui/plugin.js (revision 3481)
@@ -1178,6 +1178,8 @@
getInputElement : function()
{
- return new CKEDITOR.dom.element(
- CKEDITOR.document.getById( this._.frameId ).getFrameDocument().$.forms[0].elements[0] );
+ var frameDocument = CKEDITOR.document.getById( this._.frameId ).getFrameDocument();
+ return frameDocument.$.forms.length > 0 ?
+ new CKEDITOR.dom.element( frameDocument.$.forms[0].elements[0] ) :
+ this.getElement();
},
@@ -1206,26 +1208,40 @@
buttons = this._.buttons;
- frameDocument.$.open();
-
- // Support for custom document.domain in IE.
- if ( CKEDITOR.env.isCustomDomain() )
- frameDocument.$.domain = document.domain;
-
- frameDocument.$.write( [ '',
- '',
- '' ].join( '' ) );
-
- frameDocument.$.close();
-
- for ( var i = 0 ; i < buttons.length ; i++ )
- buttons[i].enable();
+ function generateFormField()
+ {
+ frameDocument.$.open();
+
+ // Support for custom document.domain in IE.
+ if ( CKEDITOR.env.isCustomDomain() )
+ frameDocument.$.domain = document.domain;
+
+ frameDocument.$.write( [ '',
+ '',
+ '' ].join( '' ) );
+
+ frameDocument.$.close();
+
+ for ( var i = 0 ; i < buttons.length ; i++ )
+ buttons[i].enable();
+ }
+
+ // #3465: Wait for the browser to finish rendering the dialog first.
+ setTimeout( generateFormField, 500 );
+ },
+
+ getValue : function()
+ {
+ // The file path returned from the input tag is incomplete anyway, so it's
+ // safe to ignore it and prevent the confirmation dialog from appearing.
+ // (Part of #3465)
+ return '';
},