Skip to content

Commit 3744df1

Browse files
test: fix travis ci issues with resize-manager tests (videojs#5390)
1 parent 4a299a7 commit 3744df1

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

src/js/resize-manager.js

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,21 +59,22 @@ class ResizeManager extends Component {
5959
this.resizeObserver_ = null;
6060
this.debouncedHandler_ = debounce(() => {
6161
this.resizeHandler();
62-
}, 100, false, player);
62+
}, 100, false, this);
6363

6464
if (RESIZE_OBSERVER_AVAILABLE) {
6565
this.resizeObserver_ = new this.ResizeObserver(this.debouncedHandler_);
6666
this.resizeObserver_.observe(player.el());
6767

6868
} else {
6969
this.loadListener_ = () => {
70-
if (this.el_.contentWindow) {
71-
Events.on(this.el_.contentWindow, 'resize', this.debouncedHandler_);
70+
if (!this.el_ || this.el_.contentWindow) {
71+
return;
7272
}
73-
this.off('load', this.loadListener_);
73+
74+
Events.on(this.el_.contentWindow, 'resize', this.debouncedHandler_);
7475
};
7576

76-
this.on('load', this.loadListener_);
77+
this.one('load', this.loadListener_);
7778
}
7879
}
7980

@@ -95,10 +96,20 @@ class ResizeManager extends Component {
9596
* @event Player#playerresize
9697
* @type {EventTarget~Event}
9798
*/
99+
// make sure player is still around to trigger
100+
// prevents this from causing an error after dispose
101+
if (!this.player_ || !this.player_.trigger) {
102+
return;
103+
}
104+
98105
this.player_.trigger('playerresize');
99106
}
100107

101108
dispose() {
109+
if (this.debouncedHandler_) {
110+
this.debouncedHandler_.cancel();
111+
}
112+
102113
if (this.resizeObserver_) {
103114
if (this.player_.el()) {
104115
this.resizeObserver_.unobserve(this.player_.el());
@@ -114,15 +125,10 @@ class ResizeManager extends Component {
114125
this.off('load', this.loadListener_);
115126
}
116127

117-
if (this.debouncedHandler_) {
118-
this.debouncedHandler_.cancel();
119-
}
120-
121128
this.ResizeObserver = null;
122129
this.resizeObserver = null;
123130
this.debouncedHandler_ = null;
124131
this.loadListener_ = null;
125-
super.dispose();
126132
}
127133

128134
}

0 commit comments

Comments
 (0)