Merge localisation improvements with master and update #1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
closes videojs#2166 closes videojs#2126 this.tech.emitTapEvents(); should be handled by the tech De-dupe the bufferedPercent code in both Tech and Player Have the player generate the tech ID Added autoplay/preload/loop/muted to tech option Remove the watch for native timeupdates Fixed the JSDoc for bufferedPercent Removed the unit test for native timeupdate Added cute whitespaces buffer should always return a TimeRange
Preparing to export utility functions on the videojs object closes videojs#2182 Change el() to getEl() for consistency Cleaned up DOM functions library Clean up and document videojs object API Fixed mergeOptions to modify the first object instead of a copy More cleanup of the main video.js file and documentation Fixed issues with mergeOptions Cleaned up the addLanguage function Removed unnecessary underscores in private module vars
closes videojs#2132 removed slider handle classes Got rid of left-over handle styles
Conflicts: src/js/player.js src/js/video.js
mister-ben
added a commit
that referenced
this pull request
May 25, 2015
…alise Merge localisation improvements with master and update
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I merge your PR with master and then made a few tweeks. It'd probably be easiest to look at the last two commits to see the specific changes I made.
Let me know if they look good to you or if you have any questions. I'm gonna go ahead and merge this in so it doesn't get behind other PRs, but we can make follow up changes.