mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/Popups
synced 2024-11-24 07:34:11 +00:00
actions: Add token to LINK_ABANDON_*
Change-Id: I7f6187f6c0249c112a08163a343d35ee75cf85e8
This commit is contained in:
parent
46cd38849e
commit
4d736b9a78
|
@ -200,17 +200,21 @@
|
|||
* @return {Object}
|
||||
*/
|
||||
actions.linkAbandon = function ( el ) {
|
||||
return function ( dispatch ) {
|
||||
return function ( dispatch, getState ) {
|
||||
var token = getState().preview.activeToken;
|
||||
|
||||
dispatch( timedAction( {
|
||||
type: types.LINK_ABANDON_START,
|
||||
el: el
|
||||
el: el,
|
||||
token: token
|
||||
} ) );
|
||||
|
||||
mw.popups.wait( ABANDON_END_DELAY )
|
||||
.then( function () {
|
||||
dispatch( {
|
||||
type: types.LINK_ABANDON_END,
|
||||
el: el
|
||||
el: el,
|
||||
token: token
|
||||
} );
|
||||
} );
|
||||
};
|
||||
|
|
|
@ -276,16 +276,25 @@
|
|||
QUnit.test( 'it should dispatch start and end actions', function ( assert ) {
|
||||
var that = this,
|
||||
dispatch = that.sandbox.spy(),
|
||||
token = '0123456789',
|
||||
getState = function () {
|
||||
return {
|
||||
preview: {
|
||||
activeToken: token
|
||||
}
|
||||
};
|
||||
},
|
||||
done = assert.async();
|
||||
|
||||
this.sandbox.stub( mw, 'now' ).returns( new Date() );
|
||||
|
||||
mw.popups.actions.linkAbandon( that.el )( dispatch );
|
||||
mw.popups.actions.linkAbandon( that.el )( dispatch, getState );
|
||||
|
||||
assert.ok( dispatch.calledWith( {
|
||||
type: 'LINK_ABANDON_START',
|
||||
el: that.el,
|
||||
timestamp: mw.now()
|
||||
timestamp: mw.now(),
|
||||
token: token
|
||||
} ) );
|
||||
|
||||
// ---
|
||||
|
@ -296,10 +305,14 @@
|
|||
);
|
||||
|
||||
that.waitPromise.then( function () {
|
||||
assert.ok( dispatch.calledWith( {
|
||||
assert.ok(
|
||||
dispatch.calledWith( {
|
||||
type: 'LINK_ABANDON_END',
|
||||
el: that.el
|
||||
} ) );
|
||||
el: that.el,
|
||||
token: token
|
||||
} ),
|
||||
'LINK_ABANDON_* share the same token.'
|
||||
);
|
||||
|
||||
done();
|
||||
} );
|
||||
|
|
Loading…
Reference in a new issue