video-react - npm Package Compare versions

Comparing version 0.12.0 to 0.13.0

CHANGELOG.md

@@ -0,1 +1,6 @@
+<a name="0.13.0"></a>
+# [0.13.0](https://github.com/video-react/video-react/compare/0.12.0...0.13.0) (2018-07-07)
+
+
+
 <a name="0.12.0"></a>
@@ -2,0 +7,0 @@ # [0.12.0](https://github.com/video-react/video-react/compare/0.11.1...0.12.0) (2018-07-06)

lib/components/Shortcut.js

@@ -19,2 +19,4 @@ 'use strict';
 
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
@@ -232,2 +234,26 @@
     value: function mergeShortcuts() {
+      var getShortcutKey = function getShortcutKey(_ref) {
+        var _ref$keyCode = _ref.keyCode,
+            keyCode = _ref$keyCode === undefined ? 0 : _ref$keyCode,
+            _ref$ctrl = _ref.ctrl,
+            ctrl = _ref$ctrl === undefined ? false : _ref$ctrl,
+            _ref$shift = _ref.shift,
+            shift = _ref$shift === undefined ? false : _ref$shift,
+            _ref$alt = _ref.alt,
+            alt = _ref$alt === undefined ? false : _ref$alt;
+        return keyCode + ':' + ctrl + ':' + shift + ':' + alt;
+      };
+      var defaultShortcuts = this.defaultShortcuts.reduce(function (shortcuts, shortcut) {
+        return Object.assign(shortcuts, _defineProperty({}, getShortcutKey(shortcut), shortcut));
+      }, {});
+      var mergedShortcuts = (this.props.shortcuts || []).reduce(function (shortcuts, shortcut) {
+        var keyCode = shortcut.keyCode,
+            handle = shortcut.handle;
+
+        if (keyCode && typeof handle === 'function') {
+          return Object.assign(shortcuts, _defineProperty({}, getShortcutKey(shortcut), shortcut));
+        }
+        return shortcuts;
+      }, defaultShortcuts);
+
       var gradeShortcut = function gradeShortcut(s) {
@@ -244,7 +270,5 @@ var score = 0;
 
-      var shortcuts = (this.props.shortcuts || []).filter(function (s) {
-        return s.keyCode && s.handle && typeof s.handle === 'function';
-      });
-
-      this.shortcuts = [].concat(_toConsumableArray(shortcuts), _toConsumableArray(this.defaultShortcuts)).sort(function (a, b) {
+      this.shortcuts = Object.keys(mergedShortcuts).map(function (key) {
+        return mergedShortcuts[key];
+      }).sort(function (a, b) {
         return gradeShortcut(b) - gradeShortcut(a);
@@ -251,0 +275,0 @@ });

package.json

 {
   "name": "video-react",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "description": "Video-React is a web video player built from the ground up for an HTML5 world using React library.",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

No alert changes

Improved metrics

Total package byte prevSize

2189579

increased by0.58%

Lines of code

24765

increased by0.44%

No dependency changes