jenkins-bot has submitted this change and it was merged.
Change subject: .change( null, foo ) -> .setSelection( foo )
......................................................................
.change( null, foo ) -> .setSelection( foo )
Change-Id: Iaba76ac17888a7825f5a9cd1c383d4f429454278
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
M modules/ve/ce/ve.ce.Surface.js
M modules/ve/dm/ve.dm.SurfaceFragment.js
M modules/ve/test/ce/ve.ce.Surface.test.js
M modules/ve/test/dm/ve.dm.Surface.test.js
M modules/ve/test/ui/actions/ve.ui.IndentationAction.test.js
M modules/ve/test/ui/actions/ve.ui.ListAction.test.js
M modules/ve/test/ve.test.utils.js
M modules/ve/ui/actions/ve.ui.ContentAction.js
M modules/ve/ui/actions/ve.ui.IndentationAction.js
10 files changed, 20 insertions(+), 20 deletions(-)
Approvals:
Divec: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index 7f483c4..287abb2 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -1669,7 +1669,7 @@
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 () {
diff --git a/modules/ve/ce/ve.ce.Surface.js b/modules/ve/ce/ve.ce.Surface.js
index e942e6f..cc880b3 100644
--- a/modules/ve/ce/ve.ce.Surface.js
+++ b/modules/ve/ce/ve.ce.Surface.js
@@ -386,7 +386,7 @@
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 @@
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 @@
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 @@
( 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 @@
} 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 @@
// 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 @@
// 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 @@
}
}
}
- this.model.change( null, new ve.Range( rangeToRemove.start ) );
+ this.model.setSelection( new ve.Range( rangeToRemove.start ) );
this.surfaceObserver.clear();
};
diff --git a/modules/ve/dm/ve.dm.SurfaceFragment.js
b/modules/ve/dm/ve.dm.SurfaceFragment.js
index 794bf78..86953b0 100644
--- a/modules/ve/dm/ve.dm.SurfaceFragment.js
+++ b/modules/ve/dm/ve.dm.SurfaceFragment.js
@@ -445,7 +445,7 @@
if ( !this.surface ) {
return this;
}
- this.surface.change( null, this.getRange() );
+ this.surface.setSelection( this.getRange() );
return this;
};
diff --git a/modules/ve/test/ce/ve.ce.Surface.test.js
b/modules/ve/test/ce/ve.ce.Surface.test.js
index d0b30fb..c6a85a6 100644
--- a/modules/ve/test/ce/ve.ce.Surface.test.js
+++ b/modules/ve/test/ce/ve.ce.Surface.test.js
@@ -31,7 +31,7 @@
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] );
diff --git a/modules/ve/test/dm/ve.dm.Surface.test.js
b/modules/ve/test/dm/ve.dm.Surface.test.js
index bd0df64..bcaef09 100644
--- a/modules/ve/test/dm/ve.dm.Surface.test.js
+++ b/modules/ve/test/dm/ve.dm.Surface.test.js
@@ -50,7 +50,7 @@
} );
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' );
diff --git a/modules/ve/test/ui/actions/ve.ui.IndentationAction.test.js
b/modules/ve/test/ui/actions/ve.ui.IndentationAction.test.js
index df98ae9..d5a56b2 100644
--- a/modules/ve/test/ui/actions/ve.ui.IndentationAction.test.js
+++ b/modules/ve/test/ui/actions/ve.ui.IndentationAction.test.js
@@ -20,7 +20,7 @@
expectedOriginalData( originalData );
}
- surface.getModel().change( null, range );
+ surface.getModel().setSelection( range );
indentationAction[method]();
assert.deepEqual( surface.getModel().getDocument().getFullData(), data,
msg + ': data models match' );
diff --git a/modules/ve/test/ui/actions/ve.ui.ListAction.test.js
b/modules/ve/test/ui/actions/ve.ui.ListAction.test.js
index bf4a1d5..cf663a7 100644
--- a/modules/ve/test/ui/actions/ve.ui.ListAction.test.js
+++ b/modules/ve/test/ui/actions/ve.ui.ListAction.test.js
@@ -19,7 +19,7 @@
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' );
diff --git a/modules/ve/test/ve.test.utils.js b/modules/ve/test/ve.test.utils.js
index 2fb5093..b7adce3 100644
--- a/modules/ve/test/ve.test.utils.js
+++ b/modules/ve/test/ve.test.utils.js
@@ -33,7 +33,7 @@
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' );
diff --git a/modules/ve/ui/actions/ve.ui.ContentAction.js
b/modules/ve/ui/actions/ve.ui.ContentAction.js
index 1b37bbe..e53f960 100644
--- a/modules/ve/ui/actions/ve.ui.ContentAction.js
+++ b/modules/ve/ui/actions/ve.ui.ContentAction.js
@@ -63,7 +63,7 @@
* @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 */
diff --git a/modules/ve/ui/actions/ve.ui.IndentationAction.js
b/modules/ve/ui/actions/ve.ui.IndentationAction.js
index 5b83b43..cf8381f 100644
--- a/modules/ve/ui/actions/ve.ui.IndentationAction.js
+++ b/modules/ve/ui/actions/ve.ui.IndentationAction.js
@@ -188,7 +188,7 @@
// TODO If this listItem has a child list, split&unwrap it
- surfaceModel.change( null, selection );
+ surfaceModel.setSelection( selection );
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/89876
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaba76ac17888a7825f5a9cd1c383d4f429454278
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Divec <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
