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

Prevent inserting unless there was an effective input, such as text being typed - this is done by checking the length of the range of the selection - if it's non-zero then there wasn't any input (because selecting text in the editor fill the input and selects it)

Browse source
This commit is contained in:
Trevor Parscal 2011-12-05 20:40:35 +00:00
parent 0938f24c5b
commit 8d5c83d87b
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
modules/es/views/es.SurfaceView.js
View file

@ -671,9 +671,25 @@ es.SurfaceView.prototype.handleEnter = function() {
es.SurfaceView.prototype.insertFromInput = function() { es.SurfaceView.prototype.insertFromInput = function() {
var selection = this.currentSelection.clone(), var selection = this.currentSelection.clone(),
val = this.$input.val(); val = this.$input.val();
this.$input.val( '' );
if ( val.length > 0 ) { if ( val.length > 0 ) {
//debugger; // Check if there was any effective input
var input = this.$input[0],
// Internet Explorer
range = document.selection && document.selection.createRange();
if (
// DOM 3.0
( 'selectionStart' in input && input.selectionEnd - input.selectionStart ) ||
// Internet Explorer
( range && range.text.length )
) {
// The input is still selected, so the key must not have inserted anything
return;
}
// Clear the value for more input
this.$input.val( '' );
// Prepare and process a transaction
var tx; var tx;
if ( selection.from != selection.to ) { if ( selection.from != selection.to ) {
tx = this.model.getDocument().prepareRemoval( selection ); tx = this.model.getDocument().prepareRemoval( selection );
@ -683,10 +699,10 @@ es.SurfaceView.prototype.insertFromInput = function() {
} }
var data = val.split(''); var data = val.split('');
es.DocumentModel.addAnnotationsToData( data, this.getInsertionAnnotations() ); es.DocumentModel.addAnnotationsToData( data, this.getInsertionAnnotations() );
tx = this.model.getDocument().prepareInsertion( selection.from, data ); tx = this.model.getDocument().prepareInsertion( selection.from, data );
this.model.transact( tx, true ); this.model.transact( tx, true );
// Move the selection
selection.from += val.length; selection.from += val.length;
selection.to += val.length; selection.to += val.length;
this.model.select( selection ); this.model.select( selection );