X-Git-Url: https://jasonwoof.com/gitweb/?p=ckeditor.git;a=blobdiff_plain;f=_source%2Fplugins%2Fwysiwygarea%2Fplugin.js;h=4816cdc8a65164ef5f9591398fcfeb7e34f4b8ab;hp=df2fd07968a1d1aa33943449699d529fe3cf0f6c;hb=9afde8772159bd3436f1f5b7862960307710ae5a;hpb=614511639979907ceb0da3614122a4d8eb963ad4 diff --git a/_source/plugins/wysiwygarea/plugin.js b/_source/plugins/wysiwygarea/plugin.js index df2fd07..4816cdc 100644 --- a/_source/plugins/wysiwygarea/plugin.js +++ b/_source/plugins/wysiwygarea/plugin.js @@ -33,177 +33,240 @@ For licensing, see LICENSE.html or http://ckeditor.com/license return selection.getCommonAncestor().isReadOnly(); } - 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; + var selection = this.getSelection(); + if ( checkReadOnly( selection ) ) + return; - var data = evt.data; - this.fire( 'saveSnapshot' ); + this.fire( 'saveSnapshot' ); - if ( this.dataProcessor ) - data = this.dataProcessor.toHtml( data ); + insertFunc.call( this, evt.data ); - if ( CKEDITOR.env.ie ) - { - var selIsLocked = selection.isLocked; + // 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 ) - selection.unlock(); + function doInsertHtml( data ) + { + if ( this.dataProcessor ) + data = this.dataProcessor.toHtml( data ); - var $sel = selection.getNative(); + var selection = this.getSelection(); + if ( CKEDITOR.env.ie ) + { + var selIsLocked = selection.isLocked; - // Delete control selections to avoid IE bugs on pasteHTML. - if ( $sel.type == 'Control' ) - $sel.clear(); + if ( selIsLocked ) + selection.unlock(); + + var $sel = selection.getNative(); + + // 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. + { + // 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], + 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 + if ( endContainer && + endContainer.type == CKEDITOR.NODE_ELEMENT && + endContainer.getAttribute( 'contenteditable' ) == 'false' && + range.checkBoundaryOfElement( endContainer, CKEDITOR.END ) ) { - $sel.createRange().pasteHTML( data ); + range.setEndAfter( range.endContainer ); + range.deleteContents(); } - catch (e) {} - - 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 ) + try { - this.document.$.execCommand( 'inserthtml', false, '' ); - var marker = this.document.getById( 'cke_paste_marker' ); - marker.scrollIntoView(); - marker.remove(); - marker = null; + $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 + ''; + }); + } - var selection = this.getSelection(); - if ( checkReadOnly( selection ) ) - return; + // One
per line-break. + html = html.replace( /\n/g, '
' ); - this.fire( 'saveSnapshot' ); + // Compensate padding
for non-IE. + if ( !( isEnterBrMode || CKEDITOR.env.ie ) ) + { + html = html.replace( new RegExp( '
(?=)' ), function( match ) + { + return CKEDITOR.tools.repeat( match, 2 ); + } ); + } - var ranges = selection.getRanges(), - element = evt.data, + // Inline styles have to be inherited in Firefox. + if ( CKEDITOR.env.gecko || CKEDITOR.env.webkit ) + { + var path = new CKEDITOR.dom.elementPath( selection.getStartElement() ), + context = []; + + 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; + } + + // Reproduce the context by preceding the pasted HTML with opening inline tags. + html = context.join( '' ) + html; + } + + 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(); + // Remove the original contents. + range.deleteContents(); - clone = !i && element || element.clone( 1 ); + 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 ) + // 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( 0, 1 ) ) + && ( dtd = CKEDITOR.dtd[ current.getName() ] ) + && !( dtd && dtd [ elementName ] ) ) { - while ( ( current = range.getCommonAncestor( 0, 1 ) ) - && ( dtd = CKEDITOR.dtd[ current.getName() ] ) - && !( dtd && dtd [ elementName ] ) ) + // 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() ) { - // 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(); + range.setStartBefore( current ); + range.collapse( true ); + current.remove(); } + 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 ); + 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 ) - { - var next = lastElement.getNext( notWhitespaceEval ), + // 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 ] ); + // Check if it's a block element that accepts text. + if ( nextName && CKEDITOR.dtd.$block[ nextName ] && CKEDITOR.dtd[ nextName ]['#'] ) + range.moveToElementEditStart( next ); + } - if ( selIsLocked ) - this.getSelection().lock(); + selection.selectRanges( [ range ] ); - // 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) @@ -411,8 +474,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 @@ -421,14 +483,22 @@ 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( '' ); @@ -443,12 +513,10 @@ 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().$ ); }); // Reset adjustment back to default (#5689) @@ -485,7 +553,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license // is fully editable even before the editing iframe is fully loaded (#4455). contentDomReadyHandler = CKEDITOR.tools.addFunction( contentDomReady ); var activationScript = - ''; @@ -504,7 +572,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; @@ -798,7 +866,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license // Build the additional stuff to be included into . var headExtra = - ''; @@ -806,7 +874,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 ) { @@ -944,6 +1012,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license focus : function() { + var win = editor.window; + if ( isLoadingData ) isPendingFocus = true; // Temporary solution caused by #6025, supposed be unified by #6154. @@ -957,17 +1027,18 @@ For licensing, see LICENSE.html or http://ckeditor.com/license editor.selectionChange(); } - else if ( !CKEDITOR.env.opera && editor.window ) + else if ( !CKEDITOR.env.opera && win ) { - editor.window.focus(); - + // 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 ); }); @@ -978,7 +1049,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license 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; });