X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fwysiwygarea%2Fplugin.js;h=df2fd07968a1d1aa33943449699d529fe3cf0f6c;hb=614511639979907ceb0da3614122a4d8eb963ad4;hp=5a0aca8a52abf45008298dbc85dc4a19ee8b63b7;hpb=66f4ae0bf0280ed56bf7c0f4ab175424dd1d47a0;p=ckeditor.git
diff --git a/_source/plugins/wysiwygarea/plugin.js b/_source/plugins/wysiwygarea/plugin.js
index 5a0aca8..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 ),
@@ -177,6 +243,43 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
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)
@@ -191,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
@@ -216,20 +321,25 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
// 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 )
- && isBlankParagraph( previousElement )
- && range.moveToElementEditStart( previousElement )
- || nextElement && nextElement.getName
- && !( nextElement.getName() in nonExitableElementNames )
- && isBlankParagraph( nextElement )
- && 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();
@@ -323,6 +433,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
' allowTransparency="true"' +
'>' );
+ // 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)
iframe.on( 'load', function( ev )
{
@@ -337,7 +451,34 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
doc.close();
});
+ // 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
@@ -395,35 +536,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
}, 0 );
}
- // Gecko need a key event to 'wake up' the editing
- // ability when document is empty.(#3864)
- if ( CKEDITOR.env.gecko && !body.childNodes.length )
- {
- setTimeout( function()
- {
- restoreDirty( editor );
-
- // Simulating keyboard character input by dispatching a keydown of white-space text.
- var keyEventSimulate = domDocument.$.createEvent( "KeyEvents" );
- keyEventSimulate.initKeyEvent( 'keypress', true, true, domWindow.$, false,
- false, false, false, 0, 32 );
- domDocument.$.dispatchEvent( keyEventSimulate );
-
- // Restore the original document status by placing the cursor before a bogus br created (#5021).
- domDocument.createElement( 'br', { attributes: { '_moz_editor_bogus_node' : 'TRUE', '_moz_dirty' : "" } } )
- .replace( domDocument.getBody().getFirst() );
- var nativeRange = new CKEDITOR.dom.range( domDocument );
- nativeRange.setStartAt( new CKEDITOR.dom.element( body ) , CKEDITOR.POSITION_AFTER_START );
- nativeRange.select();
- }, 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 )
@@ -435,7 +550,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
});
// 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 )
{
@@ -445,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 )
{
@@ -490,6 +633,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
editor.focusManager.blur();
});
+ var wasFocused;
+
domWindow.on( 'focus', function()
{
var doc = editor.document;
@@ -498,16 +643,14 @@ 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 )
{
- // Selection will get lost after move focus
- // to document element, save it first.
- var sel = editor.getSelection(),
- type = sel.getType(),
- range = ( type != CKEDITOR.SELECTION_NONE ) && sel.getRanges()[ 0 ];
-
- doc.getDocumentElement().focus();
- range && range.select();
+ if ( !wasFocused )
+ {
+ editor.document.getDocumentElement().focus();
+ wasFocused = 1;
+ }
}
editor.focusManager.focus();
@@ -596,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
@@ -745,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;
@@ -777,6 +924,13 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
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 )
@@ -792,7 +946,18 @@ 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 )
+ {
+ // 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 && editor.window )
{
editor.window.focus();
@@ -810,7 +975,7 @@ 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 );
@@ -828,6 +993,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 )
@@ -836,10 +1004,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()
@@ -864,7 +1033,7 @@ 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()
{
@@ -882,10 +1051,16 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
editor.on( 'insertElement', function ( evt )
{
var element = evt.data;
- if ( element.type = CKEDITOR.NODE_ELEMENT
+ if ( element.type == CKEDITOR.NODE_ELEMENT
&& ( element.is( 'input' ) || element.is( 'textarea' ) ) )
{
- element.setAttribute( 'contentEditable', false );
+ 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 );
+ }
}
});
@@ -895,7 +1070,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;