Merge branch 'stable'

CHANGELOG.md

@@ -9,6 +9,9 @@ CHANGELOG
 
 --------------------
 
+## 5.10.2 (2016-05-12)
+* @gkatsev nulled out currentSource_ in setSource ([view](https://github.com/videojs/video.js/pull/3314))
+
 ## 5.10.1 (2016-05-03)
 * @nickygerritsen Pass tech options to source handlers ([view](https://github.com/videojs/video.js/pull/3245))
 * @gkatsev Use fonts 2.0 that do not require wrapping codepoints ([view](https://github.com/videojs/video.js/pull/3252))

component.json

@@ -1,7 +1,7 @@
 {
   "name": "video.js",
   "description": "An HTML5 and Flash video player with a common API and skin for both.",
-  "version": "5.10.1",
+  "version": "5.10.2",
   "keywords": [
     "videojs",
     "html5",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "video.js",
   "description": "An HTML5 and Flash video player with a common API and skin for both.",
-  "version": "5.10.1",
+  "version": "5.10.2",
   "copyright": "Copyright Brightcove, Inc. <https://www.brightcove.com/>",
   "license": "Apache-2.0",
   "keywords": [

src/js/tech/tech.js

@@ -815,6 +815,8 @@ Tech.withSourceHandlers = function(_Tech){
     // than clear all of our current tracks
     if (this.currentSource_) {
       this.clearTracks(['audio', 'video']);
+
+      this.currentSource_ = null;
     }
 
     if (sh !== _Tech.nativeSourceHandler) {

test/unit/tech/tech.test.js

@@ -266,7 +266,7 @@ test('should add the source handler interface to a tech', function(){
   // verify that all the tracks were removed as we got a new source
   equal(tech.audioTracks().length, 0, 'should have zero audio tracks');
   equal(tech.videoTracks().length, 0, 'should have zero video tracks');
-  equal(tech.textTracks().length, 2, 'should have two video tracks');
+  equal(tech.textTracks().length, 2, 'should have two text tracks');
   equal(tech.remoteTextTrackEls().length, 2, 'should have two remote text tracks els');
   equal(tech.remoteTextTracks().length, 2, 'should have two remote text tracks');