@desynova-digital/player 3.13.18 → 3.13.20

package/components/Shortcut.js

@@ -66,6 +66,9 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
      */
     _defineProperty(_assertThisInitialized(_this), "handleKeyMovement", function (keyCode) {
       var _this$props$markers$, _this$props$playerSel, _this$props$player, _this$props$player2;
+      if (keyCode === 81 || keyCode === 87) {
+        _this.isCalled = true;
+      }
       var frameRateNumber = parseInt(_this.props.frameRate);
       var timeAfterOverlap;
       var keyPressHandle = _this.defaultShortcuts.find(function (shortcut) {
@@ -94,6 +97,12 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
      * Once we leave the keyCombo isCalled variable is set to false. This ensures that on the next combo press we will again execute Q/W key combo first.
      */
     _defineProperty(_assertThisInitialized(_this), "createThreeKeyCombo", function (event, handleKeyMovement, debounceKeyFunc, keyParameter) {
+      var _this$props = _this.props,
+        playerReadOnlyMode = _this$props.playerReadOnlyMode,
+        disablePlayerActions = _this$props.disablePlayerActions;
+      if (playerReadOnlyMode || disablePlayerActions.includes('marking_controls')) {
+        return;
+      }
       if (!_this.isCalled) {
         handleKeyMovement();
       }
@@ -241,13 +250,13 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
       keyCode: 73,
       // I Key
       handle: function handle(player, actions) {
-        var _this$props = _this.props,
-          markers = _this$props.markers,
-          playerType = _this$props.playerType,
-          onAddMarker = _this$props.onAddMarker,
-          playerReadOnlyMode = _this$props.playerReadOnlyMode,
-          disablePlayerActions = _this$props.disablePlayerActions,
-          playerSelectedMarker = _this$props.playerSelectedMarker;
+        var _this$props2 = _this.props,
+          markers = _this$props2.markers,
+          playerType = _this$props2.playerType,
+          onAddMarker = _this$props2.onAddMarker,
+          playerReadOnlyMode = _this$props2.playerReadOnlyMode,
+          disablePlayerActions = _this$props2.disablePlayerActions,
+          playerSelectedMarker = _this$props2.playerSelectedMarker;
         if (playerReadOnlyMode || disablePlayerActions.includes('marking_controls')) {
           return;
         }
@@ -301,14 +310,14 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
       keyCode: 79,
       // O Key
       handle: function handle(player, actions) {
-        var _this$props2 = _this.props,
-          markers = _this$props2.markers,
-          onMarkerSelect = _this$props2.onMarkerSelect,
-          playerType = _this$props2.playerType,
-          onAddMarker = _this$props2.onAddMarker,
-          playerReadOnlyMode = _this$props2.playerReadOnlyMode,
-          disablePlayerActions = _this$props2.disablePlayerActions,
-          playerSelectedMarker = _this$props2.playerSelectedMarker;
+        var _this$props3 = _this.props,
+          markers = _this$props3.markers,
+          onMarkerSelect = _this$props3.onMarkerSelect,
+          playerType = _this$props3.playerType,
+          onAddMarker = _this$props3.onAddMarker,
+          playerReadOnlyMode = _this$props3.playerReadOnlyMode,
+          disablePlayerActions = _this$props3.disablePlayerActions,
+          playerSelectedMarker = _this$props3.playerSelectedMarker;
         if (playerReadOnlyMode || disablePlayerActions.includes('marking_controls')) {
           return;
         }
@@ -464,9 +473,9 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
       //'ctrl + ['
       ctrl: true,
       handle: function handle(player, actions, frameRate, e, markers) {
-        var _this$props3 = _this.props,
-          leftMarker = _this$props3.playerSelectedMarker.leftMarker,
-          onTagClick = _this$props3.onTagClick;
+        var _this$props4 = _this.props,
+          leftMarker = _this$props4.playerSelectedMarker.leftMarker,
+          onTagClick = _this$props4.onTagClick;
         var newIndex = markers.findIndex(function (item) {
           return item.in_time === leftMarker;
         }) - 1;
@@ -481,9 +490,9 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
       //'ctrl + ]'
       ctrl: true,
       handle: function handle(player, actions, frameRate, e, markers) {
-        var _this$props4 = _this.props,
-          leftMarker = _this$props4.playerSelectedMarker.leftMarker,
-          onTagClick = _this$props4.onTagClick;
+        var _this$props5 = _this.props,
+          leftMarker = _this$props5.playerSelectedMarker.leftMarker,
+          onTagClick = _this$props5.onTagClick;
         var newIndex = markers.findIndex(function (item) {
           return item.in_time === leftMarker;
         }) + 1;
@@ -506,22 +515,22 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
     key: "componentDidMount",
     value: function componentDidMount() {
       this.mergeShortcuts();
-      (0, _hotkeysJs["default"])('ctrl+i+left, ctrl+left+i, i+ctrl+left, i+left+ ctrl, left+ ctrl+ i, left+i+ ctrl', {
+      (0, _hotkeysJs["default"])('o+right,right+o', {
         keyup: true,
         keydown: true
-      }, this.threeKeyCombo4);
-      (0, _hotkeysJs["default"])('ctrl+i+right,ctrl+right+i,i+ctrl+right,i+right+ctrl,right+ctrl+i,right+i+ctrl', {
+      }, this.threeKeyCombo1);
+      (0, _hotkeysJs["default"])('o+left,left+o', {
         keyup: true,
         keydown: true
-      }, this.threeKeyCombo3);
-      (0, _hotkeysJs["default"])('ctrl+o+left,ctrl+left+o,o+ctrl+left,o+left+ctrl,left+ctrl+o,left+o+ctrl', {
+      }, this.threeKeyCombo2);
+      (0, _hotkeysJs["default"])('i+right,right+i', {
         keyup: true,
         keydown: true
-      }, this.threeKeyCombo2);
-      (0, _hotkeysJs["default"])('ctrl+o+right,ctrl+right+o,o+ctrl+right,o+right+ctrl,right+ctrl+o,right+o+ctrl', {
+      }, this.threeKeyCombo3);
+      (0, _hotkeysJs["default"])('i+left,left+i', {
         keyup: true,
         keydown: true
-      }, this.threeKeyCombo1);
+      }, this.threeKeyCombo4);
       document.addEventListener('keydown', this.handleKeyPress);
       document.addEventListener('click', this.handleClick);
       document.addEventListener('dblclick', this.handleDoubleClick);
@@ -549,10 +558,10 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      var _this$props5 = this.props,
-        shortcuts = _this$props5.shortcuts,
-        player = _this$props5.player,
-        frameRate = _this$props5.frameRate;
+      var _this$props6 = this.props,
+        shortcuts = _this$props6.shortcuts,
+        player = _this$props6.player,
+        frameRate = _this$props6.frameRate;
       if (prevProps.shortcuts !== shortcuts) {
         this.mergeShortcuts();
       }
@@ -565,10 +574,10 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
-      _hotkeysJs["default"].unbind('ctrl+i+left, ctrl+left+i, i+ctrl+left, i+left+ ctrl, left+ ctrl+ i, left+i+ ctrl');
-      _hotkeysJs["default"].unbind('ctrl+i+right,ctrl+right+i,i+ctrl+right,i+right+ctrl,right+ctrl+i,right+i+ctrl');
-      _hotkeysJs["default"].unbind('ctrl+o+left,ctrl+left+o,o+ctrl+left,o+left+ctrl,left+ctrl+o,left+o+ctrl');
-      _hotkeysJs["default"].unbind('ctrl+o+right,ctrl+right+o,o+ctrl+right,o+right+ctrl,right+ctrl+o,right+o+ctrl');
+      _hotkeysJs["default"].unbind('o+right,right+o');
+      _hotkeysJs["default"].unbind('i+right,right+i');
+      _hotkeysJs["default"].unbind('i+left,left+i');
+      _hotkeysJs["default"].unbind('o+left,left+o');
       document.removeEventListener('keydown', this.handleKeyPress);
       document.removeEventListener('click', this.handleClick);
       document.removeEventListener('dblclick', this.handleDoubleClick);
@@ -576,10 +585,10 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "rewindVideo",
     value: function rewindVideo() {
-      var _this$props6 = this.props,
-        player = _this$props6.player,
-        actions = _this$props6.actions,
-        frameRate = _this$props6.frameRate;
+      var _this$props7 = this.props,
+        player = _this$props7.player,
+        actions = _this$props7.actions,
+        frameRate = _this$props7.frameRate;
       if (player.currentTime == 0 || !player.rewindActive) {
         clearInterval(this.intervalRewind);
         this.intervalRewind = null;
@@ -708,11 +717,11 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleKeyPress",
     value: function handleKeyPress(e) {
-      var _this$props7 = this.props,
-        player = _this$props7.player,
-        actions = _this$props7.actions,
-        frameRate = _this$props7.frameRate,
-        markers = _this$props7.markers;
+      var _this$props8 = this.props,
+        player = _this$props8.player,
+        actions = _this$props8.actions,
+        frameRate = _this$props8.frameRate,
+        markers = _this$props8.markers;
       if (!player.isActive) {
         return;
       }
@@ -751,10 +760,10 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleClick",
     value: function handleClick(e) {
-      var _this$props8 = this.props,
-        player = _this$props8.player,
-        actions = _this$props8.actions,
-        clickable = _this$props8.clickable;
+      var _this$props9 = this.props,
+        player = _this$props9.player,
+        actions = _this$props9.actions,
+        clickable = _this$props9.clickable;
       if (!this.canBeClicked(player, e) || !clickable) {
         return;
       }
@@ -764,10 +773,10 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleDoubleClick",
     value: function handleDoubleClick(e) {
-      var _this$props9 = this.props,
-        player = _this$props9.player,
-        actions = _this$props9.actions,
-        dblclickable = _this$props9.dblclickable;
+      var _this$props10 = this.props,
+        player = _this$props10.player,
+        actions = _this$props10.actions,
+        dblclickable = _this$props10.dblclickable;
       if (!this.canBeClicked(player, e) || !dblclickable) {
         return;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@desynova-digital/player",
-  "version": "3.13.18",
+  "version": "3.13.20",
   "description": "Video Player Package for Contido Application",
   "main": "index.js",
   "scripts": {