Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixes #895 #1373

Closed
wants to merge 2 commits into from
Closed

fixes #895 #1373

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2db7efd
fixes #895
jackunion Jul 26, 2014
7f95ae6
missing semicolon
jackunion Jul 26, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/js/media/media.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,6 @@ vjs.MediaTechController.prototype.addControlsListeners = function(){
// so we'll check if the controls were already showing before reporting user
// activity
this.on('touchstart', function(event) {
// Stop the mouse events from also happening
event.preventDefault();
userWasActive = this.player_.userActive();
});

Expand All @@ -97,6 +95,11 @@ vjs.MediaTechController.prototype.addControlsListeners = function(){
this.player().reportUserActivity();
}
});

this.on('touchend', function(event) {
// Stop the mouse events from also happening
event.preventDefault();
});

// Turn on component tap events
this.emitTapEvents();
Expand Down