web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-04-02 22:25:42 +02:00
Code Releases Activity

Merge branch 'feature/fix-timeupdates' of github.com:heff/video-js into heff-feature/tech-error

Browse Source
This commit is contained in:
Steve Heffernan 2014-04-25 15:38:44 -07:00
commit 16eea0a1df
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -9,6 +9,7 @@ CHANGELOG
* Fixed title support for menu buttons ([view](https://github.com/videojs/video.js/pull/1128)) * Fixed title support for menu buttons ([view](https://github.com/videojs/video.js/pull/1128))
* Fixed extra mousemove events on Windows caused by certain apps, not users [[view](https://github.com/videojs/video.js/pull/1068)] * Fixed extra mousemove events on Windows caused by certain apps, not users [[view](https://github.com/videojs/video.js/pull/1068)]
* Fixed error due to undefined tech when no source is supported [[view](https://github.com/videojs/video.js/pull/1172)] * Fixed error due to undefined tech when no source is supported [[view](https://github.com/videojs/video.js/pull/1172)]
* Fixed the progress bar not finishing when manual timeupdate events are used [[view](https://github.com/videojs/video.js/pull/1173)]
-------------------- --------------------

7
src/js/player.js
View File

@ -389,8 +389,13 @@ vjs.Player.prototype.trackCurrentTime = function(){
}; };
// Turn off play progress tracking (when paused or dragging) // Turn off play progress tracking (when paused or dragging)
vjs.Player.prototype.stopTrackingCurrentTime = function(){ clearInterval(this.currentTimeInterval); }; vjs.Player.prototype.stopTrackingCurrentTime = function(){
clearInterval(this.currentTimeInterval);
// #1002 - if the video ends right before the next timeupdate would happen,
// the progress bar won't make it all the way to the end
this.trigger('timeupdate');
};
// /* Player event handlers (how the player reacts to certain events) // /* Player event handlers (how the player reacts to certain events)
// ================================================================================ */ // ================================================================================ */