Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
ckeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vanilla ckeditor-3.0.2
[ckeditor.git]
/
_source
/
plugins
/
dialogui
/
plugin.js
diff --git
a/_source/plugins/dialogui/plugin.js
b/_source/plugins/dialogui/plugin.js
index
d8b423d
..
4ed3da2
100644
(file)
--- a/
_source/plugins/dialogui/plugin.js
+++ b/
_source/plugins/dialogui/plugin.js
@@
-222,7
+222,10
@@
CKEDITOR.plugins.add( 'dialogui' );
{
\r
if ( evt.data.getKeystroke() == 13 && keyPressedOnMe )
\r
{
\r
{
\r
if ( evt.data.getKeystroke() == 13 && keyPressedOnMe )
\r
{
\r
- dialog.getButton( 'ok' ) && dialog.getButton( 'ok' ).click();
\r
+ dialog.getButton( 'ok' ) && setTimeout( function ()
\r
+ {
\r
+ dialog.getButton( 'ok' ).click();
\r
+ }, 0 );
\r
keyPressedOnMe = false;
\r
}
\r
}, null, null, 1000 );
\r
keyPressedOnMe = false;
\r
}
\r
}, null, null, 1000 );
\r
@@
-597,7
+600,7
@@
CKEDITOR.plugins.add( 'dialogui' );
_.frameId = CKEDITOR.tools.getNextNumber() + '_fileInput';
\r
\r
// Support for custom document.domain in IE.
\r
_.frameId = CKEDITOR.tools.getNextNumber() + '_fileInput';
\r
\r
// Support for custom document.domain in IE.
\r
- var isCustomDomain = CKEDITOR.env.ie && document.domain != window.location.hostname;
\r
+ var isCustomDomain = CKEDITOR.env.isCustomDomain();
\r
\r
var html = [
\r
'<iframe' +
\r
\r
var html = [
\r
'<iframe' +
\r
@@
-838,7
+841,7
@@
CKEDITOR.plugins.add( 'dialogui' );
\r
isVisible : function()
\r
{
\r
\r
isVisible : function()
\r
{
\r
- return !!this.getElement().$.firstChild.offsetHeight;
\r
+ return this.getElement().getFirst().isVisible();
\r
},
\r
\r
isEnabled : function()
\r
},
\r
\r
isEnabled : function()
\r