Index: /CKEditor/branches/versions/3.6.x/CHANGES.html
===================================================================
--- /CKEditor/branches/versions/3.6.x/CHANGES.html (revision 6684)
+++ /CKEditor/branches/versions/3.6.x/CHANGES.html (revision 6685)
@@ -49,5 +49,5 @@
Fixed issues:
-
+ - #6774 : Internal styles aren't included in the contents.css sample.
Index: /CKEditor/branches/versions/3.6.x/_source/plugins/wysiwygarea/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.6.x/_source/plugins/wysiwygarea/plugin.js (revision 6684)
+++ /CKEditor/branches/versions/3.6.x/_source/plugins/wysiwygarea/plugin.js (revision 6685)
@@ -1150,5 +1150,16 @@
// Set the HTML style to 100% to have the text cursor in affect (#6341)
else if ( CKEDITOR.env.gecko )
+ {
editor.addCss( 'html { height: 100% !important; }' );
+ editor.addCss( 'img:-moz-broken { -moz-force-broken-image-icon : 1; width : 24px; height : 24px; }' );
+ }
+
+ /* #3658: [IE6] Editor document has horizontal scrollbar on long lines
+ To prevent this misbehavior, we show the scrollbar always */
+ /* #6341: The text cursor must be set on the editor area. */
+ /* #6632: Avoid having "text" shape of cursor in IE7 scrollbars.*/
+ editor.addCss( 'html { _overflow-y: scroll; cursor: text; *cursor:auto;}' );
+ // Use correct cursor for these elements
+ editor.addCss( 'img, input, textarea { cursor: default;}' );
// Switch on design mode for a short while and close it after then.
Index: /CKEditor/branches/versions/3.6.x/contents.css
===================================================================
--- /CKEditor/branches/versions/3.6.x/contents.css (revision 6684)
+++ /CKEditor/branches/versions/3.6.x/contents.css (revision 6685)
@@ -23,23 +23,2 @@
}
-html
-{
- /* #3658: [IE6] Editor document has horizontal scrollbar on long lines
- To prevent this misbehavior, we show the scrollbar always */
- _overflow-y: scroll;
- /* #6341: The text cursor must be set on the editor area. */
- cursor: text;
- /* #6632: Avoid having "text" shape of cursor in IE7 scrollbars.*/
- *cursor:auto;
-}
-
-img:-moz-broken
-{
- -moz-force-broken-image-icon : 1;
- width : 24px;
- height : 24px;
-}
-img, input, textarea
-{
- cursor: default;
-}