Reveal.add/remveEventListener -> Reveal.on/off

This commit is contained in:
Hakim El Hattab
2020-04-07 09:05:56 +02:00
parent f24620018f
commit 855cc82d76
17 changed files with 113 additions and 91 deletions

View File

@ -37,12 +37,14 @@
<script>
let r1 = new Reveal( document.querySelector( '.deck1' ), {
embedded: true
embedded: true,
keyboard: false
} );
r1.initialize();
let r2 = new Reveal( document.querySelector( '.deck2' ), {
embedded: true
embedded: true,
keyboard: false
} );
r2.initialize();

View File

@ -20,12 +20,12 @@
<div class="slides">
<section data-background-iframe="#1">1</section>
<section data-background-iframe="#2">2</section>
<section data-background-iframe="#3" data-preload>3</section>
<section data-background-iframe="#4">4</section>
<section data-background-iframe="#5">5</section>
<section data-background-iframe="#6">6</section>
<section data-background-iframe="https://revealjs.com">1</section>
<section data-background-iframe="https://revealjs.com">2</section>
<section data-background-iframe="https://revealjs.com" data-preload>3</section>
<section data-background-iframe="https://revealjs.com">4</section>
<section data-background-iframe="https://revealjs.com">5</section>
<section data-background-iframe="https://revealjs.com">6</section>
</div>

View File

@ -80,7 +80,7 @@
assert.strictEqual( initCounter['PluginC'], 0, 'async plugin not immediately initialized' );
reveal.addEventListener( 'ready', function() {
reveal.on( 'ready', function() {
assert.strictEqual( initCounter['PluginC'], 1, 'finsihed initializing when reveal.js dispatches "ready"' );
done();

View File

@ -59,14 +59,14 @@
state2();
}
Reveal.addEventListener( 'state1', _onState1 );
Reveal.addEventListener( 'state2', _onState2 );
Reveal.on( 'state1', _onState1 );
Reveal.on( 'state2', _onState2 );
Reveal.slide( 1 );
Reveal.slide( 3 );
Reveal.removeEventListener( 'state1', _onState1 );
Reveal.removeEventListener( 'state2', _onState2 );
Reveal.off( 'state1', _onState1 );
Reveal.off( 'state2', _onState2 );
});
QUnit.test( 'Fire state events for vertical slides', function( assert ) {
@ -83,15 +83,15 @@
done();
}
Reveal.addEventListener( 'state1', _onState1 );
Reveal.addEventListener( 'state3', _onState3 );
Reveal.on( 'state1', _onState1 );
Reveal.on( 'state3', _onState3 );
Reveal.slide( 0 );
Reveal.slide( 4, 1 );
Reveal.slide( 4, 2 );
Reveal.removeEventListener( 'state1', _onState1 );
Reveal.removeEventListener( 'state3', _onState3 );
Reveal.off( 'state1', _onState1 );
Reveal.off( 'state3', _onState3 );
});
QUnit.test( 'No events if state remains unchanged', function( assert ) {
@ -101,7 +101,7 @@
stateChanges += 1;
}
Reveal.addEventListener( 'state1', _onEvent );
Reveal.on( 'state1', _onEvent );
Reveal.slide( 0 ); // no state
Reveal.slide( 1 ); // state1
@ -111,7 +111,7 @@
Reveal.slide( 4, 1 ); // state1
Reveal.slide( 0 ); // no state
Reveal.removeEventListener( 'state1', _onEvent );
Reveal.off( 'state1', _onEvent );
assert.strictEqual( stateChanges, 1, 'no event was fired when going to slide with same state' );
});
@ -121,12 +121,12 @@
assert.ok( Reveal.getCurrentSlide() == document.querySelector( '#slide2' ), 'correct current slide immediately after state event' );
}
Reveal.addEventListener( 'state1', _onEvent );
Reveal.on( 'state1', _onEvent );
Reveal.slide( 0 );
Reveal.slide( 1 );
Reveal.removeEventListener( 'state1', _onEvent );
Reveal.off( 'state1', _onEvent );
});
} );

View File

@ -456,7 +456,7 @@
done();
}
Reveal.addEventListener( 'fragmentshown', _onEvent );
Reveal.on( 'fragmentshown', _onEvent );
Reveal.slide( 2, 0 );
Reveal.slide( 2, 0 ); // should do nothing
@ -465,7 +465,7 @@
Reveal.next();
Reveal.prev(); // shouldn't fire fragmentshown
Reveal.removeEventListener( 'fragmentshown', _onEvent );
Reveal.off( 'fragmentshown', _onEvent );
});
QUnit.test( 'fragmenthidden event', function( assert ) {
@ -477,7 +477,7 @@
done();
}
Reveal.addEventListener( 'fragmenthidden', _onEvent );
Reveal.on( 'fragmenthidden', _onEvent );
Reveal.slide( 2, 0, 2 );
Reveal.slide( 2, 0, 2 ); // should do nothing
@ -485,7 +485,7 @@
Reveal.prev();
Reveal.next(); // shouldn't fire fragmenthidden
Reveal.removeEventListener( 'fragmenthidden', _onEvent );
Reveal.off( 'fragmenthidden', _onEvent );
});
@ -524,13 +524,13 @@
done();
}
Reveal.addEventListener( 'autoslidepaused', _onEvent );
Reveal.on( 'autoslidepaused', _onEvent );
Reveal.configure({ autoSlide: 10000 });
Reveal.toggleAutoSlide();
// cleanup
Reveal.configure({ autoSlide: 0 });
Reveal.removeEventListener( 'autoslidepaused', _onEvent );
Reveal.off( 'autoslidepaused', _onEvent );
});
QUnit.test( 'autoslideresumed', function( assert ) {
@ -542,14 +542,14 @@
done();
}
Reveal.addEventListener( 'autoslideresumed', _onEvent );
Reveal.on( 'autoslideresumed', _onEvent );
Reveal.configure({ autoSlide: 10000 });
Reveal.toggleAutoSlide();
Reveal.toggleAutoSlide();
// cleanup
Reveal.configure({ autoSlide: 0 });
Reveal.removeEventListener( 'autoslideresumed', _onEvent );
Reveal.off( 'autoslideresumed', _onEvent );
});
@ -643,7 +643,7 @@
done();
}
Reveal.addEventListener( 'slidechanged', _onEvent );
Reveal.on( 'slidechanged', _onEvent );
Reveal.slide( 1, 0 ); // should trigger
Reveal.slide( 1, 0 ); // should do nothing
@ -651,7 +651,7 @@
Reveal.slide( 3, 0 ); // should trigger
Reveal.next(); // should do nothing
Reveal.removeEventListener( 'slidechanged', _onEvent );
Reveal.off( 'slidechanged', _onEvent );
});
@ -664,12 +664,12 @@
done();
}
Reveal.addEventListener( 'paused', _onEvent );
Reveal.on( 'paused', _onEvent );
Reveal.togglePause();
Reveal.togglePause();
Reveal.removeEventListener( 'paused', _onEvent );
Reveal.off( 'paused', _onEvent );
});
QUnit.test( 'resumed', function( assert ) {
@ -681,12 +681,12 @@
done();
}
Reveal.addEventListener( 'resumed', _onEvent );
Reveal.on( 'resumed', _onEvent );
Reveal.togglePause();
Reveal.togglePause();
Reveal.removeEventListener( 'resumed', _onEvent );
Reveal.off( 'resumed', _onEvent );
});
} );