X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fwysiwygarea%2Fplugin.js;h=df2fd07968a1d1aa33943449699d529fe3cf0f6c;hb=614511639979907ceb0da3614122a4d8eb963ad4;hp=11fd76eb32f24108b9fcfd03ab6f95e94fb58a04;hpb=c6e377a02b54abc07129d72b632763c727476a15;p=ckeditor.git diff --git a/_source/plugins/wysiwygarea/plugin.js b/_source/plugins/wysiwygarea/plugin.js index 11fd76e..df2fd07 100644 --- a/_source/plugins/wysiwygarea/plugin.js +++ b/_source/plugins/wysiwygarea/plugin.js @@ -14,17 +14,37 @@ For licensing, see LICENSE.html or http://ckeditor.com/license var nonExitableElementNames = { table:1,pre:1 }; // Matching an empty paragraph at the end of document. - var emptyParagraphRegexp = /\s*<(p|div|address|h\d|center)[^>]*>\s*(?:]*>| |\u00A0| )?\s*(:?<\/\1>)?\s*(?=$|<\/body>)/gi; + var emptyParagraphRegexp = /(^|]*>)\s*<(p|div|address|h\d|center)[^>]*>\s*(?:]*>| |\u00A0| )?\s*(:?<\/\2>)?\s*(?=$|<\/body>)/gi; + + var notWhitespaceEval = CKEDITOR.dom.walker.whitespaces( true ); + + // Elements that could have empty new line around, including table, pre-formatted block, hr, page-break. (#6554) + function nonExitable( element ) + { + return ( element.getName() in nonExitableElementNames ) + || element.isBlockBoundary() && CKEDITOR.dtd.$empty[ element.getName() ]; + } + + function checkReadOnly( selection ) + { + if ( selection.getType() == CKEDITOR.SELECTION_ELEMENT ) + return selection.getSelectedElement().isReadOnly(); + else + return selection.getCommonAncestor().isReadOnly(); + } function onInsertHtml( evt ) { if ( this.mode == 'wysiwyg' ) { this.focus(); - this.fire( 'saveSnapshot' ); - var selection = this.getSelection(), - data = evt.data; + var selection = this.getSelection(); + if ( checkReadOnly( selection ) ) + return; + + var data = evt.data; + this.fire( 'saveSnapshot' ); if ( this.dataProcessor ) data = this.dataProcessor.toHtml( data ); @@ -37,9 +57,34 @@ For licensing, see LICENSE.html or http://ckeditor.com/license selection.unlock(); var $sel = selection.getNative(); + + // Delete control selections to avoid IE bugs on pasteHTML. if ( $sel.type == 'Control' ) $sel.clear(); - $sel.createRange().pasteHTML( data ); + else if ( selection.getType() == CKEDITOR.SELECTION_TEXT ) + { + // Due to IE bugs on handling contenteditable=false blocks + // (#6005), we need to make some checks and eventually + // delete the selection first. + + var range = selection.getRanges()[0], + endContainer = range && range.endContainer; + + if ( endContainer && + endContainer.type == CKEDITOR.NODE_ELEMENT && + endContainer.getAttribute( 'contenteditable' ) == 'false' && + range.checkBoundaryOfElement( endContainer, CKEDITOR.END ) ) + { + range.setEndAfter( range.endContainer ); + range.deleteContents(); + } + } + + try + { + $sel.createRange().pasteHTML( data ); + } + catch (e) {} if ( selIsLocked ) this.getSelection().lock(); @@ -47,6 +92,16 @@ For licensing, see LICENSE.html or http://ckeditor.com/license else this.document.$.execCommand( 'inserthtml', false, data ); + // Webkit does not scroll to the cursor position after pasting (#5558) + if ( CKEDITOR.env.webkit ) + { + this.document.$.execCommand( 'inserthtml', false, '' ); + var marker = this.document.getById( 'cke_paste_marker' ); + marker.scrollIntoView(); + marker.remove(); + marker = null; + } + CKEDITOR.tools.setTimeout( function() { this.fire( 'saveSnapshot' ); @@ -59,15 +114,18 @@ For licensing, see LICENSE.html or http://ckeditor.com/license if ( this.mode == 'wysiwyg' ) { this.focus(); + + var selection = this.getSelection(); + if ( checkReadOnly( selection ) ) + return; + this.fire( 'saveSnapshot' ); - var element = evt.data, + var ranges = selection.getRanges(), + element = evt.data, elementName = element.getName(), isBlock = CKEDITOR.dtd.$block[ elementName ]; - var selection = this.getSelection(), - ranges = selection.getRanges(); - var selIsLocked = selection.isLocked; if ( selIsLocked ) @@ -82,14 +140,14 @@ For licensing, see LICENSE.html or http://ckeditor.com/license // Remove the original contents. range.deleteContents(); - clone = !i && element || element.clone( true ); + clone = !i && element || element.clone( 1 ); // If we're inserting a block at dtd-violated position, split // the parent blocks until we reach blockLimit. var current, dtd; if ( isBlock ) { - while ( ( current = range.getCommonAncestor( false, true ) ) + while ( ( current = range.getCommonAncestor( 0, 1 ) ) && ( dtd = CKEDITOR.dtd[ current.getName() ] ) && !( dtd && dtd [ elementName ] ) ) { @@ -121,9 +179,17 @@ For licensing, see LICENSE.html or http://ckeditor.com/license range.moveToPosition( lastElement, CKEDITOR.POSITION_AFTER_END ); - var next = lastElement.getNextSourceNode( true ); - if ( next && next.type == CKEDITOR.NODE_ELEMENT ) - range.moveToElementEditStart( next ); + // If we're inserting a block element immediatelly followed by + // another block element, the selection must move there. (#3100,#5436) + if ( isBlock ) + { + var next = lastElement.getNext( notWhitespaceEval ), + nextName = next && next.type == CKEDITOR.NODE_ELEMENT && next.getName(); + + // Check if it's a block element that accepts text. + if ( nextName && CKEDITOR.dtd.$block[ nextName ] && CKEDITOR.dtd[ nextName ]['#'] ) + range.moveToElementEditStart( next ); + } selection.selectRanges( [ range ] ); @@ -144,7 +210,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license function restoreDirty( editor ) { if ( !editor.checkDirty() ) - setTimeout( function(){ editor.resetDirty(); } ); + setTimeout( function(){ editor.resetDirty(); }, 0 ); } var isNotWhitespace = CKEDITOR.dom.walker.whitespaces( true ), @@ -161,6 +227,59 @@ For licensing, see LICENSE.html or http://ckeditor.com/license && CKEDITOR.tools.trim( node.getText() ).match( /^(?: |\xa0)$/ ); } + function restoreSelection( selection ) + { + if ( selection.isLocked ) + { + selection.unlock(); + setTimeout( function() { selection.lock(); }, 0 ); + } + } + + function isBlankParagraph( block ) + { + return block.getOuterHtml().match( emptyParagraphRegexp ); + } + + isNotWhitespace = CKEDITOR.dom.walker.whitespaces( true ); + + // Gecko need a key event to 'wake up' the editing + // ability when document is empty.(#3864, #5781) + function activateEditing( editor ) + { + var win = editor.window, + doc = editor.document, + body = editor.document.getBody(), + bodyChildsNum = body.getChildren().count(); + + if ( !bodyChildsNum || ( bodyChildsNum == 1&& body.getFirst().hasAttribute( '_moz_editor_bogus_node' ) ) ) + { + restoreDirty( editor ); + + // Memorize scroll position to restore it later (#4472). + var hostDocument = editor.element.getDocument(); + var hostDocumentElement = hostDocument.getDocumentElement(); + var scrollTop = hostDocumentElement.$.scrollTop; + var scrollLeft = hostDocumentElement.$.scrollLeft; + + // Simulating keyboard character input by dispatching a keydown of white-space text. + var keyEventSimulate = doc.$.createEvent( "KeyEvents" ); + keyEventSimulate.initKeyEvent( 'keypress', true, true, win.$, false, + false, false, false, 0, 32 ); + doc.$.dispatchEvent( keyEventSimulate ); + + if ( scrollTop != hostDocumentElement.$.scrollTop || scrollLeft != hostDocumentElement.$.scrollLeft ) + hostDocument.getWindow().$.scrollTo( scrollLeft, scrollTop ); + + // Restore the original document status by placing the cursor before a bogus br created (#5021). + bodyChildsNum && body.getFirst().remove(); + doc.getBody().appendBogus(); + var nativeRange = new CKEDITOR.dom.range( doc ); + nativeRange.setStartAt( body , CKEDITOR.POSITION_AFTER_START ); + nativeRange.select(); + } + } + /** * Auto-fixing block-less content by wrapping paragraph (#3190), prevent * non-exitable-block by padding extra br.(#3189) @@ -175,6 +294,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license body = editor.document.getBody(), enterMode = editor.config.enterMode; + CKEDITOR.env.gecko && activateEditing( editor ); + // When enterMode set to block, we'll establing new paragraph only if we're // selecting inline contents right under body. (#3657) if ( enterMode != CKEDITOR.ENTER_BR @@ -182,7 +303,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license && blockLimit.getName() == 'body' && !path.block ) { + editor.fire( 'updateSnapshot' ); restoreDirty( editor ); + CKEDITOR.env.ie && restoreSelection( selection ); + var fixedBlock = range.fixBlock( true, editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p' ); @@ -193,23 +317,29 @@ For licensing, see LICENSE.html or http://ckeditor.com/license first && isNbsp( first ) && first.remove(); } - // If the fixed block is blank and already followed by a exitable - // block, we should revert the fix. (#3684) - if ( fixedBlock.getOuterHtml().match( emptyParagraphRegexp ) ) + // If the fixed block is actually blank and is already followed by an exitable blank + // block, we should revert the fix and move into the existed one. (#3684) + if ( isBlankParagraph( fixedBlock ) ) { - var previousElement = fixedBlock.getPrevious( isNotWhitespace ), - nextElement = fixedBlock.getNext( isNotWhitespace ); - - - if ( previousElement && previousElement.getName - && !( previousElement.getName() in nonExitableElementNames ) - && range.moveToElementEditStart( previousElement ) - || nextElement && nextElement.getName - && !( nextElement.getName() in nonExitableElementNames ) - && range.moveToElementEditStart( nextElement ) ) + var element = fixedBlock.getNext( isNotWhitespace ); + if ( element && + element.type == CKEDITOR.NODE_ELEMENT && + !nonExitable( element ) ) { + range.moveToElementEditStart( element ); fixedBlock.remove(); } + else + { + element = fixedBlock.getPrevious( isNotWhitespace ); + if ( element && + element.type == CKEDITOR.NODE_ELEMENT && + !nonExitable( element ) ) + { + range.moveToElementEditEnd( element ); + fixedBlock.remove(); + } + } } range.select(); @@ -221,14 +351,32 @@ For licensing, see LICENSE.html or http://ckeditor.com/license // All browsers are incapable to moving cursor out of certain non-exitable // blocks (e.g. table, list, pre) at the end of document, make this happen by // place a bogus node there, which would be later removed by dataprocessor. - var lastNode = body.getLast( CKEDITOR.dom.walker.whitespaces( true ) ); - if ( lastNode && lastNode.getName && ( lastNode.getName() in nonExitableElementNames ) ) + var walkerRange = new CKEDITOR.dom.range( editor.document ), + walker = new CKEDITOR.dom.walker( walkerRange ); + walkerRange.selectNodeContents( body ); + walker.evaluator = function( node ) + { + return node.type == CKEDITOR.NODE_ELEMENT && ( node.getName() in nonExitableElementNames ); + }; + walker.guard = function( node, isMoveout ) + { + return !( ( node.type == CKEDITOR.NODE_TEXT && isNotWhitespace( node ) ) || isMoveout ); + }; + + if ( walker.previous() ) { + editor.fire( 'updateSnapshot' ); restoreDirty( editor ); - if ( !CKEDITOR.env.ie ) - body.appendBogus(); + CKEDITOR.env.ie && restoreSelection( selection ); + + var paddingBlock; + if ( enterMode != CKEDITOR.ENTER_BR ) + paddingBlock = body.append( new CKEDITOR.dom.element( enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) ); else - body.append( editor.document.createText( '\xa0' ) ); + paddingBlock = body; + + if ( !CKEDITOR.env.ie ) + paddingBlock.appendBogus(); } } @@ -241,16 +389,19 @@ For licensing, see LICENSE.html or http://ckeditor.com/license var fixForBody = ( editor.config.enterMode != CKEDITOR.ENTER_BR ) ? editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p' : false; + var frameLabel = editor.lang.editorTitle.replace( '%1', editor.name ); + + var contentDomReadyHandler; editor.on( 'editingBlockReady', function() { var mainElement, - fieldset, iframe, isLoadingData, isPendingFocus, frameLoaded, fireMode; + // Support for custom document.domain in IE. var isCustomDomain = CKEDITOR.env.isCustomDomain(); @@ -259,99 +410,94 @@ For licensing, see LICENSE.html or http://ckeditor.com/license { if ( iframe ) iframe.remove(); - if ( fieldset ) - fieldset.remove(); - frameLoaded = 0; + + var srcScript = + 'document.open();' + + + // The document domain must be set any time we + // call document.open(). + ( isCustomDomain ? ( 'document.domain="' + document.domain + '";' ) : '' ) + + + 'document.close();'; iframe = CKEDITOR.dom.element.createFromHtml( '' ); - // Register onLoad event for iframe element, which - // will fill it with content and set custom domain. - iframe.on( 'load', function( e ) - { - e.removeListener(); - var doc = iframe.getFrameDocument().$; + // Running inside of Firefox chrome the load event doesn't bubble like in a normal page (#5689) + if ( document.location.protocol == 'chrome:' ) + CKEDITOR.event.useCapture = true; - // Custom domain handling is needed after each document.open(). - doc.open(); - if ( isCustomDomain ) - doc.domain = document.domain; - doc.write( data ); - doc.close(); + // With FF, it's better to load the data on iframe.load. (#3894,#4058) + iframe.on( 'load', function( ev ) + { + frameLoaded = 1; + ev.removeListener(); - } ); + var doc = iframe.getFrameDocument().$; - var accTitle = editor.lang.editorTitle.replace( '%1', editor.name ); + // Don't leave any history log in IE. (#5657) + doc.open( "text/html","replace" ); + doc.write( data ); + doc.close(); + }); - if ( CKEDITOR.env.gecko ) - { - // Accessibility attributes for Firefox. - mainElement.setAttributes( - { - role : 'region', - title : accTitle - } ); - iframe.setAttributes( - { - role : 'region', - title : ' ' - } ); - } - else if ( CKEDITOR.env.webkit ) + // Reset adjustment back to default (#5689) + if ( document.location.protocol == 'chrome:' ) + CKEDITOR.event.useCapture = false; + + // The container must be visible when creating the iframe in FF (#5956) + var element = editor.element, + isHidden = CKEDITOR.env.gecko && !element.isVisible(), + previousStyles = {}; + if ( isHidden ) { - iframe.setAttribute( 'title', accTitle ); // Safari 4 - iframe.setAttribute( 'name', accTitle ); // Safari 3 + element.show(); + previousStyles = { + position : element.getStyle( 'position' ), + top : element.getStyle( 'top' ) + }; + element.setStyles( { position : 'absolute', top : '-3000px' } ); } - else if ( CKEDITOR.env.ie ) + + mainElement.append( iframe ); + + if ( isHidden ) { - // Accessibility label for IE. - fieldset = CKEDITOR.dom.element.createFromHtml( - '
' + - '' + - CKEDITOR.tools.htmlEncode( accTitle ) + - '' + - '
' - , CKEDITOR.document ); - iframe.appendTo( fieldset ); - fieldset.appendTo( mainElement ); + setTimeout( function() + { + element.hide(); + element.setStyles( previousStyles ); + }, 1000 ); } - - if ( !CKEDITOR.env.ie ) - mainElement.append( iframe ); }; // The script that launches the bootstrap logic on 'domReady', so the document // is fully editable even before the editing iframe is fully loaded (#4455). + contentDomReadyHandler = CKEDITOR.tools.addFunction( contentDomReady ); var activationScript = ''; // Editing area bootstrap code. - var contentDomReady = function( domWindow ) + function contentDomReady( domWindow ) { - if ( frameLoaded ) + if ( !frameLoaded ) return; + frameLoaded = 0; - frameLoaded = 1; + editor.fire( 'ariaWidget', iframe ); var domDocument = domWindow.document, body = domDocument.body; @@ -360,8 +506,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license var script = domDocument.getElementById( "cke_actscrpt" ); script.parentNode.removeChild( script ); - delete CKEDITOR._[ 'contentDomReady' + editor.name ]; - body.spellcheck = !editor.config.disableNativeSpellChecker; if ( CKEDITOR.env.ie ) @@ -376,18 +520,37 @@ For licensing, see LICENSE.html or http://ckeditor.com/license body.removeAttribute( 'disabled' ); } else - domDocument.designMode = 'on'; + { + // Avoid opening design mode in a frame window thread, + // which will cause host page scrolling.(#4397) + setTimeout( function() + { + // Prefer 'contentEditable' instead of 'designMode'. (#3593) + if ( CKEDITOR.env.gecko && CKEDITOR.env.version >= 10900 + || CKEDITOR.env.opera ) + domDocument.$.body.contentEditable = true; + else if ( CKEDITOR.env.webkit ) + domDocument.$.body.parentNode.contentEditable = true; + else + domDocument.$.designMode = 'on'; + }, 0 ); + } - // IE, Opera and Safari may not support it and throw - // errors. - try { domDocument.execCommand( 'enableObjectResizing', false, !editor.config.disableObjectResizing ) ; } catch(e) {} - try { domDocument.execCommand( 'enableInlineTableEditing', false, !editor.config.disableNativeTableHandles ) ; } catch(e) {} + CKEDITOR.env.gecko && CKEDITOR.tools.setTimeout( activateEditing, 0, null, editor ); - domWindow = editor.window = new CKEDITOR.dom.window( domWindow ); + domWindow = editor.window = new CKEDITOR.dom.window( domWindow ); domDocument = editor.document = new CKEDITOR.dom.document( domDocument ); + domDocument.on( 'dblclick', function( evt ) + { + var element = evt.data.getTarget(), + data = { element : element, dialog : '' }; + editor.fire( 'doubleclick', data ); + data.dialog && editor.openDialog( data.dialog ); + }); + // Gecko/Webkit need some help when selecting control type elements. (#3448) - if ( !( CKEDITOR.env.ie || CKEDITOR.env.opera) ) + if ( !( CKEDITOR.env.ie || CKEDITOR.env.opera ) ) { domDocument.on( 'mousedown', function( ev ) { @@ -397,6 +560,34 @@ For licensing, see LICENSE.html or http://ckeditor.com/license } ); } + if ( CKEDITOR.env.gecko ) + { + domDocument.on( 'mouseup', function( ev ) + { + if ( ev.data.$.button == 2 ) + { + var target = ev.data.getTarget(); + + // Prevent right click from selecting an empty block even + // when selection is anchored inside it. (#5845) + if ( !target.getOuterHtml().replace( emptyParagraphRegexp, '' ) ) + { + var range = new CKEDITOR.dom.range( domDocument ); + range.moveToElementEditStart( target ); + range.select( true ); + } + } + } ); + } + + // Prevent the browser opening links in read-only blocks. (#6032) + domDocument.on( 'click', function( ev ) + { + ev = ev.data; + if ( ev.getTarget().is( 'a' ) && ev.$.button != 2 ) + ev.preventDefault(); + }); + // Webkit: avoid from editing form control elements content. if ( CKEDITOR.env.webkit ) { @@ -418,7 +609,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license // 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' ) + && domDocument.$.compatMode == 'CSS1Compat' + || CKEDITOR.env.gecko + || CKEDITOR.env.opera ) { var htmlElement = domDocument.getDocumentElement(); htmlElement.on( 'mousedown', function( evt ) @@ -427,43 +620,36 @@ For licensing, see LICENSE.html or http://ckeditor.com/license // have to use here a temporary element to 'redirect' // the focus. if ( evt.data.getTarget().equals( htmlElement ) ) - ieFocusGrabber.focus(); + { + if ( CKEDITOR.env.gecko && CKEDITOR.env.version >= 10900 ) + blinkCursor(); + focusGrabber.focus(); + } } ); } - var focusTarget = ( CKEDITOR.env.ie || CKEDITOR.env.webkit ) ? - domWindow : domDocument; - - focusTarget.on( 'blur', function() + domWindow.on( 'blur', function() { editor.focusManager.blur(); }); - focusTarget.on( 'focus', function() + var wasFocused; + + domWindow.on( 'focus', function() { - // Gecko need a key event to 'wake up' the editing - // ability when document is empty.(#3864) - if ( CKEDITOR.env.gecko ) + var doc = editor.document; + + if ( CKEDITOR.env.gecko && CKEDITOR.env.version >= 10900 ) + blinkCursor(); + else if ( CKEDITOR.env.opera ) + doc.getBody().focus(); + // Webkit needs focus for the first time on the HTML element. (#6153) + else if ( CKEDITOR.env.webkit ) { - var first = body; - while ( first.firstChild ) - first = first.firstChild; - - if ( !first.nextSibling - && ( 'BR' == first.tagName ) - && first.hasAttribute( '_moz_editor_bogus_node' ) ) + if ( !wasFocused ) { - 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.document.getDocumentElement().focus(); + wasFocused = 1; } } @@ -476,6 +662,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license if ( CKEDITOR.env.ie ) { + domDocument.getDocumentElement().addClass( domDocument.$.compatMode ); // Override keystrokes which should have deletion behavior // on control types in IE . (#4047) domDocument.on( 'keydown', function( evt ) @@ -552,6 +739,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license editor.fire( 'dataReady' ); }, 0 ); + // IE, Opera and Safari may not support it and throw errors. + try { editor.document.$.execCommand( 'enableObjectResizing', false, !editor.config.disableObjectResizing ) ; } catch(e) {} + try { editor.document.$.execCommand( 'enableInlineTableEditing', false, !editor.config.disableNativeTableHandles ) ; } catch(e) {} + /* * IE BUG: IE might have rendered the iframe with invisible contents. * (#3623). Push some inconsequential CSS style changes to force IE to @@ -574,7 +765,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license } }, 0 ); - }; + } editor.addMode( 'wysiwyg', { @@ -644,6 +835,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license // Check if the tag is available. if ( !(/]/).test( data ) ) data = data.replace( /]*>/, '$&' ) ; + else if ( !(/]/).test( data ) ) + data = data.replace( /]*>/, '$&' ) ; // The base must be the first tag in the HEAD, e.g. to get relative // links on styles. @@ -663,8 +856,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license { data = config.docType + - '' + + '' + '' + + '' + frameLabel + '' + baseTag + headExtra + '' + @@ -677,7 +872,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license data += activationScript; - CKEDITOR._[ 'contentDomReady' + editor.name ] = contentDomReady; + + // The iframe is recreated on each call of setData, so we need to clear DOM objects + this.onDispose(); createIFrame( data ); }, @@ -695,9 +892,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license if ( editor.dataProcessor ) data = editor.dataProcessor.toDataFormat( data, fixForBody ); - // Strip the last blank paragraph within document. + // Reset empty if the document contains only one empty paragraph. if ( config.ignoreEmptyParagraph ) - data = data.replace( emptyParagraphRegexp, '' ); + data = data.replace( emptyParagraphRegexp, function( match, lookback ) { return lookback; } ); if ( docType ) data = docType + '\n' + data; @@ -715,8 +912,31 @@ For licensing, see LICENSE.html or http://ckeditor.com/license iframe.getFrameDocument().getBody().setHtml( data ); }, + onDispose : function() + { + if ( !editor.document ) + return; + + editor.document.getDocumentElement().clearCustomData(); + editor.document.getBody().clearCustomData(); + + editor.window.clearCustomData(); + editor.document.clearCustomData(); + + iframe.clearCustomData(); + + /* + * IE BUG: When destroying editor DOM with the selection remains inside + * editing area would break IE7/8's selection system, we have to put the editing + * iframe offline first. (#3812 and #5441) + */ + iframe.remove(); + }, + unload : function( holderElement ) { + this.onDispose(); + editor.window = editor.document = iframe = mainElement = isPendingFocus = null; editor.fire( 'contentDomUnload' ); @@ -726,27 +946,20 @@ For licensing, see LICENSE.html or http://ckeditor.com/license { if ( isLoadingData ) isPendingFocus = true; - else if ( editor.window ) + // Temporary solution caused by #6025, supposed be unified by #6154. + else if ( CKEDITOR.env.opera && editor.document ) { - editor.window.focus(); + // Required for Opera when switching focus + // from another iframe, e.g. panels. (#6444) + var iframe = editor.window.$.frameElement; + iframe.blur(), iframe.focus(); + editor.document.getBody().focus(); - // Force the selection to happen, in this way - // we guarantee the focus will be there. (#4848) - if ( CKEDITOR.env.ie ) - { - try - { - var sel = editor.getSelection(); - sel = sel && sel.getNative(); - var range = sel && sel.type && sel.createRange(); - if ( range ) - { - sel.empty(); - range.select(); - } - } - catch (e) {} - } + editor.selectionChange(); + } + else if ( !CKEDITOR.env.opera && editor.window ) + { + editor.window.focus(); editor.selectionChange(); } @@ -759,28 +972,105 @@ For licensing, see LICENSE.html or http://ckeditor.com/license editor.on( 'selectionChange', onSelectionChangeFixBody, null, null, 1 ); }); + var titleBackup; + // Setting voice label as window title, backup the original one + // and restore it before running into use. + editor.on( 'contentDom', function() + { + var title = editor.document.getElementsByTag( 'title' ).getItem( 0 ); + title.setAttribute( '_cke_title', editor.document.$.title ); + editor.document.$.title = frameLabel; + }); + + // IE8 stricts mode doesn't have 'contentEditable' in effect + // on element unless it has layout. (#5562) + if ( CKEDITOR.env.ie8Compat ) + { + editor.addCss( 'html.CSS1Compat [contenteditable=false]{ min-height:0 !important;}' ); + + var selectors = []; + for ( var tag in CKEDITOR.dtd.$removeEmpty ) + selectors.push( 'html.CSS1Compat ' + tag + '[contenteditable=false]' ); + editor.addCss( selectors.join( ',' ) + '{ display:inline-block;}' ); + } + // 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; }' ); + + // Switch on design mode for a short while and close it after then. + function blinkCursor( retry ) + { + CKEDITOR.tools.tryThese( + function() + { + editor.document.$.designMode = 'on'; + setTimeout( function() + { + editor.document.$.designMode = 'off'; + if ( CKEDITOR.currentInstance == editor ) + editor.document.getBody().focus(); + }, 50 ); + }, + function() + { + // The above call is known to fail when parent DOM + // tree layout changes may break design mode. (#5782) + // Refresh the 'contentEditable' is a cue to this. + editor.document.$.designMode = 'off'; + var body = editor.document.getBody(); + body.setAttribute( 'contentEditable', false ); + body.setAttribute( 'contentEditable', true ); + // Try it again once.. + !retry && blinkCursor( 1 ); + }); + } + // Create an invisible element to grab focus. - if ( CKEDITOR.env.ie ) + if ( CKEDITOR.env.gecko || CKEDITOR.env.ie || CKEDITOR.env.opera ) { - var ieFocusGrabber; + var focusGrabber; editor.on( 'uiReady', function() { - ieFocusGrabber = editor.container.append( CKEDITOR.dom.element.createFromHtml( - '' ) ); + focusGrabber = editor.container.append( CKEDITOR.dom.element.createFromHtml( + // Use 'span' instead of anything else to fly under the screen-reader radar. (#5049) + '' ) ); - ieFocusGrabber.on( 'focus', function() + focusGrabber.on( 'focus', function() { editor.focus(); } ); } ); + editor.on( 'destroy', function() + { + CKEDITOR.tools.removeFunction( contentDomReadyHandler ); + focusGrabber.clearCustomData(); + } ); } + + // Disable form elements editing mode provided by some browers. (#5746) + editor.on( 'insertElement', function ( evt ) + { + var element = evt.data; + if ( element.type == CKEDITOR.NODE_ELEMENT + && ( element.is( 'input' ) || element.is( 'textarea' ) ) ) + { + if ( !element.isReadOnly() ) + { + element.setAttribute( 'contentEditable', false ); + // We should flag that the element was locked by our code so + // it'll be editable by the editor functions (#6046). + element.setCustomData( '_cke_notReadOnly', 1 ); + } + } + }); + } }); // Fixing Firefox 'Back-Forward Cache' break design mode. (#4514) if ( CKEDITOR.env.gecko ) { - ( function () + (function() { var body = document.body; @@ -788,24 +1078,21 @@ For licensing, see LICENSE.html or http://ckeditor.com/license window.addEventListener( 'load', arguments.callee, false ); else { - body.setAttribute( 'onpageshow', body.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'; - } - } - } ) + ')' ); + var currentHandler = body.getAttribute( 'onpageshow' ); + body.setAttribute( 'onpageshow', ( currentHandler ? currentHandler + ';' : '') + + 'event.persisted && (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";' + + ' }' + + '}' + + '})();' ); } } )();