X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fwysiwygarea%2Fplugin.js;h=ff4a80e9722e9422986879230f2972bdfa231723;hb=refs%2Ftags%2Fv3.5.2;hp=df2fd07968a1d1aa33943449699d529fe3cf0f6c;hpb=614511639979907ceb0da3614122a4d8eb963ad4;p=ckeditor.git diff --git a/_source/plugins/wysiwygarea/plugin.js b/_source/plugins/wysiwygarea/plugin.js index df2fd07..ff4a80e 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 */ @@ -25,185 +25,248 @@ For licensing, see LICENSE.html or http://ckeditor.com/license || 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 ) + 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(); + + // 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. - try + range = selection.getRanges()[ 0 ]; + var endContainer = range && range.endContainer; + + 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(); + if ( !range.checkReadOnly() ) + { + // Remove the original contents, merge splitted nodes. + range.deleteContents( 1 ); - 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 ) - { - while ( ( current = range.getCommonAncestor( 0, 1 ) ) - && ( 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 ); + + // 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 ); + // 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) @@ -294,7 +357,19 @@ 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; + if ( pathBlock && !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) @@ -345,7 +420,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license range.select(); // Notify non-IE that selection has changed. if ( !CKEDITOR.env.ie ) + { + // Make sure next selection change is correct. (#6811) + editor.forceNextSelectionCheck(); editor.selectionChange(); + } } // All browsers are incapable to moving cursor out of certain non-exitable @@ -411,8 +490,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 +499,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 +529,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 +569,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 +588,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; @@ -549,6 +633,18 @@ 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 ) ) { @@ -628,14 +724,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(); }); var wasFocused; - domWindow.on( 'focus', function() + focusTarget.on( 'focus', function() { var doc = editor.document; @@ -740,8 +837,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. @@ -798,7 +909,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license // Build the additional stuff to be included into . var headExtra = - ''; @@ -806,7 +917,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 +1055,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 +1070,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,13 +1092,13 @@ 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; }); - // 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;}' ); @@ -1039,11 +1153,14 @@ For licensing, see LICENSE.html or http://ckeditor.com/license { editor.focus(); } ); + + editor.focusGrabber = focusGrabber; } ); editor.on( 'destroy', function() { CKEDITOR.tools.removeFunction( contentDomReadyHandler ); focusGrabber.clearCustomData(); + delete editor.focusGrabber; } ); } @@ -1054,13 +1171,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 ); } }); @@ -1151,3 +1266,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 + */