X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fwysiwygarea%2Fplugin.js;h=c71f0401677a982cbd71f9e91c00cbbe80f96a83;hb=4e90e78dc97789709ee7404359a5517540c27553;hp=7e7c1923a659a47d66c21bb6c22005ab9ef4fd22;hpb=e371ddf8abcb89013e20e6d0dd746adec344d0e5;p=ckeditor.git diff --git a/_source/plugins/wysiwygarea/plugin.js b/_source/plugins/wysiwygarea/plugin.js index 7e7c192..c71f040 100644 --- a/_source/plugins/wysiwygarea/plugin.js +++ b/_source/plugins/wysiwygarea/plugin.js @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -14,191 +14,266 @@ 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|li)[^>]*>\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 ); - function checkReadOnly( selection ) + // Elements that could have empty new line around, including table, pre-formatted block, hr, page-break. (#6554) + function nonExitable( element ) { - if ( selection.getType() == CKEDITOR.SELECTION_ELEMENT ) - return selection.getSelectedElement().isReadOnly(); - else - return selection.getCommonAncestor().isReadOnly(); + return ( element.getName() in nonExitableElementNames ) + || element.isBlockBoundary() && CKEDITOR.dtd.$empty[ element.getName() ]; } - function onInsertHtml( evt ) + + function onInsert( insertFunc ) { - if ( this.mode == 'wysiwyg' ) + return function( evt ) { - this.focus(); + if ( this.mode == 'wysiwyg' ) + { + this.focus(); - var selection = this.getSelection(); - if ( checkReadOnly( selection ) ) - return; + this.fire( 'saveSnapshot' ); - var data = evt.data; - this.fire( 'saveSnapshot' ); + insertFunc.call( this, evt.data ); - if ( this.dataProcessor ) - data = this.dataProcessor.toHtml( data ); + // Save snaps after the whole execution completed. + // This's a workaround for make DOM modification's happened after + // 'insertElement' to be included either, e.g. Form-based dialogs' 'commitContents' + // call. + CKEDITOR.tools.setTimeout( function() + { + this.fire( 'saveSnapshot' ); + }, 0, this ); + } + }; + } - if ( CKEDITOR.env.ie ) - { - var selIsLocked = selection.isLocked; + function doInsertHtml( data ) + { + if ( this.dataProcessor ) + data = this.dataProcessor.toHtml( data ); - if ( selIsLocked ) - selection.unlock(); + // HTML insertion only considers the first range. + var selection = this.getSelection(), + range = selection.getRanges()[ 0 ]; - var $sel = selection.getNative(); + if ( range.checkReadOnly() ) + return; - // Delete control selections to avoid IE bugs on pasteHTML. - if ( $sel.type == 'Control' ) - $sel.clear(); - 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. + if ( CKEDITOR.env.ie ) + { + var selIsLocked = selection.isLocked; - var range = selection.getRanges()[0], - endContainer = range && range.endContainer; + if ( selIsLocked ) + selection.unlock(); - if ( endContainer && - endContainer.type == CKEDITOR.NODE_ELEMENT && - endContainer.getAttribute( 'contenteditable' ) == 'false' && - range.checkBoundaryOfElement( endContainer, CKEDITOR.END ) ) - { - range.setEndAfter( range.endContainer ); - range.deleteContents(); - } - } + var $sel = selection.getNative(); - $sel.createRange().pasteHTML( data ); + // Delete control selections to avoid IE bugs on pasteHTML. + if ( $sel.type == 'Control' ) + $sel.clear(); + 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. + + range = selection.getRanges()[ 0 ]; + var endContainer = range && range.endContainer; - if ( selIsLocked ) - this.getSelection().lock(); + if ( endContainer && + endContainer.type == CKEDITOR.NODE_ELEMENT && + endContainer.getAttribute( 'contenteditable' ) == 'false' && + range.checkBoundaryOfElement( endContainer, CKEDITOR.END ) ) + { + range.setEndAfter( range.endContainer ); + range.deleteContents(); + } } - else - this.document.$.execCommand( 'inserthtml', false, data ); - // Webkit does not scroll to the cursor position after pasting (#5558) - if ( CKEDITOR.env.webkit ) + try { - this.document.$.execCommand( 'inserthtml', false, '' ); - var marker = this.document.getById( 'cke_paste_marker' ); - marker.scrollIntoView(); - marker.remove(); + $sel.createRange().pasteHTML( data ); } + catch (e) {} - CKEDITOR.tools.setTimeout( function() - { - this.fire( 'saveSnapshot' ); - }, 0, this ); + if ( selIsLocked ) + this.getSelection().lock(); + } + else + this.document.$.execCommand( 'inserthtml', false, data ); + + // Webkit does not scroll to the cursor position after pasting (#5558) + if ( CKEDITOR.env.webkit ) + { + selection = this.getSelection(); + selection.scrollIntoView(); } } - function onInsertElement( evt ) + function doInsertText( text ) { - if ( this.mode == 'wysiwyg' ) + var selection = this.getSelection(), + mode = selection.getStartElement().hasAscendant( 'pre', true ) ? + CKEDITOR.ENTER_BR : this.config.enterMode, + isEnterBrMode = mode == CKEDITOR.ENTER_BR; + + var html = CKEDITOR.tools.htmlEncode( text.replace( /\r\n|\r/g, '\n' ) ); + + // Convert leading and trailing whitespaces into   + html = html.replace( /^[ \t]+|[ \t]+$/g, function( match, offset, s ) + { + if ( match.length == 1 ) // one space, preserve it + return ' '; + else if ( !offset ) // beginning of block + return CKEDITOR.tools.repeat( ' ', match.length - 1 ) + ' '; + else // end of block + return ' ' + CKEDITOR.tools.repeat( ' ', match.length - 1 ); + } ); + + // Convert subsequent whitespaces into   + html = html.replace( /[ \t]{2,}/g, function ( match ) + { + return CKEDITOR.tools.repeat( ' ', match.length - 1 ) + ' '; + } ); + + var paragraphTag = mode == CKEDITOR.ENTER_P ? 'p' : 'div'; + + // Two line-breaks create one paragraph. + if ( !isEnterBrMode ) { - this.focus(); + html = html.replace( /(\n{2})([\s\S]*?)(?:$|\1)/g, + function( match, group1, text ) + { + return '<'+paragraphTag + '>' + text + ''; + }); + } + + // One
per line-break. + html = html.replace( /\n/g, '
' ); + + // Compensate padding
for non-IE. + if ( !( isEnterBrMode || CKEDITOR.env.ie ) ) + { + html = html.replace( new RegExp( '
(?=)' ), function( match ) + { + return CKEDITOR.tools.repeat( match, 2 ); + } ); + } + + // Inline styles have to be inherited in Firefox. + if ( CKEDITOR.env.gecko || CKEDITOR.env.webkit ) + { + var path = new CKEDITOR.dom.elementPath( selection.getStartElement() ), + context = []; - var selection = this.getSelection(); - if ( checkReadOnly( selection ) ) - return; + for ( var i = 0; i < path.elements.length; i++ ) + { + var tag = path.elements[ i ].getName(); + if ( tag in CKEDITOR.dtd.$inline ) + context.unshift( path.elements[ i ].getOuterHtml().match( /^<.*?>/) ); + else if ( tag in CKEDITOR.dtd.$block ) + break; + } - this.fire( 'saveSnapshot' ); + // Reproduce the context by preceding the pasted HTML with opening inline tags. + html = context.join( '' ) + html; + } - var ranges = selection.getRanges(), - element = evt.data, + doInsertHtml.call( this, html ); + } + + function doInsertElement( element ) + { + var selection = this.getSelection(), + ranges = selection.getRanges(), elementName = element.getName(), isBlock = CKEDITOR.dtd.$block[ elementName ]; - var selIsLocked = selection.isLocked; + var selIsLocked = selection.isLocked; - if ( selIsLocked ) - selection.unlock(); + if ( selIsLocked ) + selection.unlock(); - var range, clone, lastElement, bookmark; + var range, clone, lastElement, bookmark; - for ( var i = ranges.length - 1 ; i >= 0 ; i-- ) - { - range = ranges[ i ]; + for ( var i = ranges.length - 1 ; i >= 0 ; i-- ) + { + range = ranges[ i ]; - // Remove the original contents. - range.deleteContents(); + if ( !range.checkReadOnly() ) + { + // Remove the original contents, merge splitted nodes. + range.deleteContents( 1 ); - 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 ) ) - && ( dtd = CKEDITOR.dtd[ current.getName() ] ) - && !( dtd && dtd [ elementName ] ) ) + // If we're inserting a block at dtd-violated position, split + // the parent blocks until we reach blockLimit. + var current, dtd; + if ( isBlock ) { - // Split up inline elements. - if ( current.getName() in CKEDITOR.dtd.span ) - range.splitElement( current ); - // If we're in an empty block which indicate a new paragraph, - // simply replace it with the inserting block.(#3664) - else if ( range.checkStartOfBlock() - && range.checkEndOfBlock() ) + while ( ( current = range.getCommonAncestor( 0, 1 ) ) + && ( dtd = CKEDITOR.dtd[ current.getName() ] ) + && !( dtd && dtd [ elementName ] ) ) { - range.setStartBefore( current ); - range.collapse( true ); - current.remove(); + // Split up inline elements. + if ( current.getName() in CKEDITOR.dtd.span ) + range.splitElement( current ); + // If we're in an empty block which indicate a new paragraph, + // simply replace it with the inserting block.(#3664) + else if ( range.checkStartOfBlock() + && range.checkEndOfBlock() ) + { + range.setStartBefore( current ); + range.collapse( true ); + current.remove(); + } + else + range.splitBlock(); } - else - range.splitBlock(); } - } - // Insert the new node. - range.insertNode( clone ); + // Insert the new node. + range.insertNode( clone ); - // Save the last element reference so we can make the - // selection later. - if ( !lastElement ) - lastElement = clone; + // Save the last element reference so we can make the + // selection later. + if ( !lastElement ) + lastElement = clone; + } } - range.moveToPosition( lastElement, CKEDITOR.POSITION_AFTER_END ); - - // If we're inserting a block element immediatelly followed by - // another block element, the selection must move there. (#3100,#5436) - if ( isBlock ) + if ( lastElement ) { - var next = lastElement.getNext( notWhitespaceEval ), - nextName = next && next.type == CKEDITOR.NODE_ELEMENT && next.getName(); + range.moveToPosition( lastElement, CKEDITOR.POSITION_AFTER_END ); - // Check if it's a block element that accepts text. - if ( nextName && CKEDITOR.dtd.$block[ nextName ] && CKEDITOR.dtd[ nextName ]['#'] ) - 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 ] ); - if ( selIsLocked ) - this.getSelection().lock(); - - // Save snaps after the whole execution completed. - // This's a workaround for make DOM modification's happened after - // 'insertElement' to be included either, e.g. Form-based dialogs' 'commitContents' - // call. - CKEDITOR.tools.setTimeout( function(){ - this.fire( 'saveSnapshot' ); - }, 0, this ); - } + if ( selIsLocked ) + this.getSelection().lock(); } // DOM modification here should not bother dirty flag.(#4385) function restoreDirty( editor ) { if ( !editor.checkDirty() ) - setTimeout( function(){ editor.resetDirty(); } ); + setTimeout( function(){ editor.resetDirty(); }, 0 ); } var isNotWhitespace = CKEDITOR.dom.walker.whitespaces( true ), @@ -238,18 +313,31 @@ For licensing, see LICENSE.html or http://ckeditor.com/license var win = editor.window, doc = editor.document, body = editor.document.getBody(), + bodyFirstChild = body.getFirst(), bodyChildsNum = body.getChildren().count(); - if ( !bodyChildsNum || ( bodyChildsNum == 1&& body.getFirst().hasAttribute( '_moz_editor_bogus_node' ) ) ) + if ( !bodyChildsNum + || bodyChildsNum == 1 + && bodyFirstChild.type == CKEDITOR.NODE_ELEMENT + && bodyFirstChild.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(); @@ -273,7 +361,25 @@ For licensing, see LICENSE.html or http://ckeditor.com/license body = editor.document.getBody(), enterMode = editor.config.enterMode; - CKEDITOR.env.gecko && activateEditing( editor ); + if ( CKEDITOR.env.gecko ) + { + activateEditing( editor ); + + // Ensure bogus br could help to move cursor (out of styles) to the end of block. (#7041) + var pathBlock = path.block || path.blockLimit, + lastNode = pathBlock && pathBlock.getLast( isNotEmpty ); + + // In case it's not ended with block element and doesn't have bogus yet. (#7467) + if ( pathBlock + && !( lastNode && lastNode.type == CKEDITOR.NODE_ELEMENT && lastNode.isBlockBoundary() ) + && !pathBlock.is( 'pre' ) + && !pathBlock.getBogus() ) + { + editor.fire( 'updateSnapshot' ); + restoreDirty( editor ); + pathBlock.appendBogus(); + } + } // When enterMode set to block, we'll establing new paragraph only if we're // selecting inline contents right under body. (#3657) @@ -303,7 +409,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license var element = fixedBlock.getNext( isNotWhitespace ); if ( element && element.type == CKEDITOR.NODE_ELEMENT && - !nonExitableElementNames[ element.getName() ] ) + !nonExitable( element ) ) { range.moveToElementEditStart( element ); fixedBlock.remove(); @@ -313,7 +419,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license element = fixedBlock.getPrevious( isNotWhitespace ); if ( element && element.type == CKEDITOR.NODE_ELEMENT && - !nonExitableElementNames[ element.getName() ] ) + !nonExitable( element ) ) { range.moveToElementEditEnd( element ); fixedBlock.remove(); @@ -322,9 +428,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license } range.select(); - // Notify non-IE that selection has changed. - if ( !CKEDITOR.env.ie ) - editor.selectionChange(); + // Cancel this selection change in favor of the next (correct). (#6811) + evt.cancel(); } // All browsers are incapable to moving cursor out of certain non-exitable @@ -390,8 +495,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license if ( iframe ) iframe.remove(); - - var srcScript = + var src = 'document.open();' + // The document domain must be set any time we @@ -400,20 +504,28 @@ For licensing, see LICENSE.html or http://ckeditor.com/license 'document.close();'; + // With IE, the custom domain has to be taken care at first, + // for other browers, the 'src' attribute should be left empty to + // trigger iframe's 'load' event. + src = + CKEDITOR.env.air ? + 'javascript:void(0)' : + CKEDITOR.env.ie ? + 'javascript:void(function(){' + encodeURIComponent( src ) + '}())' + : + ''; + iframe = CKEDITOR.dom.element.createFromHtml( '' ); - // #5689 Running inside of Firefox chrome the load event doesn't bubble like in a normal page - if (document.location.protocol == 'chrome:') + // 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; // With FF, it's better to load the data on iframe.load. (#3894,#4058) @@ -422,26 +534,47 @@ For licensing, see LICENSE.html or http://ckeditor.com/license frameLoaded = 1; ev.removeListener(); - var doc = iframe.getFrameDocument().$; - - // Don't leave any history log in IE. (#5657) - doc.open( "text/html","replace" ); + var doc = iframe.getFrameDocument(); doc.write( data ); - doc.close(); + + CKEDITOR.env.air && contentDomReady( doc.getWindow().$ ); }); - // #5689 Reset adjustment back to default - if (document.location.protocol == 'chrome:') + // 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 ) + { + element.show(); + previousStyles = { + position : element.getStyle( 'position' ), + top : element.getStyle( 'top' ) + }; + element.setStyles( { position : 'absolute', top : '-3000px' } ); + } + mainElement.append( iframe ); + + if ( isHidden ) + { + setTimeout( function() + { + element.hide(); + element.setStyles( previousStyles ); + }, 1000 ); + } }; // 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 = - ''; @@ -460,7 +593,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license // Remove this script from the DOM. var script = domDocument.getElementById( "cke_actscrpt" ); - script.parentNode.removeChild( script ); + script && script.parentNode.removeChild( script ); body.spellcheck = !editor.config.disableNativeSpellChecker; @@ -494,7 +627,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license 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 ) @@ -505,8 +638,20 @@ For licensing, see LICENSE.html or http://ckeditor.com/license data.dialog && editor.openDialog( data.dialog ); }); + // Prevent automatic submission in IE #6336 + CKEDITOR.env.ie && domDocument.on( 'click', function( evt ) + { + var element = evt.data.getTarget(); + if ( element.is( 'input' ) ) + { + var type = element.getAttribute( 'type' ); + if ( type == 'submit' || type == 'reset' ) + evt.data.preventDefault(); + } + }); + // 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 ) { @@ -547,6 +692,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license // Webkit: avoid from editing form control elements content. if ( CKEDITOR.env.webkit ) { + // Mark that cursor will right blinking (#7113). + domDocument.on( 'mousedown', function() { wasFocused = 1; } ); // Prevent from tick checkbox/radiobox/select domDocument.on( 'click', function( ev ) { @@ -584,12 +731,15 @@ For licensing, see LICENSE.html or http://ckeditor.com/license } ); } - domWindow.on( 'blur', function() + var focusTarget = CKEDITOR.env.ie ? iframe : domWindow; + focusTarget.on( 'blur', function() { editor.focusManager.blur(); }); - domWindow.on( 'focus', function() + var wasFocused; + + focusTarget.on( 'focus', function() { var doc = editor.document; @@ -597,6 +747,15 @@ For licensing, see LICENSE.html or http://ckeditor.com/license 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 ) + { + if ( !wasFocused ) + { + editor.document.getDocumentElement().focus(); + wasFocused = 1; + } + } editor.focusManager.focus(); }); @@ -655,6 +814,30 @@ For licensing, see LICENSE.html or http://ckeditor.com/license } } ); } + + // Prevent IE from leaving new paragraph after deleting all contents in body. (#6966) + editor.config.enterMode != CKEDITOR.ENTER_P + && domDocument.on( 'selectionchange', function() + { + var body = domDocument.getBody(), + range = editor.getSelection().getRanges()[ 0 ]; + + if ( body.getHtml().match( /^

 <\/p>$/i ) + && range.startContainer.equals( body ) ) + { + // Avoid the ambiguity from a real user cursor position. + setTimeout( function () + { + range = editor.getSelection().getRanges()[ 0 ]; + if ( !range.startContainer.equals ( 'body' ) ) + { + body.getFirst().remove( 1 ); + range.moveToElementEditEnd( body ); + range.select( 1 ); + } + }, 0 ); + } + }); } // Adds the document body as a context menu target. @@ -685,8 +868,22 @@ For licensing, see LICENSE.html or http://ckeditor.com/license }, 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) {} + try { editor.document.$.execCommand( 'enableInlineTableEditing', false, !editor.config.disableNativeTableHandles ); } catch(e) {} + if ( editor.config.disableObjectResizing ) + { + try + { + editor.document.$.execCommand( 'enableObjectResizing', false, false ); + } + catch(e) + { + // For browsers in which the above method failed, we can cancel the resizing on the fly (#4208) + editor.document.getBody().on( CKEDITOR.env.ie ? 'resizestart' : 'resize', function( evt ) + { + evt.data.preventDefault(); + }); + } + } /* * IE BUG: IE might have rendered the iframe with invisible contents. @@ -736,6 +933,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license loadData : function( data ) { isLoadingData = true; + editor._.dataStore = { id : 1 }; var config = editor.config, fullPage = config.fullPage, @@ -743,7 +941,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license // Build the additional stuff to be included into . var headExtra = - ''; @@ -751,7 +949,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license CKEDITOR.tools.buildStyleHtml( editor.config.contentsCss ) + headExtra ); - var baseTag = config.baseHref ? '' : ''; + var baseTag = config.baseHref ? '' : ''; if ( fullPage ) { @@ -815,6 +1013,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license ''; } + // Distinguish bogus to normal BR at the end of document for Mozilla. (#5293). + if ( CKEDITOR.env.gecko ) + data = data.replace( /
(?=\s*<\/(:?html|body)>)/, '$&
' ); + data += activationScript; @@ -834,12 +1036,16 @@ For licensing, see LICENSE.html or http://ckeditor.com/license ? doc.getDocumentElement().getOuterHtml() : doc.getBody().getHtml(); + // BR at the end of document is bogus node for Mozilla. (#5293). + if ( CKEDITOR.env.gecko ) + data = data.replace( /
(?=\s*(:?$|<\/body>))/, '' ); + 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; @@ -889,19 +1095,33 @@ For licensing, see LICENSE.html or http://ckeditor.com/license focus : function() { + var win = editor.window; + 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(); editor.selectionChange(); } + else if ( !CKEDITOR.env.opera && win ) + { + // AIR needs a while to focus when moving from a link. + CKEDITOR.env.air ? setTimeout( function () { win.focus(); }, 0 ) : win.focus(); + editor.selectionChange(); + } } }); - editor.on( 'insertHtml', onInsertHtml, null, null, 20 ); - editor.on( 'insertElement', onInsertElement, null, null, 20 ); + editor.on( 'insertHtml', onInsert( doInsertHtml ) , null, null, 20 ); + editor.on( 'insertElement', onInsert( doInsertElement ), null, null, 20 ); + editor.on( 'insertText', onInsert( doInsertText ), null, null, 20 ); // Auto fixing on some document structure weakness to enhance usabilities. (#3190 and #3189) editor.on( 'selectionChange', onSelectionChangeFixBody, null, null, 1 ); }); @@ -909,16 +1129,16 @@ For licensing, see LICENSE.html or http://ckeditor.com/license var titleBackup; // Setting voice label as window title, backup the original one // and restore it before running into use. - editor.on( 'contentDom', function () + editor.on( 'contentDom', function() { var title = editor.document.getElementsByTag( 'title' ).getItem( 0 ); - title.setAttribute( '_cke_title', editor.document.$.title ); + title.data( 'cke-title', editor.document.$.title ); editor.document.$.title = frameLabel; }); - // IE8 stricts mode doesn't have 'contentEditable' in effect + // IE>=8 stricts mode doesn't have 'contentEditable' in effect // on element unless it has layout. (#5562) - if ( CKEDITOR.env.ie8Compat ) + if ( CKEDITOR.document.$.documentMode >= 8 ) { editor.addCss( 'html.CSS1Compat [contenteditable=false]{ min-height:0 !important;}' ); @@ -927,6 +1147,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license 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 ) @@ -935,10 +1158,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license function() { editor.document.$.designMode = 'on'; - setTimeout( function () + setTimeout( function() { editor.document.$.designMode = 'off'; - editor.document.getBody().focus(); + if ( CKEDITOR.currentInstance == editor ) + editor.document.getBody().focus(); }, 50 ); }, function() @@ -963,17 +1187,20 @@ For licensing, see LICENSE.html or http://ckeditor.com/license { focusGrabber = editor.container.append( CKEDITOR.dom.element.createFromHtml( // Use 'span' instead of anything else to fly under the screen-reader radar. (#5049) - '' ) ); + '' ) ); focusGrabber.on( 'focus', function() { editor.focus(); } ); + + editor.focusGrabber = focusGrabber; } ); editor.on( 'destroy', function() { CKEDITOR.tools.removeFunction( contentDomReadyHandler ); focusGrabber.clearCustomData(); + delete editor.focusGrabber; } ); } @@ -984,13 +1211,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license if ( element.type == CKEDITOR.NODE_ELEMENT && ( element.is( 'input' ) || element.is( 'textarea' ) ) ) { + // We should flag that the element was locked by our code so + // it'll be editable by the editor functions (#6046). 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 ); - } + element.data( 'cke-editable', element.hasAttribute( 'contenteditable' ) ? 'true' : '1' ); + element.setAttribute( 'contentEditable', false ); } }); @@ -1000,7 +1225,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license // Fixing Firefox 'Back-Forward Cache' break design mode. (#4514) if ( CKEDITOR.env.gecko ) { - ( function () + (function() { var body = document.body; @@ -1051,14 +1276,12 @@ CKEDITOR.config.disableObjectResizing = false; CKEDITOR.config.disableNativeTableHandles = true; /** - * Disables the built-in spell checker while typing natively available in the - * browser (currently Firefox and Safari only).

+ * Disables the built-in words spell checker if browser provides one.

* - * Even if word suggestions will not appear in the CKEditor context menu, this - * feature is useful to help quickly identifying misspelled words.

+ * Note: Although word suggestions provided by browsers (natively) will not appear in CKEditor's default context menu, + * users can always reach the native context menu by holding the Ctrl key when right-clicking if {@link CKEDITOR.config.browserContextMenuOnCtrl} + * is enabled or you're simply not using the context menu plugin. * - * This setting is currently compatible with Firefox only due to limitations in - * other browsers. * @type Boolean * @default true * @example @@ -1081,3 +1304,10 @@ CKEDITOR.config.ignoreEmptyParagraph = true; * @name CKEDITOR.editor#dataReady * @event */ + +/** + * Fired when some elements are added to the document + * @name CKEDITOR.editor#ariaWidget + * @event + * @param {Object} element The element being added + */