From 6bf1a4c7e10c9968d958bb8b3fcd414c27b6739a Mon Sep 17 00:00:00 2001 From: Piotr Jasiun Date: Tue, 13 Aug 2013 14:41:27 +0200 Subject: [PATCH 1/3] Add onClick="return false" to UI button. --- plugins/dialogui/plugin.js | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/dialogui/plugin.js b/plugins/dialogui/plugin.js index b50ba77b76b..6b97fe1157c 100644 --- a/plugins/dialogui/plugin.js +++ b/plugins/dialogui/plugin.js @@ -481,6 +481,7 @@ CKEDITOR.plugins.add( 'dialogui', { CKEDITOR.ui.dialog.uiElement.call( this, dialog, outerDefinition, htmlList, 'a', null, { style: elementDefinition.style, href: 'javascript:void(0)', + onClick: 'return false', // #9958 title: elementDefinition.label, hidefocus: 'true', 'class': elementDefinition[ 'class' ], From 9bbb8a731b867e5b196332f156ba3462c76f516c Mon Sep 17 00:00:00 2001 From: Aleksander Nowodzinski Date: Tue, 27 Aug 2013 13:51:29 +0200 Subject: [PATCH 2/3] Moved the solution to element click listener's callback. --- plugins/dialogui/plugin.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/dialogui/plugin.js b/plugins/dialogui/plugin.js index 6b97fe1157c..55f04e32fe9 100644 --- a/plugins/dialogui/plugin.js +++ b/plugins/dialogui/plugin.js @@ -461,7 +461,11 @@ CKEDITOR.plugins.add( 'dialogui', { var element = this.getElement(); (function() { - element.on( 'click', me.click, me ); + element.on( 'click', function( evt ) { + me.click(); + // #9958 + evt.data.preventDefault(); + } ); element.on( 'keydown', function( evt ) { if ( evt.data.getKeystroke() in { 32:1 } ) { @@ -481,7 +485,6 @@ CKEDITOR.plugins.add( 'dialogui', { CKEDITOR.ui.dialog.uiElement.call( this, dialog, outerDefinition, htmlList, 'a', null, { style: elementDefinition.style, href: 'javascript:void(0)', - onClick: 'return false', // #9958 title: elementDefinition.label, hidefocus: 'true', 'class': elementDefinition[ 'class' ], From 47fd2c070011384f229a64626def719df34f7a52 Mon Sep 17 00:00:00 2001 From: Piotr Jasiun Date: Tue, 27 Aug 2013 15:10:06 +0200 Subject: [PATCH 3/3] Changelog entry. --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 9f2d24d57c0..1ba9b1e7879 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,6 +5,7 @@ CKEditor 4 Changelog * [#9330](http://dev.ckeditor.com/ticket/9330): Fixed pasting anchors from MS Word. * [#8103](http://dev.ckeditor.com/ticket/8103): Fixed pasting nested lists from MS Word. +* [#9958](http://dev.ckeditor.com/ticket/9958): Press ok button will trigger onbeforeunload event in popup-dialog on ie9. * [#10662](http://dev.ckeditor.com/ticket/10662): Fixed styles from Styles drop-down list not registered to the ACF in case when [Shared Spaces plugin](http://ckeditor.com/addon/sharedspace) is used. * [#9654](http://dev.ckeditor.com/ticket/9654): Problems with IE10 Quirks mode. * [#9816](http://dev.ckeditor.com/ticket/9816): Floating toolbar does not reposition vertically in several cases.