wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-26 19:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

.change( null, foo ) -> .setSelection( foo )

Browse source 
Change-Id: Iaba76ac17888a7825f5a9cd1c383d4f429454278
This commit is contained in:
Roan Kattouw 2013-10-15 20:36:02 +02:00 committed by David Chan
parent 06c968645e
commit 534f0bdde7
10 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
View file

@ -1669,7 +1669,7 @@ ve.init.mw.ViewPageTarget.prototype.restoreEditSection = function () {
offset = surfaceModel.getDocument().data.getNearestContentOffset(
offsetNode.getModel().getOffset(), 1
);
surfaceModel.change( null, new ve.Range( offset ) );
surfaceModel.setSelection( new ve.Range( offset ) );
// Scroll to heading:
// Wait for toolbar to animate in so we can account for its height
setTimeout( function () {

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

@ -386,7 +386,7 @@ ve.ce.Surface.prototype.onDocumentMouseDown = function ( e ) {
while ( node.parent !== null && node.model.isContent() ) {
node = node.parent;
}
this.model.change( null, node.model.getRange() );
this.model.setSelection( node.model.getRange() );
}
};
@ -600,7 +600,7 @@ ve.ce.Surface.prototype.onDocumentKeyPress = function ( e ) {
prevNode.isContent() &&
documentModel.data.isCloseElementData( selection.start - 1 )
) {
this.model.change( null, new ve.Range( selection.start ) );
this.model.setSelection( new ve.Range( selection.start ) );
}
}
}
@ -885,7 +885,7 @@ ve.ce.Surface.prototype.afterPaste = function () {
selection = tx.translateRange( selection );
this.model.change( tx, new ve.Range( selection.start ) );
// Move cursor to end of selection
this.model.change( null, new ve.Range( selection.end ) );
this.model.setSelection( new ve.Range( selection.end ) );
// Allow pasting again
this.pasting = false;
@ -1257,7 +1257,7 @@ ve.ce.Surface.prototype.handleLeftOrRightArrowKey = function ( e ) {
( e.altKey === true || e.ctrlKey === true ) ? 'word' : 'character',
e.shiftKey
);
this.model.change( null, range );
this.model.setSelection( range );
// TODO: onDocumentKeyDown does this anyway
this.surfaceObserver.startTimerLoop();
this.surfaceObserver.pollOnce();
@ -1311,7 +1311,7 @@ ve.ce.Surface.prototype.handleUpOrDownArrowKey = function ( e ) {
} else { // collapsed range (just a cursor)
range = new ve.Range( this.model.getSelection().to );
}
this.model.change( null, range );
this.model.setSelection( range );
this.surfaceObserver.pollOnce();
}, this ), 0 );
} else {
@ -1496,12 +1496,12 @@ ve.ce.Surface.prototype.handleEnter = function ( e ) {
// Now we can move the cursor forward
if ( advanceCursor ) {
this.model.change(
null, new ve.Range( documentModel.data.getRelativeContentOffset( selection.from, 1 ) )
this.model.setSelection(
new ve.Range( documentModel.data.getRelativeContentOffset( selection.from, 1 ) )
);
} else {
this.model.change(
null, new ve.Range( documentModel.data.getNearestContentOffset( selection.from ) )
this.model.setSelection(
new ve.Range( documentModel.data.getNearestContentOffset( selection.from ) )
);
}
// Reset and resume polling
@ -1539,7 +1539,7 @@ ve.ce.Surface.prototype.handleDelete = function ( e, backspace ) {
// just select the node and cancel the deletion.
startNode = this.documentView.getDocumentNode().getNodeFromOffset( offset + 1 );
if ( startNode.isFocusable() ) {
this.model.change( null, startNode.getModel().getOuterRange() );
this.model.setSelection( startNode.getModel().getOuterRange() );
return;
}
}
@ -1598,7 +1598,7 @@ ve.ce.Surface.prototype.handleDelete = function ( e, backspace ) {
}
}
}
this.model.change( null, new ve.Range( rangeToRemove.start ) );
this.model.setSelection( new ve.Range( rangeToRemove.start ) );
this.surfaceObserver.clear();
};

2
modules/ve/dm/ve.dm.SurfaceFragment.js
View file

@ -445,7 +445,7 @@ ve.dm.SurfaceFragment.prototype.select = function () {
if ( !this.surface ) {
return this;
}
this.surface.change( null, this.getRange() );
this.surface.setSelection( this.getRange() );
return this;
};

2
modules/ve/test/ce/ve.ce.Surface.test.js
View file

@ -31,7 +31,7 @@ ve.test.utils.runSurfaceHandleDeleteTest = function( assert, html, range, operat
selection = s;
} );
model.change( null, range );
model.setSelection( range );
for ( i = 0; i < operations.length; i++ ) {
args = deleteArgs[operations[i]];
view.handleDelete( args[0], args[1] );

2
modules/ve/test/dm/ve.dm.Surface.test.js
View file

@ -50,7 +50,7 @@ QUnit.test( 'change', 3, function ( assert ) {
} );
surface.change( tx.clone() );
assert.deepEqual( events, { 'documentUpdate': 1, 'select': 0 }, 'transaction without selection' );
surface.change( null, new ve.Range( 2, 2 ) );
surface.setSelection( new ve.Range( 2, 2 ) );
assert.deepEqual( events, { 'documentUpdate': 1, 'select': 1 }, 'selection without transaction' );
surface.change( tx.clone(), new ve.Range( 3, 3 ) );
assert.deepEqual( events, { 'documentUpdate': 2, 'select': 2 }, 'transaction and selection' );

2
modules/ve/test/ui/actions/ve.ui.IndentationAction.test.js
View file

@ -20,7 +20,7 @@ function runIndentationChangeTest( assert, range, method, expectedSelection, exp
expectedOriginalData( originalData );
}
surface.getModel().change( null, range );
surface.getModel().setSelection( range );
indentationAction[method]();
assert.deepEqual( surface.getModel().getDocument().getFullData(), data, msg + ': data models match' );

2
modules/ve/test/ui/actions/ve.ui.ListAction.test.js
View file

@ -19,7 +19,7 @@ function runListConverterTest( assert, html, method, style, range, expectedSelec
if ( expectedOriginalData ) {
expectedOriginalData( originalData );
}
surface.getModel().change( null, range );
surface.getModel().setSelection( range );
listAction[method]( style );
assert.deepEqual( surface.getModel().getDocument().getFullData(), data, msg + ': data models match' );

2
modules/ve/test/ve.test.utils.js
View file

@ -33,7 +33,7 @@ ve.test.utils.runFormatConverterTest = function ( assert, range, type, attribute
expectedData( data );
surface.getModel().change( null, range );
surface.getModel().setSelection( range );
formatAction.convert( type, attributes );
assert.deepEqual( surface.getModel().getDocument().getFullData(), data, msg + ': data models match' );

2
modules/ve/ui/actions/ve.ui.ContentAction.js
View file

@ -63,7 +63,7 @@ ve.ui.ContentAction.prototype.remove = function () {
* @param {ve.Range} range Range to select
*/
ve.ui.ContentAction.prototype.select = function ( range ) {
this.surface.getModel().change( null, range );
this.surface.getModel().setSelection( range );
};
/* Registration */

2
modules/ve/ui/actions/ve.ui.IndentationAction.js
View file

@ -188,7 +188,7 @@ ve.ui.IndentationAction.prototype.indentListItem = function ( listItem ) {
// TODO If this listItem has a child list, split&unwrap it
surfaceModel.change( null, selection );
surfaceModel.setSelection( selection );
};
/**