v5.2.1 dist

CHANGELOG.md

@@ -6,6 +6,10 @@ _(none)_
 
 --------------------
 
+## 5.2.1 (2015-11-16)
+* @dmlap Check a component is a function before new-ing ([view](https://github.com/videojs/video.js/pull/2814))
+* @ksjun corrected the registerTech export ([view](https://github.com/videojs/video.js/pull/2816))
+
 ## 5.2.0 (2015-11-10)
 * @gkatsev made initListeners more general and added Tech.isTech. Fixes #2767 ([view](https://github.com/videojs/video.js/pull/2773))
 * @dmlap updated swf to 5.0.1 ([view](https://github.com/videojs/video.js/pull/2795))

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.2.0",
+  "version": "5.2.1",
   "keywords": [
     "videojs",
     "html5",

dist/alt/video.novtt.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Video.js 5.2.0 <http://videojs.com/>
+ * Video.js 5.2.1 <http://videojs.com/>
  * Copyright Brightcove, Inc. <https://www.brightcove.com/>
  * Available under Apache License Version 2.0
  * <https://github.com/videojs/video.js/blob/master/LICENSE>
@@ -1782,14 +1782,8 @@ module.exports = function hasSymbols() {
 	var obj = {};
 	var sym = Symbol('test');
 	if (typeof sym === 'string') { return false; }
-
-	// temp disabled per https://github.com/ljharb/object.assign/issues/17
-	// if (sym instanceof Symbol) { return false; }
-	// temp disabled per https://github.com/WebReflection/get-own-property-symbols/issues/4
-	// if (!(Object(sym) instanceof Symbol)) { return false; }
-
-	var symVal = 42;
-	obj[sym] = symVal;
+	if (sym instanceof Symbol) { return false; }
+	obj[sym] = 42;
 	for (sym in obj) { return false; }
 	if (keys(obj).length !== 0) { return false; }
 	if (typeof Object.keys === 'function' && Object.keys(obj).length !== 0) { return false; }
@@ -1803,7 +1797,7 @@ module.exports = function hasSymbols() {
 
 	if (typeof Object.getOwnPropertyDescriptor === 'function') {
 		var descriptor = Object.getOwnPropertyDescriptor(obj, sym);
-		if (descriptor.value !== symVal || descriptor.enumerable !== true) { return false; }
+		if (descriptor.value !== 42 || descriptor.enumerable !== true) { return false; }
 	}
 
 	return true;
@@ -1826,25 +1820,20 @@ var propIsEnumerable = bind.call(Function.call, Object.prototype.propertyIsEnume
 module.exports = function assign(target, source1) {
 	if (!canBeObject(target)) { throw new TypeError('target must be an object'); }
 	var objTarget = toObject(target);
-	var s, source, i, props, syms, value, key;
+	var s, source, i, props, syms;
 	for (s = 1; s < arguments.length; ++s) {
 		source = toObject(arguments[s]);
 		props = keys(source);
 		if (hasSymbols && Object.getOwnPropertySymbols) {
 			syms = Object.getOwnPropertySymbols(source);
 			for (i = 0; i < syms.length; ++i) {
-				key = syms[i];
-				if (propIsEnumerable(source, key)) {
-					push(props, key);
+				if (propIsEnumerable(source, syms[i])) {
+					push(props, syms[i]);
 				}
 			}
 		}
 		for (i = 0; i < props.length; ++i) {
-			key = props[i];
-			value = source[key];
-			if (propIsEnumerable(source, key)) {
-				objTarget[key] = value;
-			}
+			objTarget[props[i]] = source[props[i]];
 		}
 	}
 	return objTarget;
@@ -2153,26 +2142,6 @@ module.exports = function isArguments(value) {
 
 var implementation = _dereq_('./implementation');
 
-var lacksProperEnumerationOrder = function () {
-	if (!Object.assign) {
-		return false;
-	}
-	// v8, specifically in node 4.x, has a bug with incorrect property enumeration order
-	// note: this does not detect the bug unless there's 20 characters
-	var str = 'abcdefghijklmnopqrst';
-	var letters = str.split('');
-	var map = {};
-	for (var i = 0; i < letters.length; ++i) {
-		map[letters[i]] = letters[i];
-	}
-	var obj = Object.assign({}, map);
-	var actual = '';
-	for (var k in obj) {
-		actual += k;
-	}
-	return str !== actual;
-};
-
 var assignHasPendingExceptions = function () {
 	if (!Object.assign || !Object.preventExtensions) {
 		return false;
@@ -2188,16 +2157,7 @@ var assignHasPendingExceptions = function () {
 };
 
 module.exports = function getPolyfill() {
-	if (!Object.assign) {
-		return implementation;
-	}
-	if (lacksProperEnumerationOrder()) {
-		return implementation;
-	}
-	if (assignHasPendingExceptions()) {
-		return implementation;
-	}
-	return Object.assign;
+	return !Object.assign || assignHasPendingExceptions() ? implementation : Object.assign;
 };
 
 },{"./implementation":44}],52:[function(_dereq_,module,exports){
@@ -2208,11 +2168,9 @@ var getPolyfill = _dereq_('./polyfill');
 
 module.exports = function shimAssign() {
 	var polyfill = getPolyfill();
-	define(
-		Object,
-		{ assign: polyfill },
-		{ assign: function () { return Object.assign !== polyfill; } }
-	);
+	if (Object.assign !== polyfill) {
+		define(Object, { assign: polyfill });
+	}
 	return polyfill;
 };
 
@@ -3302,6 +3260,14 @@ var Component = (function () {
         throw new Error('Component ' + componentClassName + ' does not exist');
       }
 
+      // data stored directly on the videojs object may be
+      // misidentified as a component to retain
+      // backwards-compatibility with 4.x. check to make sure the
+      // component class can be instantiated.
+      if (typeof ComponentClass !== 'function') {
+        return null;
+      }
+
       component = new ComponentClass(this.player_ || this, options);
 
       // child is a component instance
@@ -18553,7 +18519,7 @@ setup.autoSetupTimeout(1, videojs);
  *
  * @type {String}
  */
-videojs.VERSION = '5.2.0';
+videojs.VERSION = '5.2.1';
 
 /**
  * The global options object. These are the settings that take effect
@@ -18674,7 +18640,7 @@ videojs.getTech = _techTechJs2['default'].getTech;
  * @mixes videojs
  * @method registerTech
  */
-videojs.registerTech = _component2['default'].registerTech;
+videojs.registerTech = _techTechJs2['default'].registerTech;
 
 /**
  * A suite of browser and device tests

dist/video.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Video.js 5.2.0 <http://videojs.com/>
+ * Video.js 5.2.1 <http://videojs.com/>
  * Copyright Brightcove, Inc. <https://www.brightcove.com/>
  * Available under Apache License Version 2.0
  * <https://github.com/videojs/video.js/blob/master/LICENSE>
@@ -1786,14 +1786,8 @@ module.exports = function hasSymbols() {
 	var obj = {};
 	var sym = Symbol('test');
 	if (typeof sym === 'string') { return false; }
-
-	// temp disabled per https://github.com/ljharb/object.assign/issues/17
-	// if (sym instanceof Symbol) { return false; }
-	// temp disabled per https://github.com/WebReflection/get-own-property-symbols/issues/4
-	// if (!(Object(sym) instanceof Symbol)) { return false; }
-
-	var symVal = 42;
-	obj[sym] = symVal;
+	if (sym instanceof Symbol) { return false; }
+	obj[sym] = 42;
 	for (sym in obj) { return false; }
 	if (keys(obj).length !== 0) { return false; }
 	if (typeof Object.keys === 'function' && Object.keys(obj).length !== 0) { return false; }
@@ -1807,7 +1801,7 @@ module.exports = function hasSymbols() {
 
 	if (typeof Object.getOwnPropertyDescriptor === 'function') {
 		var descriptor = Object.getOwnPropertyDescriptor(obj, sym);
-		if (descriptor.value !== symVal || descriptor.enumerable !== true) { return false; }
+		if (descriptor.value !== 42 || descriptor.enumerable !== true) { return false; }
 	}
 
 	return true;
@@ -1830,25 +1824,20 @@ var propIsEnumerable = bind.call(Function.call, Object.prototype.propertyIsEnume
 module.exports = function assign(target, source1) {
 	if (!canBeObject(target)) { throw new TypeError('target must be an object'); }
 	var objTarget = toObject(target);
-	var s, source, i, props, syms, value, key;
+	var s, source, i, props, syms;
 	for (s = 1; s < arguments.length; ++s) {
 		source = toObject(arguments[s]);
 		props = keys(source);
 		if (hasSymbols && Object.getOwnPropertySymbols) {
 			syms = Object.getOwnPropertySymbols(source);
 			for (i = 0; i < syms.length; ++i) {
-				key = syms[i];
-				if (propIsEnumerable(source, key)) {
-					push(props, key);
+				if (propIsEnumerable(source, syms[i])) {
+					push(props, syms[i]);
 				}
 			}
 		}
 		for (i = 0; i < props.length; ++i) {
-			key = props[i];
-			value = source[key];
-			if (propIsEnumerable(source, key)) {
-				objTarget[key] = value;
-			}
+			objTarget[props[i]] = source[props[i]];
 		}
 	}
 	return objTarget;
@@ -2157,26 +2146,6 @@ module.exports = function isArguments(value) {
 
 var implementation = _dereq_('./implementation');
 
-var lacksProperEnumerationOrder = function () {
-	if (!Object.assign) {
-		return false;
-	}
-	// v8, specifically in node 4.x, has a bug with incorrect property enumeration order
-	// note: this does not detect the bug unless there's 20 characters
-	var str = 'abcdefghijklmnopqrst';
-	var letters = str.split('');
-	var map = {};
-	for (var i = 0; i < letters.length; ++i) {
-		map[letters[i]] = letters[i];
-	}
-	var obj = Object.assign({}, map);
-	var actual = '';
-	for (var k in obj) {
-		actual += k;
-	}
-	return str !== actual;
-};
-
 var assignHasPendingExceptions = function () {
 	if (!Object.assign || !Object.preventExtensions) {
 		return false;
@@ -2192,16 +2161,7 @@ var assignHasPendingExceptions = function () {
 };
 
 module.exports = function getPolyfill() {
-	if (!Object.assign) {
-		return implementation;
-	}
-	if (lacksProperEnumerationOrder()) {
-		return implementation;
-	}
-	if (assignHasPendingExceptions()) {
-		return implementation;
-	}
-	return Object.assign;
+	return !Object.assign || assignHasPendingExceptions() ? implementation : Object.assign;
 };
 
 },{"./implementation":44}],52:[function(_dereq_,module,exports){
@@ -2212,11 +2172,9 @@ var getPolyfill = _dereq_('./polyfill');
 
 module.exports = function shimAssign() {
 	var polyfill = getPolyfill();
-	define(
-		Object,
-		{ assign: polyfill },
-		{ assign: function () { return Object.assign !== polyfill; } }
-	);
+	if (Object.assign !== polyfill) {
+		define(Object, { assign: polyfill });
+	}
 	return polyfill;
 };
 
@@ -3306,6 +3264,14 @@ var Component = (function () {
         throw new Error('Component ' + componentClassName + ' does not exist');
       }
 
+      // data stored directly on the videojs object may be
+      // misidentified as a component to retain
+      // backwards-compatibility with 4.x. check to make sure the
+      // component class can be instantiated.
+      if (typeof ComponentClass !== 'function') {
+        return null;
+      }
+
       component = new ComponentClass(this.player_ || this, options);
 
       // child is a component instance
@@ -18557,7 +18523,7 @@ setup.autoSetupTimeout(1, videojs);
  *
  * @type {String}
  */
-videojs.VERSION = '5.2.0';
+videojs.VERSION = '5.2.1';
 
 /**
  * The global options object. These are the settings that take effect
@@ -18678,7 +18644,7 @@ videojs.getTech = _techTechJs2['default'].getTech;
  * @mixes videojs
  * @method registerTech
  */
-videojs.registerTech = _component2['default'].registerTech;
+videojs.registerTech = _techTechJs2['default'].registerTech;
 
 /**
  * A suite of browser and device tests

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.2.0",
+  "version": "5.2.1",
   "copyright": "Copyright Brightcove, Inc. <https://www.brightcove.com/>",
   "license": "Apache-2.0",
   "keywords": [

src/js/component.js

@@ -373,6 +373,14 @@ class Component {
         throw new Error(`Component ${componentClassName} does not exist`);
       }
 
+      // data stored directly on the videojs object may be
+      // misidentified as a component to retain
+      // backwards-compatibility with 4.x. check to make sure the
+      // component class can be instantiated.
+      if (typeof ComponentClass !== 'function') {
+        return null;
+      }
+
       component = new ComponentClass(this.player_ || this, options);
 
     // child is a component instance

src/js/video.js

@@ -246,7 +246,7 @@ videojs.getTech = Tech.getTech;
  * @mixes videojs
  * @method registerTech
  */
-videojs.registerTech = Component.registerTech;
+videojs.registerTech = Tech.registerTech;
 
 /**
  * A suite of browser and device tests