wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-15 02:23:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Copy-paste data fixes"

Browse source
This commit is contained in:
jenkins-bot 2013-08-27 20:21:00 +00:00 committed by Gerrit Code Review
parent 78141a6f33 99692230b1
commit 80ded50c8b
1 changed files with 39 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
modules/ve/ce/ve.ce.Surface.js
View file

@ -63,13 +63,16 @@ ve.ce.Surface = function VeCeSurface( model, surface, options ) {
$documentNode.focus(); $documentNode.focus();
} ); } );
this.$.on( { this.$document.on( {
'cut': ve.bind( this.onCut, this ), 'cut': ve.bind( this.onCut, this ),
'copy': ve.bind( this.onCopy, this ), 'copy': ve.bind( this.onCopy, this ),
'paste': ve.bind( this.onPaste, this ), 'paste': ve.bind( this.onPaste, this )
} );
this.$.on( {
'dragover': ve.bind( this.onDocumentDragOver, this ), 'dragover': ve.bind( this.onDocumentDragOver, this ),
'drop': ve.bind( this.onDocumentDrop, this ) 'drop': ve.bind( this.onDocumentDrop, this )
} ); } );
if ( $.browser.msie ) { if ( $.browser.msie ) {
this.$.on( 'beforepaste', ve.bind( this.onPaste, this ) ); this.$.on( 'beforepaste', ve.bind( this.onPaste, this ) );
} }
@ -590,21 +593,31 @@ ve.ce.Surface.prototype.onCut = function ( e ) {
* @method * @method
* @param {jQuery.Event} e Copy event * @param {jQuery.Event} e Copy event
*/ */
ve.ce.Surface.prototype.onCopy = function () { ve.ce.Surface.prototype.onCopy = function ( e ) {
var sel = rangy.getSelection( this.$document[0] ), var sel = rangy.getSelection( this.$document[0] ),
$frag = this.$$( sel.getRangeAt(0).cloneContents() ), $frag = sel.rangeCount ? this.$$( sel.getRangeAt(0).cloneContents() ) : null,
slice = this.documentView.model.getSlice( this.model.getSelection() ), slice = this.documentView.model.getSlice( this.model.getSelection() ),
key = ''; clipboardData = e.originalEvent.clipboardData,
fragText = $frag ? $frag.text() : '',
key = 've-' + fragText.replace( /\s/gm, '' );
// CLone the elements in the slice // CLone the elements in the slice
slice.cloneElements(); slice.cloneElements();
// Create key from text and element names // Check we have setData and that it actually works (returns true)
$frag.contents().each( function () { if ( clipboardData && clipboardData.setData && clipboardData.setData( 'text/xcustom', '' ) ) {
key += this.textContent || this.nodeName; // Webkit
} ); e.preventDefault();
key = 've-' + key.replace( /\s/gm, '' ); clipboardData.setData( 'text/xcustom', key );
// As we've disabled the default event we need to set the normal clipboard data
clipboardData.setData( 'text/plain', fragText );
} else {
if ( window.clipboardData ) {
// IE
e.originalEvent.returnValue = false;
window.clipboardData.setData( 'text/plain', fragText );
}
}
// Set clipboard // Set clipboard
this.clipboard[key] = slice; this.clipboard[key] = slice;
}; };
@ -615,7 +628,7 @@ ve.ce.Surface.prototype.onCopy = function () {
* @method * @method
* @param {jQuery.Event} e Paste event * @param {jQuery.Event} e Paste event
*/ */
ve.ce.Surface.prototype.onPaste = function () { ve.ce.Surface.prototype.onPaste = function ( e ) {
// Prevent pasting until after we are done // Prevent pasting until after we are done
if ( this.pasting ) { if ( this.pasting ) {
return false; return false;
@ -625,7 +638,10 @@ ve.ce.Surface.prototype.onPaste = function () {
var tx, scrollTop, var tx, scrollTop,
$window = $( ve.Element.getWindow( this.$$.context ) ), $window = $( ve.Element.getWindow( this.$$.context ) ),
view = this, view = this,
selection = this.model.getSelection(); selection = this.model.getSelection(),
clipboardData = e.originalEvent.clipboardData,
eventPasteKey = clipboardData.getData( 'text/xcustom' ) || null,
eventPasteText = clipboardData.getData( 'text/plain' ) || null;
this.surfaceObserver.stop( false, true ); this.surfaceObserver.stop( false, true );
@ -644,11 +660,16 @@ ve.ce.Surface.prototype.onPaste = function () {
var pasteData, slice, tx, var pasteData, slice, tx,
key = ''; key = '';
// Create key from text and element names if ( eventPasteKey ) {
view.$pasteTarget.hide().contents().each( function () { key = eventPasteKey;
key += this.textContent || this.nodeName; } else {
} ); if ( eventPasteText ) {
key = eventPasteText;
} else {
key = view.$pasteTarget.text();
}
key = 've-' + key.replace( /\s/gm, '' ); key = 've-' + key.replace( /\s/gm, '' );
}
// Get linear model from clipboard or create array from unknown pasted content // Get linear model from clipboard or create array from unknown pasted content
if ( view.clipboard[key] ) { if ( view.clipboard[key] ) {