Index: /CKEditor/branches/versions/3.0.x/CHANGES.html =================================================================== --- /CKEditor/branches/versions/3.0.x/CHANGES.html (revision 4697) +++ /CKEditor/branches/versions/3.0.x/CHANGES.html (revision 4698) @@ -35,4 +35,76 @@ CKEditor Changelog +

+ CKEditor 3.0.2

+

+ New features:

+ +

+ Fixed issues:

+

CKEditor 3.0.1

Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC.js =================================================================== --- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC.js (revision 4697) +++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC.js (revision 4698) @@ -1,5 +1,5 @@ /** @overview - @date $Date: 2008-08-02 10:25:54 +0200 (So, 02 sie 2008) $ + @date $Date: 2008-08-02 10:25:54 +0200 (Sat, 02 Aug 2008) $ @version $Revision: 668 $ @location $HeadURL: http://jsdoc-toolkit.googlecode.com/svn/tags/jsdoc_toolkit-2.0.2/jsdoc-toolkit/app/lib/JSDOC.js $ Index: /CKEditor/branches/versions/3.0.x/_dev/packager/packagefilegen_full.html =================================================================== --- /CKEditor/branches/versions/3.0.x/_dev/packager/packagefilegen_full.html (revision 4697) +++ /CKEditor/branches/versions/3.0.x/_dev/packager/packagefilegen_full.html (revision 4698) @@ -106,5 +106,5 @@
- + '; @@ -409,4 +412,20 @@ if ( ev.data.getTarget().is( 'input', 'textarea' ) ) ev.data.preventDefault(); + } ); + } + + // IE standard compliant in editing frame doesn't focus the editor when + // clicking outside actual content, manually apply the focus. (#1659) + if( CKEDITOR.env.ie + && domDocument.$.compatMode == 'CSS1Compat' ) + { + var htmlElement = domDocument.getDocumentElement(); + htmlElement.on( 'mousedown', function( evt ) + { + // Setting focus directly on editor doesn't work, we + // have to use here a temporary element to 'redirect' + // the focus. + if ( evt.data.getTarget().equals( htmlElement ) ) + ieFocusGrabber.focus(); } ); } @@ -455,11 +474,11 @@ keystrokeHandler.attach( domDocument ); - // Cancel default action for backspace in IE on control types. (#4047) if ( CKEDITOR.env.ie ) { - editor.on( 'key', function( event ) + // Cancel default action for backspace in IE on control types. (#4047) + domDocument.on( 'keydown', function( evt ) { // Backspace. - var control = event.data.keyCode == 8 + var control = evt.data.getKeystroke() == 8 && editor.getSelection().getSelectedElement(); if ( control ) @@ -470,12 +489,29 @@ control.remove(); editor.fire( 'saveSnapshot' ); - event.cancel(); + evt.cancel(); } } ); + + // PageUp/PageDown scrolling is broken in document + // with standard doctype, manually fix it. (#4736) + if( domDocument.$.compatMode == 'CSS1Compat' ) + { + var pageUpDownKeys = { 33 : 1, 34 : 1 }; + domDocument.on( 'keydown', function( evt ) + { + if( evt.data.getKeystroke() in pageUpDownKeys ) + { + setTimeout( function () + { + editor.getSelection().scrollIntoView(); + }, 0 ); + } + } ); + } } // 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() @@ -636,6 +672,58 @@ editor.on( 'selectionChange', onSelectionChangeFixBody, null, null, 1 ); }); + + // Create an invisible element to grab focus. + if( CKEDITOR.env.ie ) + { + var ieFocusGrabber; + editor.on( 'uiReady', function() + { + ieFocusGrabber = editor.container.append( CKEDITOR.dom.element.createFromHtml( + '' ) ); + + ieFocusGrabber.on( 'focus', function() + { + editor.focus(); + } ); + } ); + } } }); + + // 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.0.x/_source/skins/kama/dialog.css =================================================================== --- /CKEditor/branches/versions/3.0.x/_source/skins/kama/dialog.css (revision 4697) +++ /CKEditor/branches/versions/3.0.x/_source/skins/kama/dialog.css (revision 4698) @@ -8,4 +8,10 @@ { visibility: visible; +} + +/* Force Gecko to consider table as positioned */ +.cke_skin_kama table.cke_dialog.cke_browser_gecko +{ + display:block; } @@ -19,4 +25,9 @@ -webkit-border-radius: 5px; border-radius: 5px; + + /* 'cke_dialog' element has been fixed positioned in all but IE6, while we + need it to be positioned to hold e.g. close button. */ + position: relative; + _position: static; } @@ -728,4 +739,10 @@ top: 3px; } +.cke_skin_kama .cke_hc a.cke_btn_locked, +.cke_skin_kama .cke_hc a.cke_btn_unlocked, +.cke_skin_kama .cke_hc a.cke_btn_reset +{ + border-style: solid; +} .cke_skin_kama a.cke_smile img Index: /CKEditor/branches/versions/3.0.x/_source/skins/kama/editor.css =================================================================== --- /CKEditor/branches/versions/3.0.x/_source/skins/kama/editor.css (revision 4697) +++ /CKEditor/branches/versions/3.0.x/_source/skins/kama/editor.css (revision 4698) @@ -15,5 +15,9 @@ /* Restore the container visibility */ -html .cke_skin_kama, +html .cke_skin_kama +{ + visibility: inherit; +} + html.cke_skin_kama_container { Index: /CKEditor/branches/versions/3.0.x/_source/skins/kama/mainui.css =================================================================== --- /CKEditor/branches/versions/3.0.x/_source/skins/kama/mainui.css (revision 4697) +++ /CKEditor/branches/versions/3.0.x/_source/skins/kama/mainui.css (revision 4698) @@ -7,5 +7,4 @@ { display: block; - _display: inline-block; } Index: /CKEditor/branches/versions/3.0.x/_source/skins/kama/skin.js =================================================================== --- /CKEditor/branches/versions/3.0.x/_source/skins/kama/skin.js (revision 4697) +++ /CKEditor/branches/versions/3.0.x/_source/skins/kama/skin.js (revision 4698) @@ -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,6 +147,6 @@ { var cssContent, - uiStyle = addStylesheet( CKEDITOR.document ), - cssId = '#cke_' + editor.name.replace('.', '\\.'); + uiStyle = getStylesheet( CKEDITOR.document ), + cssId = '#cke_' + CKEDITOR.tools.escapeCssSelector( editor.name ); var cssSelectors = @@ -187,5 +187,5 @@ if ( !iframe.getById( 'cke_ui_color' ) ) { - var node = addStylesheet( iframe ); + var node = getStylesheet( iframe ); uiColorMenus.push( node ); @@ -212,6 +212,5 @@ height = data.height, dialog = data.dialog, - contents = dialog.parts.contents, - standardsMode = !CKEDITOR.env.quirks; + contents = dialog.parts.contents; if ( data.skin != 'kama' ) @@ -219,26 +218,14 @@ contents.setStyles( - ( CKEDITOR.env.ie || ( CKEDITOR.env.gecko && CKEDITOR.env.version < 10900 ) ) ? // IE && FF2 - { - width : width + 'px', - height : height + 'px' - } - : - { - // To avoid having scrollbars in the dialogs, we're - // (for now) using the "min-xxx" properties, for - // browsers which well support it (#3878). - 'min-width' : width + 'px', - 'min-height' : height + 'px' - }); - - if ( !CKEDITOR.env.ie ) - return; + { + width : width + 'px', + height : height + 'px' + }); // Fix the size of the elements which have flexible lengths. setTimeout( function() { - var body = contents.getParent(), - innerDialog = body.getParent(); + var innerDialog = dialog.parts.dialog.getChild( [ 0, 0, 0 ] ), + body = innerDialog.getChild( 0 ); // tc Index: /CKEditor/branches/versions/3.0.x/_source/skins/kama/toolbar.css =================================================================== --- /CKEditor/branches/versions/3.0.x/_source/skins/kama/toolbar.css (revision 4697) +++ /CKEditor/branches/versions/3.0.x/_source/skins/kama/toolbar.css (revision 4698) @@ -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.0.x/_source/skins/office2003/dialog.css =================================================================== --- /CKEditor/branches/versions/3.0.x/_source/skins/office2003/dialog.css (revision 4697) +++ /CKEditor/branches/versions/3.0.x/_source/skins/office2003/dialog.css (revision 4698) @@ -10,4 +10,10 @@ } +/* Force Gecko to consider table as positioned */ +.cke_skin_office2003 table.cke_dialog.cke_browser_gecko +{ + display:block; +} + .cke_skin_office2003 .cke_dialog_body { @@ -16,6 +22,10 @@ margin-top: 2px; margin-bottom: 20px; + z-index: 1; + + /* 'cke_dialog' element has been fixed positioned in all but IE6, while we + need it to be positioned to hold e.g. close button. */ position: relative; - z-index: 1; + _position: static; } @@ -642,2 +652,9 @@ top: 3px; } + +.cke_skin_office2003 .cke_hc a.cke_btn_locked, +.cke_skin_office2003 .cke_hc a.cke_btn_unlocked, +.cke_skin_office2003 .cke_hc a.cke_btn_reset +{ + border-style: solid; +} Index: /CKEditor/branches/versions/3.0.x/_source/skins/office2003/editor.css =================================================================== --- /CKEditor/branches/versions/3.0.x/_source/skins/office2003/editor.css (revision 4697) +++ /CKEditor/branches/versions/3.0.x/_source/skins/office2003/editor.css (revision 4698) @@ -15,5 +15,9 @@ /* Restore the container visibility */ -html .cke_skin_office2003, +html .cke_skin_office2003 +{ + visibility: inherit; +} + html.cke_skin_office2003_container { Index: /CKEditor/branches/versions/3.0.x/_source/skins/office2003/skin.js =================================================================== --- /CKEditor/branches/versions/3.0.x/_source/skins/office2003/skin.js (revision 4697) +++ /CKEditor/branches/versions/3.0.x/_source/skins/office2003/skin.js (revision 4698) @@ -32,10 +32,10 @@ height = data.height, dialog = data.dialog, - standardsMode = !CKEDITOR.env.quirk; + contents = dialog.parts.contents; if ( data.skin != 'office2003' ) return; - dialog.parts.contents.setStyles( + contents.setStyles( { width : width + 'px', @@ -49,7 +49,6 @@ var fixSize = function() { - var content = dialog.parts.contents, - body = content.getParent(), - innerDialog = body.getParent(); + var innerDialog = dialog.parts.dialog.getChild( [ 0, 0, 0 ] ), + body = innerDialog.getChild( 0 ); // tc Index: /CKEditor/branches/versions/3.0.x/_source/skins/office2003/toolbar.css =================================================================== --- /CKEditor/branches/versions/3.0.x/_source/skins/office2003/toolbar.css (revision 4697) +++ /CKEditor/branches/versions/3.0.x/_source/skins/office2003/toolbar.css (revision 4698) @@ -447,2 +447,14 @@ vertical-align: baseline; } + +/* Separator + Combo penetrate toolbar in IE quirks. (#4461) */ +.cke_skin_office2003 .cke_browser_iequirks .cke_separator +{ + vertical-align: text-bottom; +} +/* 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.0.x/_source/skins/v2/dialog.css =================================================================== --- /CKEditor/branches/versions/3.0.x/_source/skins/v2/dialog.css (revision 4697) +++ /CKEditor/branches/versions/3.0.x/_source/skins/v2/dialog.css (revision 4698) @@ -10,4 +10,10 @@ } +/* Force Gecko to consider table as positioned */ +.cke_skin_v2 table.cke_dialog.cke_browser_gecko +{ + display:block; +} + .cke_skin_v2 .cke_dialog_body { @@ -16,6 +22,11 @@ margin-top: 2px; margin-bottom: 20px; + z-index: 1; + + /* 'cke_dialog' element has been fixed positioned in all but IE6, while we + need it to be positioned to hold e.g. close button. */ position: relative; - z-index: 1; + _position: static; + } @@ -639,4 +650,10 @@ top: 3px; } +.cke_skin_v2 .cke_hc a.cke_btn_locked, +.cke_skin_v2 .cke_hc a.cke_btn_unlocked, +.cke_skin_v2 .cke_hc a.cke_btn_reset +{ + border-style: solid; +} .cke_skin_v2 a.cke_smile img Index: /CKEditor/branches/versions/3.0.x/_source/skins/v2/editor.css =================================================================== --- /CKEditor/branches/versions/3.0.x/_source/skins/v2/editor.css (revision 4697) +++ /CKEditor/branches/versions/3.0.x/_source/skins/v2/editor.css (revision 4698) @@ -15,5 +15,9 @@ /* Restore the container visibility */ -html .cke_skin_v2, +html .cke_skin_v2 +{ + visibility: inherit; +} + html.cke_skin_v2_container { Index: /CKEditor/branches/versions/3.0.x/_source/skins/v2/skin.js =================================================================== --- /CKEditor/branches/versions/3.0.x/_source/skins/v2/skin.js (revision 4697) +++ /CKEditor/branches/versions/3.0.x/_source/skins/v2/skin.js (revision 4698) @@ -32,10 +32,10 @@ height = data.height, dialog = data.dialog, - standardsMode = !CKEDITOR.env.quirk; + contents = dialog.parts.contents; if ( data.skin != 'v2' ) return; - dialog.parts.contents.setStyles( + contents.setStyles( { width : width + 'px', @@ -49,7 +49,6 @@ setTimeout( function() { - var content = dialog.parts.contents, - body = content.getParent(), - innerDialog = body.getParent(); + var innerDialog = dialog.parts.dialog.getChild( [ 0, 0, 0 ] ), + body = innerDialog.getChild( 0 ); // tc Index: /CKEditor/branches/versions/3.0.x/_source/skins/v2/toolbar.css =================================================================== --- /CKEditor/branches/versions/3.0.x/_source/skins/v2/toolbar.css (revision 4697) +++ /CKEditor/branches/versions/3.0.x/_source/skins/v2/toolbar.css (revision 4698) @@ -97,5 +97,5 @@ float: left; border-left: solid 1px #999; - margin: 0 2px; + margin: 4px 2px; height: 16px; } @@ -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; +} Index: /CKEditor/branches/versions/3.0.x/_source/themes/default/theme.js =================================================================== --- /CKEditor/branches/versions/3.0.x/_source/themes/default/theme.js (revision 4697) +++ /CKEditor/branches/versions/3.0.x/_source/themes/default/theme.js (revision 4698) @@ -103,7 +103,7 @@ ' lang="', editor.langCode, '"' + '>' + - - '
' + + '' + '
' + '
' + @@ -112,5 +112,7 @@ '
' + '
' + - '
' + + '' + + '' + + '
' + '
' + '
' + @@ -123,5 +125,6 @@ '
' + '
' + - '', + '' + + '', //Hide the container when loading skins, later restored by skin css. @@ -133,9 +136,11 @@ .replace( /%/g, 'cke_dialog_' ) ); - var body = element.getChild( [ 0, 0 ] ); + var body = element.getChild( [ 0, 0, 0, 0, 0 ] ), + title = body.getChild( 0 ), + close = body.getChild( 1 ); // Make the Title and Close Button unselectable. - body.getChild( 0 ).unselectable(); - body.getChild( 1 ).unselectable(); + title.unselectable(); + close.unselectable(); @@ -145,8 +150,8 @@ { dialog : element.getChild( 0 ), - title : body.getChild( 0 ), - close : body.getChild( 1 ), + title : title, + close : close, tabs : body.getChild( 2 ), - contents : body.getChild( 3 ), + contents : body.getChild( [ 3, 0, 0, 0 ] ), footer : body.getChild( 4 ) } @@ -156,6 +161,5 @@ destroy : function( editor ) { - var container = editor.container, - panels = editor.panels; + var container = editor.container; /* @@ -184,7 +188,4 @@ container.remove(); - for( var i = 0 ; panels && i < panels.length ; i++ ) - panels[ i ].remove(); - if ( editor.elementMode == CKEDITOR.ELEMENT_MODE_REPLACE ) {