diff options
Diffstat (limited to 'sources/core/scriptloader.js')
-rw-r--r-- | sources/core/scriptloader.js | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sources/core/scriptloader.js b/sources/core/scriptloader.js index 9ad536e..356996f 100644 --- a/sources/core/scriptloader.js +++ b/sources/core/scriptloader.js | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved. | 2 | * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved. |
3 | * For licensing, see LICENSE.md or http://ckeditor.com/license | 3 | * For licensing, see LICENSE.md or http://ckeditor.com/license |
4 | */ | 4 | */ |
5 | 5 | ||
@@ -119,8 +119,8 @@ CKEDITOR.scriptLoader = ( function() { | |||
119 | } ); | 119 | } ); |
120 | 120 | ||
121 | if ( callback ) { | 121 | if ( callback ) { |
122 | if ( CKEDITOR.env.ie && CKEDITOR.env.version < 11 ) { | 122 | // The onload or onerror event does not fire in IE8 and IE9 Quirks Mode (http://dev.ckeditor.com/ticket/14849). |
123 | // FIXME: For IE, we are not able to return false on error (like 404). | 123 | if ( CKEDITOR.env.ie && ( CKEDITOR.env.version <= 8 || CKEDITOR.env.ie9Compat ) ) { |
124 | script.$.onreadystatechange = function() { | 124 | script.$.onreadystatechange = function() { |
125 | if ( script.$.readyState == 'loaded' || script.$.readyState == 'complete' ) { | 125 | if ( script.$.readyState == 'loaded' || script.$.readyState == 'complete' ) { |
126 | script.$.onreadystatechange = null; | 126 | script.$.onreadystatechange = null; |
@@ -130,13 +130,12 @@ CKEDITOR.scriptLoader = ( function() { | |||
130 | } else { | 130 | } else { |
131 | script.$.onload = function() { | 131 | script.$.onload = function() { |
132 | // Some browsers, such as Safari, may call the onLoad function | 132 | // Some browsers, such as Safari, may call the onLoad function |
133 | // immediately. Which will break the loading sequence. (#3661) | 133 | // immediately. Which will break the loading sequence. (http://dev.ckeditor.com/ticket/3661) |
134 | setTimeout( function() { | 134 | setTimeout( function() { |
135 | onLoad( url, true ); | 135 | onLoad( url, true ); |
136 | }, 0 ); | 136 | }, 0 ); |
137 | }; | 137 | }; |
138 | 138 | ||
139 | // FIXME: Opera and Safari will not fire onerror. | ||
140 | script.$.onerror = function() { | 139 | script.$.onerror = function() { |
141 | onLoad( url, false ); | 140 | onLoad( url, false ); |
142 | }; | 141 | }; |