X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fclipboard%2Fplugin.js;h=a285954cbb48d92e6df795a7360f85a34231f141;hb=2f22c0c38f17e75be5541089076885442aaa2377;hp=342d70888f6b4105bdf6e612d6b82428c6d5801e;hpb=48b1db88210b4160dce439c6e3e32e14af8c106b;p=ckeditor.git diff --git a/_source/plugins/clipboard/plugin.js b/_source/plugins/clipboard/plugin.js index 342d708..a285954 100644 --- a/_source/plugins/clipboard/plugin.js +++ b/_source/plugins/clipboard/plugin.js @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -16,10 +16,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license var doc = editor.document, body = doc.getBody(); - var enabled = 0; + var enabled = false; var onExec = function() { - enabled = 1; + enabled = true; }; // The following seems to be the only reliable way to detect that @@ -135,11 +135,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license var body = this.document.getBody(); - // Simulate 'beforepaste' event for all none-IEs. - if ( !CKEDITOR.env.ie && body.fire( 'beforepaste' ) ) - event.cancel(); // Simulate 'paste' event for Opera/Firefox2. - else if ( CKEDITOR.env.opera + if ( CKEDITOR.env.opera || CKEDITOR.env.gecko && CKEDITOR.env.version < 10900 ) body.fire( 'paste' ); return; @@ -158,6 +155,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license } }; + function cancel( evt ) { evt.cancel(); } + // Allow to peek clipboard content by redirecting the // pasting content into a temporary bin and grab the content of it. function getClipboardData( evt, mode, callback ) @@ -208,19 +207,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license var bms = sel.createBookmarks(); + this.on( 'selectionChange', cancel, null, null, 0 ); + // Turn off design mode temporarily before give focus to the paste bin. if ( mode == 'text' ) - { - if ( CKEDITOR.env.ie ) - { - var ieRange = doc.getBody().$.createTextRange(); - ieRange.moveToElementText( pastebin.$ ); - ieRange.execCommand( 'Paste' ); - evt.data.preventDefault(); - } - else - pastebin.$.focus(); - } + pastebin.$.focus(); else { range.setStartAt( pastebin, CKEDITOR.POSITION_AFTER_START ); @@ -232,8 +223,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license // Wait a while and grab the pasted contents window.setTimeout( function() { - mode == 'text' && CKEDITOR.env.gecko && editor.focusGrabber.focus(); - pastebin.remove(); + // Restore properly the document focus. (#5684, #8849) + editor.document.getBody().focus(); + + editor.removeListener( 'selectionChange', cancel ); // Grab the HTML contents. // We need to look for a apple style wrapper on webkit it also adds @@ -245,7 +238,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license && ( bogusSpan.is && bogusSpan.hasClass( 'Apple-style-span' ) ) ? bogusSpan : pastebin ); + // IE7: selection must go before removing paste. (#8691) sel.selectBookmarks( bms ); + pastebin.remove(); callback( pastebin[ 'get' + ( mode == 'text' ? 'Value' : 'Html' ) ]() ); }, 0 ); } @@ -288,7 +283,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license // keyboard paste or execCommand ) (#4874). CKEDITOR.env.ie && ( depressBeforeEvent = 1 ); - var retval = editor.document.$.queryCommandEnabled( command ) ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED; + var retval = CKEDITOR.TRISTATE_OFF; + try { retval = editor.document.$.queryCommandEnabled( command ) ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED; }catch( er ){} + depressBeforeEvent = 0; return retval; } @@ -322,6 +319,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license else if ( data[ 'text' ] ) editor.insertText( data[ 'text' ] ); + setTimeout( function () { editor.fire( 'afterPaste' ); }, 0 ); + }, null, null, 1000 ); editor.on( 'pasteDialog', function( evt ) @@ -370,33 +369,68 @@ For licensing, see LICENSE.html or http://ckeditor.com/license editor.on( 'key', onKey, editor ); - var mode = editor.config.forcePasteAsPlainText ? 'text' : 'html'; - // We'll be catching all pasted content in one line, regardless of whether the // it's introduced by a document command execution (e.g. toolbar buttons) or // user paste behaviors. (e.g. Ctrl-V) editor.on( 'contentDom', function() { var body = editor.document.getBody(); - body.on( ( ( mode == 'text' && CKEDITOR.env.ie ) || CKEDITOR.env.webkit ) ? 'paste' : 'beforepaste', - function( evt ) + + // Intercept the paste before it actually takes place. + body.on( !CKEDITOR.env.ie ? 'paste' : 'beforepaste', function( evt ) { if ( depressBeforeEvent ) return; - getClipboardData.call( editor, evt, mode, function ( data ) + // Dismiss the (wrong) 'beforepaste' event fired on toolbar menu open. + var domEvent = evt.data && evt.data.$; + if ( CKEDITOR.env.ie && domEvent && !domEvent.ctrlKey ) + return; + + // Fire 'beforePaste' event so clipboard flavor get customized + // by other plugins. + var eventData = { mode : 'html' }; + editor.fire( 'beforePaste', eventData ); + + getClipboardData.call( editor, evt, eventData.mode, function ( data ) { // The very last guard to make sure the // paste has successfully happened. - if ( !data ) + if ( !( data = CKEDITOR.tools.trim( data.replace( /]+data-cke-bookmark[^<]*?<\/span>/ig,'' ) ) ) ) return; var dataTransfer = {}; - dataTransfer[ mode ] = data; + dataTransfer[ eventData.mode ] = data; editor.fire( 'paste', dataTransfer ); } ); }); + if ( CKEDITOR.env.ie ) + { + // Dismiss the (wrong) 'beforepaste' event fired on context menu open. (#7953) + body.on( 'contextmenu', function() + { + depressBeforeEvent = 1; + // Important: The following timeout will be called only after menu closed. + setTimeout( function() { depressBeforeEvent = 0; }, 0 ); + } ); + + // Handle IE's late coming "paste" event when pasting from + // browser toolbar/context menu. + body.on( 'paste', function( evt ) + { + if ( !editor.document.getById( 'cke_pastebin' ) ) + { + // Prevent native paste. + evt.data.preventDefault(); + + depressBeforeEvent = 0; + // Resort to the paste command. + pasteCmd.exec( editor ); + } + } ); + } + body.on( 'beforecut', function() { !depressBeforeEvent && fixCut( editor ); } ); body.on( 'mouseup', function(){ setTimeout( function(){ setToolbarStates.call( editor ); }, 0 ); }, editor );