Deploy version 1.2.10

mderrick · Jul 17, 2016 · caa7f54 · caa7f54
1 parent 0591602
commit caa7f54
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "react-html5video",
-  "version": "1.2.9",
+  "version": "1.2.10",
   "homepage": "https://github.com/mderrick/react-html5video",
   "authors": [
     "[email protected]"

diff --git a/dist/ReactHtml5Video.js b/dist/ReactHtml5Video.js
@@ -149,6 +149,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        // Non-standard props
 	        copyKeys: _react2['default'].PropTypes.object,
 	        children: _react2['default'].PropTypes.node,
+	        className: _react2['default'].PropTypes.string,
 
 	        // HTML5 Video standard attributes
 	        autoPlay: _react2['default'].PropTypes.bool,
@@ -399,6 +400,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	     * @return {string} Class string
 	     */
 	    getVideoClassName: function getVideoClassName() {
+	        var className = this.props.className;
+
 	        var classString = 'video';
 
 	        if (this.state.error) {
@@ -414,6 +417,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	        if (this.state.focused) {
 	            classString += ' video--focused';
 	        }
+	        if (className) {
+	            classString += ' ' + className;
+	        }
 	        return classString;
 	    },
 
@@ -443,10 +449,13 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	        // If controls prop is provided remove it
 	        // and use our own controls.
+	        // Leave `copyKeys` here even though not used
+	        // as per issue #36.
 	        var _props = this.props;
 	        var controls = _props.controls;
+	        var copyKeys = _props.copyKeys;
 
-	        var otherProps = _objectWithoutProperties(_props, ['controls']);
+	        var otherProps = _objectWithoutProperties(_props, ['controls', 'copyKeys']);
 
 	        return _react2['default'].createElement(
 	            'div',

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-html5video",
-  "version": "1.2.9",
+  "version": "1.2.10",
   "description": "",
   "main": "./dist/ReactHtml5Video.js",
   "scripts": {