Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html (revision 6999)
+++ /CKEditor/trunk/CHANGES.html (revision 7000)
@@ -93,4 +93,5 @@
#7944 : Enter key should not split or create new paragraphs inside caption elements.
#7639 : [IE9] Browser might crash when an object is selected in the document.
+ #7847 : [IE8] Insert image with non-secure source in a HTTPS page breaks the dialog.
Updated the following language files:
- #7834 : Dutch;
Index: /CKEditor/trunk/_source/core/dom/element.js
===================================================================
--- /CKEditor/trunk/_source/core/dom/element.js (revision 6999)
+++ /CKEditor/trunk/_source/core/dom/element.js (revision 7000)
@@ -1063,4 +1063,16 @@
};
}
+ else if ( CKEDITOR.env.ie8Compat && CKEDITOR.env.secure )
+ {
+ return function( name, value )
+ {
+ // IE8 throws error when setting src attribute to non-ssl value. (#7847)
+ if ( name == 'src' && value.match( /^http:\/\// ) )
+ try { standard.apply( this, arguments ); } catch( e ){}
+ else
+ standard.apply( this, arguments );
+ return this;
+ };
+ }
else
return standard;
Index: /CKEditor/trunk/_source/core/env.js
===================================================================
--- /CKEditor/trunk/_source/core/env.js (revision 6999)
+++ /CKEditor/trunk/_source/core/env.js (revision 7000)
@@ -104,5 +104,14 @@
return domain != hostname &&
domain != ( '[' + hostname + ']' ); // IPv6 IP support (#5434)
- }
+ },
+
+ /**
+ * Indicates that page is running under an encrypted connection.
+ * @returns {Boolean} "true" if the page has an encrypted connection.
+ * @example
+ * if ( CKEDITOR.env.secure )
+ * alert( "I'm in SSL!" );
+ */
+ secure : location.protocol == 'https:'
};