Merge remote-tracking branch 'upstream/master'

.npmignore

@@ -1,3 +1,4 @@
 # Exclude everything but the contents of the dist directory.
 **/*
 !dist/**
+!src/css/**

.travis.yml

@@ -1,8 +1,6 @@
 language: node_js
 node_js:
   - 0.12
-before_script:
-  - if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then curl https://gist.githubusercontent.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash; fi
 before_install:
   - export CHROME_BIN=chromium-browser
   - export DISPLAY=:99.0

CHANGELOG.md

@@ -2,6 +2,21 @@ CHANGELOG
 =========
 
 ## HEAD (Unreleased)
+* @typcn bumped grunt-sass to ^1.0.0 to support node 4.x ([view](https://github.com/videojs/video.js/pull/2645))
+* @gkatsev removed unhelpful isCrossOrigin test ([view](https://github.com/videojs/video.js/pull/2715))
+* @forbesjo updated karma to use all installed browsers for unit tests ([view](https://github.com/videojs/video.js/pull/2708))
+* @forbesjo removed android/ios tests to increase build stability ([view](https://github.com/videojs/video.js/pull/2739))
+* @nickygerritsen added canPlayType method to player ([view](https://github.com/videojs/video.js/pull/2709))
+
+--------------------
+
+## 5.0.2 (2015-10-23)
+* @imbcmdth fixed an issue with emulateTextTracks being called before the tech dom was ready ([view](https://github.com/videojs/video.js/pull/2692))
+* @gkatsev bumped obj.assign to fix uncaught SecurityError in iframes. Fixes #2703 ([view](https://github.com/videojs/video.js/pull/2721))
+* @gkatsev updated contrib update and have contrib release only update local branches ([view](https://github.com/videojs/video.js/pull/2723))
+* @gkatsev bumped chg to fix stalling issues ([view](https://github.com/videojs/video.js/pull/2732))
+
+## 5.0.0 (2015-09-29)
 * @carpasse infer MIME types from file extensions in the HTML5 and Flash techs ([view](https://github.com/videojs/video.js/pull/1974))
 * @mmcc updated the slider to allow for vertical orientation ([view](https://github.com/videojs/video.js/pull/1816))
 * @dmlap removed an ie6 hack for flash object embedding ([view](https://github.com/videojs/video.js/pull/1946))
@@ -83,10 +98,113 @@ CHANGELOG
 * @heff use a synchronous ready() internally ([view](https://github.com/videojs/video.js/pull/2392))
 * @nickygerritsen scrubbing() is a method, not a property ([view](https://github.com/videojs/video.js/pull/2411))
 * @sirlancelot change "video" to "media" in error messages ([view](https://github.com/videojs/video.js/pull/2409))
-* @sirlancelot change "video" to "media" in error messages ([view](https://github.com/videojs/video.js/pull/2409))
 * @nickygerritsen use the default seekable when a source handler is unset ([view](https://github.com/videojs/video.js/pull/2401))
-
---------------------
+* @gkatsev always use emulated TextTrackLists so tracks survive tech switches ([view](https://github.com/videojs/video.js/pull/2425))
+* @misteroneill restore Html5.Events ([view](https://github.com/videojs/video.js/pull/2421))
+* @misteroneill removed the deprecated Component init method ([view](https://github.com/videojs/video.js/pull/2427))
+* @misteroneill restore videojs.formatTime ([view](https://github.com/videojs/video.js/pull/2420))
+* @misteroneill include child components with `true` in options ([view](https://github.com/videojs/video.js/pull/2424))
+* @misteroneill create video.novtt.js in dist builds ([view](https://github.com/videojs/video.js/pull/2447))
+* @misteroneill pass vtt.js option to tech ([view](https://github.com/videojs/video.js/pull/2448))
+* @forbesjo updated the sauce labs config and browser versions ([view](https://github.com/videojs/video.js/pull/2450))
+* @mmcc made sure controls respect muted attribute ([view](https://github.com/videojs/video.js/pull/2408))
+* @dmlap switched global options back to an object at videojs.options ([view](https://github.com/videojs/video.js/pull/2461))
+* @ogun fixed a typo in the Turkish translation ([view](https://github.com/videojs/video.js/pull/2460))
+* @gkatsev fixed text track errors on dispose and in cross-browser testing ([view](https://github.com/videojs/video.js/pull/2466))
+* @mmcc added type=button to button components ([view](https://github.com/videojs/video.js/pull/2471))
+* @mmcc Fixed IE by using setAttribute to set 'type' property ([view](https://github.com/videojs/video.js/pull/2487))
+* @misternoneill fixed vertical slider issues ([view](https://github.com/videojs/video.js/pull/2469))
+* @gkatsev moved default and player dimensions to style els at the top of HEAD ([view](https://github.com/videojs/video.js/pull/2482))
+* @gkatsev moved default and player dimensions to style els at the top of HEAD el ([view](https://github.com/videojs/video.js/pull/2482))
+* @gkatsev removed non-default track auto-disabling ([view](https://github.com/videojs/video.js/pull/2475))
+* @gkatsev exported event helpers on videojs object ([view](https://github.com/videojs/video.js/pull/2491))
+* @nickygerritsen fixed texttrack handling in IE10 ([view](https://github.com/videojs/video.js/pull/2481))
+* @gkatsev deep clone el for iOS to preserve tracks ([view](https://github.com/videojs/video.js/pull/2494))
+* @forbesjo switched automated testing to BrowserStack ([view](https://github.com/videojs/video.js/pull/2492))
+* @gkatsev fixed nativeControlsForTouch handling. Defaults to native controls on iphone and native android browsers. ([view](https://github.com/videojs/video.js/pull/2499))
+* @heff fixed cross-platform track tests by switching to a fake tech ([view](https://github.com/videojs/video.js/pull/2496))
+* @gkatsev improved tech controls listener handling. ([view](https://github.com/videojs/video.js/pull/2511))
+* @dmlap move seek on replay into the flash tech ([view](https://github.com/videojs/video.js/pull/2527))
+* @dmlap @gkatsev improve Flash tech error property and add an error setter to the base tech ([view](https://github.com/videojs/video.js/pull/2517))
+* @dmlap update to videojs-swf 5.0.0-rc1 ([view](https://github.com/videojs/video.js/pull/2528))
+* @dmlap expose start and end buffered times ([view](https://github.com/videojs/video.js/pull/2501))
+* @heff fixed a number of console errors after testing ([view](https://github.com/videojs/video.js/pull/2513))
+* @gkatsev made the sass files available via npm in src/css ([view](https://github.com/videojs/video.js/pull/2546))
+* @heff removed playerOptions from plugin options because it created an inconsistency in plugin inits ([view](https://github.com/videojs/video.js/pull/2532))
+* @heff added a default data attribute to fix the progress handle display in IE8 ([view](https://github.com/videojs/video.js/pull/2547))
+* @heff added back the default cdn url for the swf ([view](https://github.com/videojs/video.js/pull/2533))
+* @gkatsev fixed the default state of userActive ([view](https://github.com/videojs/video.js/pull/2557))
+* @heff fixed event bubbling in IE8 ([view](https://github.com/videojs/video.js/pull/2563))
+* @heff cleaned up internal duration handling ([view](https://github.com/videojs/video.js/pull/2552))
+* @heff fixed the UI for live streams ([view](https://github.com/videojs/video.js/pull/2557))
+* @gkatsev updated opacity of caption settings background color ([view](https://github.com/videojs/video.js/pull/2573))
+* @gkatsev made all sass variables !default ([view](https://github.com/videojs/video.js/pull/2574))
+* @heff fixed the inline volume control and made it the default ([view](https://github.com/videojs/video.js/pull/2553))
+* @forbesjo fixed webkit deprecation warnings ([view](https://github.com/videojs/video.js/pull/2558))
+* @forbesjo added Android and iOS browser testing ([view](https://github.com/videojs/video.js/pull/2538))
+* @heff improved css selector strengths ([view](https://github.com/videojs/video.js/pull/2583))
+* @heff moved scss vars to be private ([view](https://github.com/videojs/video.js/pull/2584))
+* @heff added a fancy loading spinner ([view](https://github.com/videojs/video.js/pull/2582))
+* @gkatsev added a mouse-hover time display to the progress bar ([view](https://github.com/videojs/video.js/pull/2569))
+* @heff added an attributes argument to createEl() ([view](https://github.com/videojs/video.js/pull/2589))
+* @heff made tech related functions private in the player ([view](https://github.com/videojs/video.js/pull/2590))
+* @heff removed the loadedalldata event ([view](https://github.com/videojs/video.js/pull/2591))
+* @dmlap switched to using raynos/xhr for requests ([view](https://github.com/videojs/video.js/pull/2594))
+* @heff Fixed double loadstart and ready events ([view](https://github.com/videojs/video.js/pull/2605))
+* @gkatsev fixed potential double default style elements ([view](https://github.com/videojs/video.js/pull/2619))
+* @imbcmdth extended createTimeRange to support multiple timeranges ([view](https://github.com/videojs/video.js/pull/2604))
+* @misteroneill rename "extends" to "extend" for ie8 ([view](https://github.com/videojs/video.js/pull/2624))
+* @forbesjo removed the PhantomJS dependency ([view](https://github.com/videojs/video.js/pull/2622))
+* @misteroneill re-exposed videojs.TextTrack ([view](https://github.com/videojs/video.js/pull/2625))
+* @heff removed a second copy of video.novtt.js from dist ([view](https://github.com/videojs/video.js/pull/2630))
+* @heff fixed timeranges deprecation warnings in tests ([view](https://github.com/videojs/video.js/pull/2627))
+* @misteroneill updated play control to use its state for icon ([view](https://github.com/videojs/video.js/pull/2636))
+* @gkatsev exposed isCrossOrigin and used it to enable CORS for textTrack XHRs ([view](https://github.com/videojs/video.js/pull/2633))
+* @misteroneill fixed tsml to be used as a tag for template strings ([view](https://github.com/videojs/video.js/pull/2629))
+* @eXon added support for a tech-supplied poster ([view](https://github.com/videojs/video.js/pull/2339))
+* @heff improved some skin defaults for external styling ([view](https://github.com/videojs/video.js/pull/2642))
+* @heff changed component child lists to arrays instead of objects ([view](https://github.com/videojs/video.js/pull/2477))
+
+## 4.12.15 (2015-08-31)
+* @dmlap update to videojs-swf 4.7.4 ([view](https://github.com/videojs/video.js/pull/2463))
+* @bc-bbay migrate seeking on replay to the flash tech ([view](https://github.com/videojs/video.js/pull/2519))
+* Updated to v4.7.5 of the swf ([view](https://github.com/videojs/video.js/pull/2531))
+
+## 4.12.14 (2015-08-21)
+* @gkatsev removed non-default track auto-disabling ([view](https://github.com/videojs/video.js/pull/2468))
+
+## 4.12.13 (2015-08-10)
+* @dmlap update to videojs-swf v4.7.3 ([view](https://github.com/videojs/video.js/pull/2457))
+
+## 4.12.12 (2015-07-23)
+* @imbcmdth updated source handlers to use bracket notation so they wont break when using minified videojs ([view](https://github.com/videojs/video.js/pull/2348))
+* @imbcmdth fix potential triggerReady infinite loop ([view](https://github.com/videojs/video.js/pull/2398))
+
+## 4.12.11 (2015-07-09)
+* @saxena-gaurav updated swf to 4.7.2 to fix flash of previous video frame ([view](https://github.com/videojs/video.js/pull/2300))
+* @gkatsev updated the vtt.js version to fix JSON issues ([view](https://github.com/videojs/video.js/pull/2327))
+* @dmlap fixed an error caused by calling vjs_getProperty on the swf too early ([view](https://github.com/videojs/video.js/pull/2289))
+
+## 4.12.10 (2015-06-23)
+* @dmlap update to video-js-swf 4.7.1 ([view](https://github.com/videojs/video.js/pull/2280))
+* @imbcmdth src() should not return blob URLs with MSE source handlers ([view](https://github.com/videojs/video.js/pull/2271))
+
+## 4.12.9 (2015-06-15)
+* @imbcmdth updated currentSrc to return src instead of blob urls in html5 tech. Fixes #2232 ([view](https://github.com/videojs/video.js/pull/2232))
+* @imbcmdth fixed async currentSrc behavior ([view](https://github.com/videojs/video.js/pull/2256))
+
+## 4.12.8 (2015-06-05)
+* @dmlap add the seekable property ([view](https://github.com/videojs/video.js/pull/2207))
+* @dmlap fix seekable export ([view](https://github.com/videojs/video.js/pull/2227))
+
+## 4.12.7 (2015-05-19)
+* @tjenkinson Added background-color to vjs-poster to remove transparent borders around scaled poster image ([view](https://github.com/videojs/video.js/pull/2138))
+* @bc-bbay fixed a bug where the player would try to autoplay when there was no source ([view](https://github.com/videojs/video.js/pull/2127))
+* @bc-bbay update time display on loadedmetadata ([view](https://github.com/videojs/video.js/pull/2151))
+* @dmlap update swf to 4.7 to pick up preload fix ([view](https://github.com/videojs/video.js/pull/2170))
+
+## 4.12.6 (2015-05-07)
+* @saxena-gaurav fixed a bug from disposing after changing techs ([view](https://github.com/videojs/video.js/pull/2125))
 
 ## 4.12.5 (2015-03-17)
 * Updated to videojs-swf v4.5.4 to fix a potential security issue ([view](https://github.com/videojs/video.js/pull/1955))

Gruntfile.js

@@ -1,5 +1,7 @@
 require('babel/register');
 
+// Need to `require` a separate Grunt file so we can use ES6 syntax via
+// Babel's require hook.
 module.exports = function(grunt) {
-  require('./grunt.js')(grunt);
+  require('./build/grunt.js')(grunt);
 };

README.md

@@ -1,20 +1,16 @@
-## Please Note!
-The master branch is now the development branch for 5.0 and should be considered unstable until the first 5.0 release. If you're looking for the most recent stable release, please refer to the [stable branch](https://github.com/videojs/video.js/tree/stable).
-
-
-![Video.js logo](https://i.cloudup.com/C3nAUZ-l4c.png)
+![Video.js logo](http://videojs.com/img/logo.png)
 
 # [Video.js - HTML5 Video Player](http://videojs.com)  [![Build Status](https://travis-ci.org/videojs/video.js.svg?branch=master)](https://travis-ci.org/videojs/video.js)
 
-> Video.js is a web video player built from the ground up for an HTML5 world. It supports HTML5 and Flash video, as well as YouTube and Vimeo (through [plugins](https://github.com/videojs/video.js/wiki/Plugins)). It supports video playback on desktops and mobile devices. This project was started mid 2010, and the player is now used on over ~~50,000~~ 100,000 websites.
+> Video.js is a web video player built from the ground up for an HTML5 world. It supports HTML5 and Flash video, as well as YouTube and Vimeo (through [plugins](https://github.com/videojs/video.js/wiki/Plugins)). It supports video playback on desktops and mobile devices. This project was started mid 2010, and the player is now used on over ~~50,000~~ ~~100,000~~ 200,000 websites.
 
 ## Quick start
 Thanks to the awesome folks over at [Fastly](http://www.fastly.com/), there's a free, CDN hosted version of Video.js that anyone can use. Simply add these includes to your document's
 `<head>`:
 
 ```html
-<link href="http://vjs.zencdn.net/4.12/video-js.css" rel="stylesheet">
-<script src="http://vjs.zencdn.net/4.12/video.js"></script>
+<link href="http://vjs.zencdn.net/5.0/video-js.min.css" rel="stylesheet">
+<script src="http://vjs.zencdn.net/5.0/video.min.js"></script>
 ```
 
 Then, whenever you want to use Video.js you can simply use the `<video>` element as your normally would, but with an additional `data-setup` attribute containing any Video.js options. These options
@@ -48,15 +44,14 @@ var player = videojs('really-cool-video', { /* Options */ }, function() {
 });
 ```
 
-If you're ready to dive in, the [documentation](docs/index.md) is the first place to go for more information. Generally the
-[player API docs](docs/api/vjs.Player.md) are the most pertinent.
+If you're ready to dive in, the [documentation](http://docs.videojs.com) is the first place to go for more information.
 
 ## Contributing
 Video.js is a free and open source library, and we appreciate any help you're willing to give. Check out the [contributing guide](CONTRIBUTING.md).
 
+_Video.js uses [BrowserStack](https://browserstack.com) for compatibility testing_
 ## Building your own Video.js from source
 To build your own custom version read the section on [contributing code](CONTRIBUTING.md#contributing-code) and ["Building your own copy"](CONTRIBUTING.md#building-your-own-copy-of-videojs) in the contributing guide.
-
 ## License
 
 Video.js is licensed under the Apache License, Version 2.0. [View the license file](LICENSE)