Skip to content

Commit

Permalink
@pavelhoral fixed a bug with user activity that caused the control ba…
Browse files Browse the repository at this point in the history
…r to flicker. closes #2299

Fixes #2298
  • Loading branch information
pavelhoral authored and heff committed Jul 2, 2015
1 parent d5605be commit 26a7862
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ CHANGELOG
* @mmcc fixed the progress handle transition jerkiness ([view](https://github.com/videojs/video.js/pull/2219))
* @dmlap added support for the seekable property ([view](https://github.com/videojs/video.js/pull/2208))
* @mmcc un-hid the current and remaining times by default ([view](https://github.com/videojs/video.js/pull/2241))
* @pavelhoral fixed a bug with user activity that caused the control bar to flicker ([view](https://github.com/videojs/video.js/pull/2299))

--------------------

Expand Down
3 changes: 1 addition & 2 deletions src/js/player.js
Original file line number Diff line number Diff line change
Expand Up @@ -1919,9 +1919,8 @@ class Player extends Component {
// `this.reportUserActivity` simply sets this.userActivity_ to true, which
// then gets picked up by this loop
// http://ejohn.org/blog/learning-from-twitter/
let inactivityTimeout;
let activityCheck = this.setInterval(function() {
let inactivityTimeout;

// Check to see if mouse/touch activity has happened
if (this.userActivity_) {
// Reset the activity tracker
Expand Down

0 comments on commit 26a7862

Please sign in to comment.