fix: make sure source options are passed through (videojs#5241)

squarebracket · gkatsev · commit 9504a93643fd · 2018-06-11T13:47:36.000-04:00
The changes to source caching in videojs#5156 introduced a regression where the source options were no longer available to plugins. This PR makes sure the cached source object retains any source options passed along.
diff --git a/src/js/player.js b/src/js/player.js
@@ -1241,7 +1241,7 @@ class Player extends Component {
     }
 
     // update `currentSource` cache always
-    this.cache_.source = {src, type};
+    this.cache_.source = mergeOptions({}, srcObj, {src, type});
 
     const matchingSources = this.cache_.sources.filter((s) => s.src && s.src === src);
     const sourceElSources = [];
diff --git a/test/unit/player.test.js b/test/unit/player.test.js
@@ -1904,3 +1904,17 @@ QUnit.test('disposing a tech that dit NOT set a poster, should keep the poster',
 
   player.dispose();
 });
+
+QUnit.test('source options are retained', function(assert) {
+  const player = TestHelpers.makePlayer();
+
+  const source = {
+    src: 'https://some.url',
+    type: 'someType',
+    sourceOption: 'someOption'
+  };
+
+  player.src(source);
+
+  assert.equal(player.currentSource().sourceOption, 'someOption', 'source option retained');
+});

Original file line number	Diff line number	Diff line change
`@@ -1241,7 +1241,7 @@ class Player extends Component {`
`1241`	`1241`	`}`
`1242`	`1242`
`1243`	`1243`	// update `currentSource` cache always
`1244`		`- this.cache_.source = {src, type};`
	`1244`	`+ this.cache_.source = mergeOptions({}, srcObj, {src, type});`
`1245`	`1245`
`1246`	`1246`	`const matchingSources = this.cache_.sources.filter((s) => s.src && s.src === src);`
`1247`	`1247`	`const sourceElSources = [];`