Skip to content

Commit f449917

Browse files
committed
chore(Ads): Simplify quartile management in Interstitials (#7689)
1 parent 674212d commit f449917

File tree

1 file changed

+15
-18
lines changed

1 file changed

+15
-18
lines changed

lib/ads/interstitial_ad_manager.js

+15-18
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,6 @@ shaka.ads.InterstitialAdManager = class {
704704
this.onEvent_(new shaka.util.FakeEvent(
705705
shaka.ads.Utils.AD_SKIP_STATE_CHANGED));
706706
}
707-
const eventsSent = new Set();
708707
this.adEventManager_.listenOnce(this.player_, 'error', error);
709708
this.adEventManager_.listen(this.video_, 'timeupdate', () => {
710709
const duration = this.video_.duration;
@@ -718,23 +717,21 @@ shaka.ads.InterstitialAdManager = class {
718717
new shaka.util.FakeEvent(shaka.ads.Utils.AD_SKIP_STATE_CHANGED));
719718
}
720719
prevCanSkipNow = currentCanSkipNow;
721-
const currentPercent = 100 * this.video_.currentTime / duration;
722-
if (currentPercent >= 25 && !eventsSent.has('firstquartile')) {
723-
updateBaseVideoTime();
724-
this.onEvent_(
725-
new shaka.util.FakeEvent(shaka.ads.Utils.AD_FIRST_QUARTILE));
726-
eventsSent.add('firstquartile');
727-
} else if (currentPercent >= 50 && !eventsSent.has('midpoint')) {
728-
updateBaseVideoTime();
729-
this.onEvent_(
730-
new shaka.util.FakeEvent(shaka.ads.Utils.AD_MIDPOINT));
731-
eventsSent.add('midpoint');
732-
} else if (currentPercent >= 75 && !eventsSent.has('thirdquartile')) {
733-
updateBaseVideoTime();
734-
this.onEvent_(
735-
new shaka.util.FakeEvent(shaka.ads.Utils.AD_THIRD_QUARTILE));
736-
eventsSent.add('thirdquartile');
737-
}
720+
});
721+
this.adEventManager_.listenOnce(this.player_, 'firstquartile', () => {
722+
updateBaseVideoTime();
723+
this.onEvent_(
724+
new shaka.util.FakeEvent(shaka.ads.Utils.AD_FIRST_QUARTILE));
725+
});
726+
this.adEventManager_.listenOnce(this.player_, 'midpoint', () => {
727+
updateBaseVideoTime();
728+
this.onEvent_(
729+
new shaka.util.FakeEvent(shaka.ads.Utils.AD_MIDPOINT));
730+
});
731+
this.adEventManager_.listenOnce(this.player_, 'thirdquartile', () => {
732+
updateBaseVideoTime();
733+
this.onEvent_(
734+
new shaka.util.FakeEvent(shaka.ads.Utils.AD_THIRD_QUARTILE));
738735
});
739736
this.adEventManager_.listenOnce(this.player_, 'complete', complete);
740737
this.adEventManager_.listen(this.video_, 'play', () => {

0 commit comments

Comments
 (0)