Skip to content

Commit e3ee229

Browse files
committed
Merge branch 't/13387'
2 parents 9b8ff65 + a767307 commit e3ee229

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Fixed Issues:
2222
* [#13143](http://dev.ckeditor.com/ticket/13143): [Edge] Fixed: Focus lost while opening the panel.
2323
* [#13494](http://dev.ckeditor.com/ticket/13494): Fixed: Error thrown in toolbar configurator if plugin requirements are unsatisfied.
2424
* [#11376](http://dev.ckeditor.com/ticket/11376): [IE11] Fixed: Loss of text when pasting bullet lists from Microsoft Word.
25+
* [#13387](http://dev.ckeditor.com/ticket/13387): [Edge] Fixed: "Permission denied" error thrown while loading the editor with developer tools open.
2526

2627
## CKEditor 4.5.1
2728

plugins/wysiwygarea/plugin.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,14 @@
2727
// With IE, the custom domain has to be taken care at first,
2828
// for other browers, the 'src' attribute should be left empty to
2929
// trigger iframe's 'load' event.
30-
src = CKEDITOR.env.air ? 'javascript:void(0)' : CKEDITOR.env.ie ? 'javascript:void(function(){' + encodeURIComponent( src ) + '}())' // jshint ignore:line
31-
:
32-
'';
30+
// Microsoft Edge throws "Permission Denied" if treated like an IE (#13441).
31+
if ( CKEDITOR.env.air ) {
32+
src = 'javascript:void(0)'; // jshint ignore:line
33+
} else if ( CKEDITOR.env.ie && !CKEDITOR.env.edge ) {
34+
src = 'javascript:void(function(){' + encodeURIComponent( src ) + '}())'; // jshint ignore:line
35+
} else {
36+
src = '';
37+
}
3338

3439
var iframe = CKEDITOR.dom.element.createFromHtml( '<iframe src="' + src + '" frameBorder="0"></iframe>' );
3540
iframe.setStyles( { width: '100%', height: '100%' } );
@@ -41,7 +46,7 @@
4146

4247
// Asynchronous iframe loading is only required in IE>8 and Gecko (other reasons probably).
4348
// Do not use it on WebKit as it'll break the browser-back navigation.
44-
var useOnloadEvent = CKEDITOR.env.ie || CKEDITOR.env.gecko;
49+
var useOnloadEvent = ( CKEDITOR.env.ie && !CKEDITOR.env.edge ) || CKEDITOR.env.gecko;
4550
if ( useOnloadEvent )
4651
iframe.on( 'load', onLoad );
4752

0 commit comments

Comments
 (0)