Index: /CKEditor/branches/versions/3.1.x/CHANGES.html =================================================================== --- /CKEditor/branches/versions/3.1.x/CHANGES.html (revision 4554) +++ /CKEditor/branches/versions/3.1.x/CHANGES.html (revision 4555) @@ -57,4 +57,30 @@

#4625 : Fixed editor stay visible in a div with style 'visibility:hidden'.

#4621 : Fixed clicking below table cause a empty table been generated.

#3373 : Fixed empty context menu when there's no menu item at all.

#4473 : Fixed setting rules on the same element tag name throw error.

#4514 : Fixed press 'Back' button breaks wysiwyg editing mode.

#4542 : Fixed unable to access buttons using tab key in Safari and Opera.

#4577 : Fixed relative link url is broken after opening 'Link' dialog.

#4597 : Fixed custom style with same attribute name but different attribute value doesn't work.

#4651 : Fixed 'Deleted' and 'Inserted' text style is not rendering in wysiwyg mode and is wrong is source mode.

#4654 : Fixed 'CKEDITOR.config.font_defaultLabel(fontSize_defaultLabel)' is not working.

#3950 : Fixed table column insertion incorrect when selecting empty cell area.

#3912 : Fixed UIColor not working in IE when page has more than 30+ editors.

#4031 : Fixed mouse cursor on toolbar combo has more than 3 shapes.

#4041 : Fixed open context menu on multiple cells to remove them result in only one removed.

#4185 : Fixed resize handler effect doesn't affect flash object on output.

#4196 : Fixed 'Remove Numbered/Bulleted List' on nested list doesn't work well on nested list.

#4200 : Fixed unable to insert 'password' type filed with attributes.

#4530 : Fixed context menu couldn't open in Opera.

#4536 : Fixed keyboard navigation doesn't work at all in IE quirks mode.

#4584 : Fixed updated link Target field is not updating when updating to certian values.

#4603 : Fixed unable to disable submenu items in contextmenu.

#4672 : Fixed unable to redo the insertion of horizontal line.

#4677 : Fixed 'Tab' key is trapped by hidden dialog elements.

#4073 : Fixed insert template with replace option could result in empty document.

#4455 : Fixed unable to start editing when image inside document not loaded.

#4517 : Fixed 'dialog_backgroundCoverColor' doesn't work on IE6.

#3165 : Fixed enter key in empty list item before nested one result in collapsed line.

#4527 : Fixed checkbox generate invalid 'checked' attribute.

@@ -66,4 +92,5 @@
#4194 : Added support for using multiple css style sheets within the editor.

#4210 : Introducing the CKEditor plugin for jQuery (the jQuery adapter).
+
#4343 : Added config option 'browserContextMenuOnCtrl' for 'contextmenu' plugin.

