X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fwysiwygarea%2Fplugin.js;h=7e7c1923a659a47d66c21bb6c22005ab9ef4fd22;hb=e371ddf8abcb89013e20e6d0dd746adec344d0e5;hp=a6b06390d8d4c08df0d898b5fcfdacb4be029a44;hpb=8665a7c6c60586526e32e8941fe2896739b6ebfb;p=ckeditor.git
diff --git a/_source/plugins/wysiwygarea/plugin.js b/_source/plugins/wysiwygarea/plugin.js
index a6b0639..7e7c192 100644
--- a/_source/plugins/wysiwygarea/plugin.js
+++ b/_source/plugins/wysiwygarea/plugin.js
@@ -14,17 +14,30 @@ 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|li)[^>]*>\s*(?:
]*>| |\u00A0| )?\s*(:?<\/\1>)?\s*(?=$|<\/body>)/gi;
+
+ var notWhitespaceEval = CKEDITOR.dom.walker.whitespaces( true );
+
+ 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,8 +50,29 @@ 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();
+ 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();
+ }
+ }
+
$sel.createRange().pasteHTML( data );
if ( selIsLocked )
@@ -47,6 +81,15 @@ 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();
+ }
+
CKEDITOR.tools.setTimeout( function()
{
this.fire( 'saveSnapshot' );
@@ -59,15 +102,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 )
@@ -121,9 +167,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 ] );
@@ -177,6 +231,34 @@ 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 );
+
+ // 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 );
+
+ // 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 +273,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 +300,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 &&
+ !nonExitableElementNames[ element.getName() ] )
{
+ range.moveToElementEditStart( element );
fixedBlock.remove();
}
+ else
+ {
+ element = fixedBlock.getPrevious( isNotWhitespace );
+ if ( element &&
+ element.type == CKEDITOR.NODE_ELEMENT &&
+ !nonExitableElementNames[ element.getName() ] )
+ {
+ range.moveToElementEditEnd( element );
+ fixedBlock.remove();
+ }
+ }
}
range.select();
@@ -319,10 +408,14 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
// for other browers, the 'src' attribute should be left empty to
// trigger iframe's 'load' event.
' src="' + ( CKEDITOR.env.ie ? 'javascript:void(function(){' + encodeURIComponent( srcScript ) + '}())' : '' ) + '"' +
- ' tabIndex="' + editor.tabIndex + '"' +
+ ' tabIndex="' + ( CKEDITOR.env.webkit? -1 : editor.tabIndex ) + '"' +
' allowTransparency="true"' +
'>' );
+ // #5689 Running inside of Firefox chrome the load event doesn't bubble like in a normal page
+ 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,6 +430,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
doc.close();
});
+ // #5689 Reset adjustment back to default
+ if (document.location.protocol == 'chrome:')
+ CKEDITOR.event.useCapture = false;
+
mainElement.append( iframe );
};
@@ -380,40 +477,34 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
}
else
{
- // Gecko need a key event to 'wake up' the editing
- // ability when document is empty.(#3864)
- if ( CKEDITOR.env.gecko && !body.childNodes.length )
+ // Avoid opening design mode in a frame window thread,
+ // which will cause host page scrolling.(#4397)
+ setTimeout( function()
{
- 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 );
- }
-
- domDocument.designMode = 'on';
+ // 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 );
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) )
{
@@ -425,6 +516,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 )
{
@@ -446,7 +565,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 )
@@ -455,20 +576,28 @@ 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()
+ domWindow.on( 'focus', function()
{
+ var doc = editor.document;
+
+ if ( CKEDITOR.env.gecko && CKEDITOR.env.version >= 10900 )
+ blinkCursor();
+ else if ( CKEDITOR.env.opera )
+ doc.getBody().focus();
+
editor.focusManager.focus();
});
@@ -478,6 +607,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 )
@@ -554,6 +684,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
@@ -669,8 +803,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
config.docType +
'' +
- '