Index: CKEditor/trunk/_source/plugins/dialogui/plugin.js
===================================================================
--- CKEditor/trunk/_source/plugins/dialogui/plugin.js (revision 3260)
+++ CKEditor/trunk/_source/plugins/dialogui/plugin.js (revision 3269)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -642,6 +642,30 @@
{
_.frameId = CKEDITOR.tools.getNextNumber() + '_fileInput';
- var html = [ '' ];
+
+ // Support for custom document.domain in IE.
+ var isCustomDomain = CKEDITOR.env.ie && document.domain != window.location.hostname;
+
+ var html = [
+ '' +
+ '' );
+
return html.join( '' );
};
@@ -1194,6 +1218,6 @@
getInputElement : function()
{
- return new CKEDITOR.dom.element( CKEDITOR.document.getById( this._.frameId )
- .$.contentWindow.document.forms[0].elements[0] );
+ return new CKEDITOR.dom.element(
+ CKEDITOR.document.getById( this._.frameId ).getFrameDocument().$.forms[0].elements[0] );
},
@@ -1218,9 +1242,15 @@
{
var frameElement = CKEDITOR.document.getById( this._.frameId ),
- frameDocument = frameElement.$.contentWindow.document,
+ frameDocument = frameElement.getFrameDocument(),
elementDefinition = this._.definition,
buttons = this._.buttons;
- frameDocument.open();
- frameDocument.write( [ '',
+
+ frameDocument.$.open();
+
+ // Support for custom document.domain in IE.
+ if ( CKEDITOR.env.isCustomDomain() )
+ frameDocument.$.domain = document.domain;
+
+ frameDocument.$.write( [ '',
'