Index: /CKEditor/branches/versions/3.1.x/CHANGES.html =================================================================== --- /CKEditor/branches/versions/3.1.x/CHANGES.html (revision 4313) +++ /CKEditor/branches/versions/3.1.x/CHANGES.html (revision 4314) @@ -69,4 +69,7 @@
  • #4387 : Right clicking in Kama skin can lead to a javascript error.
  • #4397 : Wisiwig mode will cause the host page scroll.
    • +
  • #4385 : Fixed editor's auto adjusting on DOM structure were confusing the dirty checking mechanism.
    • +
  • #4397 : Fixed regression of [3816] where turn on design mode is causing Firefox3 to scroll the host page.
    • +
  • #4254 : Added basic API sample.

    • Index: /CKEditor/branches/versions/3.1.x/_samples/api.html =================================================================== --- /CKEditor/branches/versions/3.1.x/_samples/api.html (revision 4314) +++ /CKEditor/branches/versions/3.1.x/_samples/api.html (revision 4314) @@ -0,0 +1,126 @@ + + + + + API usage - CKEditor Sample + + + + +
    +
    +

    + This sample shows how to use the CKeditor JavaScript API to interact with the editor + at runtime.

    + + +
    + +
    + +
    +
    + + Index: /CKEditor/branches/versions/3.1.x/_samples/index.html =================================================================== --- /CKEditor/branches/versions/3.1.x/_samples/index.html (revision 4313) +++ /CKEditor/branches/versions/3.1.x/_samples/index.html (revision 4314) @@ -34,4 +34,5 @@
  • Replace DIV elements on the fly 
  • Create and destroy editor instances for Ajax applications
    • +
  • Basic usage of the API
  • Using the JavaScript API to customize dialogs
  • Using the "Enter" key in CKEditor
    • Index: /CKEditor/branches/versions/3.1.x/_source/plugins/wysiwygarea/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/wysiwygarea/plugin.js (revision 4313) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/wysiwygarea/plugin.js (revision 4314) @@ -121,4 +121,11 @@ }, 0, this ); } + } + + // DOM modification here should not bother dirty flag.(#4385) + function restoreDirty( editor ) + { + if( !editor.checkDirty() ) + setTimeout( function(){ editor.resetDirty() } ); } @@ -144,4 +151,5 @@ && !path.block ) { + restoreDirty( editor ); var bms = selection.createBookmarks(), fixedBlock = range.fixBlock( true, @@ -194,4 +202,5 @@ if ( lastNode && lastNode.getName && ( lastNode.getName() in nonExitableElementNames ) ) { + restoreDirty( editor ); var paddingBlock = editor.document.createElement( ( CKEDITOR.env.ie && enterMode != CKEDITOR.ENTER_BR ) ? @@ -354,9 +363,5 @@ } else - // Avoid opening design mode in a frame window thread, - // which will cause host page scrolling.(#4397) - setTimeout( function(){ - domDocument.$.designMode = 'on'; - }, 0 ); + domDocument.designMode = 'on'; // IE, Opera and Safari may not support it and throw @@ -367,24 +372,4 @@ domWindow = editor.window = new CKEDITOR.dom.window( domWindow ); domDocument = editor.document = new CKEDITOR.dom.document( domDocument ); - - // Gecko need a key event to 'wake up' the editing - // ability when document is empty.(#3864) - var firstNode = domDocument.getBody().getFirst(); - if ( CKEDITOR.env.gecko - && firstNode && firstNode.is - && firstNode.is( 'br' ) && firstNode.hasAttribute( '_moz_editor_bogus_node' ) ) - { - var keyEventSimulate = domDocument.$.createEvent( "KeyEvents" ); - keyEventSimulate.initKeyEvent( 'keypress', true, true, domWindow.$, false, - false, false, false, 0, 32 ); - domDocument.$.dispatchEvent( keyEventSimulate ); - var bogusText = domDocument.getBody().getFirst() ; - // Compensate the line maintaining
    if enterMode is not block. - if ( editor.config.enterMode == CKEDITOR.ENTER_BR ) - domDocument.createElement( 'br', { attributes: { '_moz_dirty' : "" } } ) - .replace( bogusText ); - else - bogusText.remove(); - } // Gecko/Webkit need some help when selecting control type elements. (#3448) @@ -427,4 +412,30 @@ focusTarget.on( 'focus', function() { + // Gecko need a key event to 'wake up' the editing + // ability when document is empty.(#3864) + if ( CKEDITOR.env.gecko ) + { + var first = body; + while( first.firstChild ) + first = first.firstChild; + + if( !first.nextSibling + && ( 'BR' == first.tagName ) + && first.hasAttribute( '_moz_editor_bogus_node' ) ) + { + var keyEventSimulate = domDocument.$.createEvent( "KeyEvents" ); + keyEventSimulate.initKeyEvent( 'keypress', true, true, domWindow.$, false, + false, false, false, 0, 32 ); + domDocument.$.dispatchEvent( keyEventSimulate ); + var bogusText = domDocument.getBody().getFirst() ; + // Compensate the line maintaining
    if enterMode is not block. + if ( editor.config.enterMode == CKEDITOR.ENTER_BR ) + domDocument.createElement( 'br', { attributes: { '_moz_dirty' : "" } } ) + .replace( bogusText ); + else + bogusText.remove(); + } + } + editor.focusManager.focus(); });