Index: /CKEditor/branches/versions/3.1.x/_dev/packager/packagefilegen_full.html =================================================================== --- /CKEditor/branches/versions/3.1.x/_dev/packager/packagefilegen_full.html (revision 4554) +++ /CKEditor/branches/versions/3.1.x/_dev/packager/packagefilegen_full.html (revision 4555) @@ -106,5 +106,5 @@ Editor 1:
- This is some sample text. You are using <a href="http://www.fckeditor.net/">CKEditor</a>. + This is some sample text. You are using <a href="http://ckeditor.com/">CKEditor</a>. '; @@ -480,5 +475,5 @@ // Adds the document body as a context menu target. if ( editor.contextMenu ) - editor.contextMenu.addTarget( domDocument ); + editor.contextMenu.addTarget( domDocument, editor.config.browserContextMenuOnCtrl !== false ); setTimeout( function() @@ -641,4 +636,40 @@ } }); + + // Fixing Firefox 'Back-Forward Cache' break design mode. (#4514) + if( CKEDITOR.env.gecko ) + { + var topWin = window.top; + + ( function () + { + var topBody = topWin.document.body; + + if( !topBody ) + topWin.addEventListener( 'load', arguments.callee, false ); + else + { + topBody.setAttribute( 'onpageshow', topBody.getAttribute( 'onpageshow' ) + + ';event.persisted && CKEDITOR.tools.callFunction(' + + CKEDITOR.tools.addFunction( function() + { + var allInstances = CKEDITOR.instances, + editor, + doc; + for( var i in allInstances ) + { + editor = allInstances[ i ]; + doc = editor.document; + if( doc ) + { + doc.$.designMode = 'off'; + doc.$.designMode = 'on'; + } + } + } ) + ')' ); + } + } )(); + + } })(); Index: /CKEditor/branches/versions/3.1.x/_source/skins/kama/editor.css =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/skins/kama/editor.css (revision 4554) +++ /CKEditor/branches/versions/3.1.x/_source/skins/kama/editor.css (revision 4555) @@ -15,7 +15,11 @@ /* Restore the container visibility / -html .cke_skin_kama, -html.cke_skin_kama_container +html .cke_skin_kama { visibility: inherit; } + +html.cke_skin_kama_container +{ + visibility: visible; +} Index: /CKEditor/branches/versions/3.1.x/_source/skins/kama/skin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/skins/kama/skin.js (revision 4554) +++ /CKEditor/branches/versions/3.1.x/_source/skins/kama/skin.js (revision 4555) @@ -6,5 +6,6 @@ CKEDITOR.skins.add( 'kama', (function() { - var preload = []; + var preload = [], + uiColorStylesheetId = 'cke_ui_color'; if ( CKEDITOR.env.ie && CKEDITOR.env.version < 7 ) @@ -90,10 +91,13 @@ } - function addStylesheet( document ) - { - var node = document.getHead().append( 'style' ); - node.setAttribute( "id", "cke_ui_color" ); - node.setAttribute( "type", "text/css" ); - + function getStylesheet( document ) + { + var node = document.getById( uiColorStylesheetId ); + if( !node ) + { + node = document.getHead().append( 'style' ); + node.setAttribute( "id", uiColorStylesheetId ); + node.setAttribute( "type", "text/css" ); + } return node; } @@ -106,8 +110,4 @@ if ( CKEDITOR.env.webkit ) { - // Truncate manually. - for ( i = 0 ; i < styleNodes[ id ].$.sheet.rules.length ; i++ ) - styleNodes[ id ].$.sheet.removeRule( i ); - for ( i = 0 ; i < styleContent.length ; i++ ) { @@ -126,7 +126,7 @@ if ( CKEDITOR.env.ie ) - styleNodes[ id ].$.styleSheet.cssText = content; + styleNodes[ id ].$.styleSheet.cssText += content; else - styleNodes[ id ].setHtml( content ); + styleNodes[ id ].$.innerHTML += content; } } @@ -147,5 +147,5 @@ { var cssContent, - uiStyle = addStylesheet( CKEDITOR.document ), + uiStyle = getStylesheet( CKEDITOR.document ), cssId = '#cke_' + CKEDITOR.tools.escapeCssSelector( editor.name ); @@ -187,5 +187,5 @@ if ( !iframe.getById( 'cke_ui_color' ) ) { - var node = addStylesheet( iframe ); + var node = getStylesheet( iframe ); uiColorMenus.push( node ); Index: /CKEditor/branches/versions/3.1.x/_source/skins/kama/toolbar.css =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/skins/kama/toolbar.css (revision 4554) +++ /CKEditor/branches/versions/3.1.x/_source/skins/kama/toolbar.css (revision 4555) @@ -389,2 +389,9 @@ } / END IE8 strict button valign correction / + +/ Fix cursor shape consistency on toolbar combos (#4031) / +.cke_skin_kama .cke_browser_ie .cke_rcombo, +.cke_skin_kama .cke_browser_ie .cke_rcombo +{ + cursor: default; +} Index: /CKEditor/branches/versions/3.1.x/_source/skins/office2003/editor.css =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/skins/office2003/editor.css (revision 4554) +++ /CKEditor/branches/versions/3.1.x/_source/skins/office2003/editor.css (revision 4555) @@ -15,7 +15,11 @@ /* Restore the container visibility / -html .cke_skin_office2003, -html.cke_skin_office2003_container +html .cke_skin_office2003 { visibility: inherit; } + +html.cke_skin_office2003_container +{ + visibility: visible; +} Index: /CKEditor/branches/versions/3.1.x/_source/skins/office2003/toolbar.css =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/skins/office2003/toolbar.css (revision 4554) +++ /CKEditor/branches/versions/3.1.x/_source/skins/office2003/toolbar.css (revision 4555) @@ -447,2 +447,9 @@ vertical-align: baseline; } + +/ Fix cursor shape consistency on toolbar combos (#4031) / +.cke_skin_office2003 .cke_browser_ie .cke_rcombo, +.cke_skin_office2003 .cke_browser_ie .cke_rcombo +{ + cursor: default; +} Index: /CKEditor/branches/versions/3.1.x/_source/skins/v2/editor.css =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/skins/v2/editor.css (revision 4554) +++ /CKEditor/branches/versions/3.1.x/_source/skins/v2/editor.css (revision 4555) @@ -15,7 +15,11 @@ /* Restore the container visibility / -html .cke_skin_v2, -html.cke_skin_v2_container +html .cke_skin_v2 { visibility: inherit; } + +html.cke_skin_v2_container +{ + visibility: visible; +} Index: /CKEditor/branches/versions/3.1.x/_source/skins/v2/toolbar.css =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/skins/v2/toolbar.css (revision 4554) +++ /CKEditor/branches/versions/3.1.x/_source/skins/v2/toolbar.css (revision 4555) @@ -404,2 +404,9 @@ vertical-align: baseline; } + +/ Fix cursor shape consistency on toolbar combos (#4031) / +.cke_skin_v2 .cke_browser_ie .cke_rcombo, +.cke_skin_v2 .cke_browser_ie .cke_rcombo +{ + cursor: default; +}