Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html (revision 4966)
+++ /CKEditor/trunk/CHANGES.html (revision 4967)
@@ -56,4 +56,5 @@
#4632 : The print command will now properly break on the insertion point of page break for printing.
#4862 : Corrected English (United Kingdom) locale as en-gb.
+ #4618 : Selecting an emoticon or the lock and reset buttons in the image dialog fired the onBeforeUnload event in IE.
Index: /CKEditor/trunk/_source/plugins/image/dialogs/image.js
===================================================================
--- /CKEditor/trunk/_source/plugins/image/dialogs/image.js (revision 4966)
+++ /CKEditor/trunk/_source/plugins/image/dialogs/image.js (revision 4967)
@@ -717,7 +717,8 @@
if ( resetButton )
{
- resetButton.on( 'click', function()
+ resetButton.on( 'click', function(evt)
{
resetSize( this );
+ evt.data.preventDefault();
}, this.getDialog() );
resetButton.on( 'mouseover', function()
@@ -733,5 +734,5 @@
if ( ratioButton )
{
- ratioButton.on( 'click', function()
+ ratioButton.on( 'click', function(evt)
{
var locked = switchLockRatio( this ),
@@ -748,4 +749,5 @@
}
}
+ evt.data.preventDefault();
}, this.getDialog() );
ratioButton.on( 'mouseover', function()
Index: /CKEditor/trunk/_source/plugins/smiley/dialogs/smiley.js
===================================================================
--- /CKEditor/trunk/_source/plugins/smiley/dialogs/smiley.js (revision 4966)
+++ /CKEditor/trunk/_source/plugins/smiley/dialogs/smiley.js (revision 4967)
@@ -45,4 +45,5 @@
dialog.hide();
+ evt.data.preventDefault();
};