X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fdialogui%2Fplugin.js;h=dbb9bbdb1aeb9eca26adc6b701a940282623793b;hb=941b0a9ba4e673e292510d80a5a86806994b8ea6;hp=d8b423dcb2f96aa9d987c470d76a5d25853f57aa;hpb=ea7e3453c7b0f023b050aca6d9f83ab372860d91;p=ckeditor.git diff --git a/_source/plugins/dialogui/plugin.js b/_source/plugins/dialogui/plugin.js index d8b423d..dbb9bbd 100644 --- a/_source/plugins/dialogui/plugin.js +++ b/_source/plugins/dialogui/plugin.js @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -222,7 +222,10 @@ CKEDITOR.plugins.add( 'dialogui' ); { if ( evt.data.getKeystroke() == 13 && keyPressedOnMe ) { - dialog.getButton( 'ok' ) && dialog.getButton( 'ok' ).click(); + dialog.getButton( 'ok' ) && setTimeout( function () + { + dialog.getButton( 'ok' ).click(); + }, 0 ); keyPressedOnMe = false; } }, null, null, 1000 ); @@ -597,7 +600,7 @@ CKEDITOR.plugins.add( 'dialogui' ); _.frameId = CKEDITOR.tools.getNextNumber() + '_fileInput'; // Support for custom document.domain in IE. - var isCustomDomain = CKEDITOR.env.ie && document.domain != window.location.hostname; + var isCustomDomain = CKEDITOR.env.isCustomDomain(); var html = [ '