@desynova-digital/player 4.0.34 → 4.0.35

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/components/Shortcut.js +90 -92
  2. package/package.json +1 -1
package/components/Shortcut.js CHANGED
@@ -288,7 +288,7 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
288
288
  }, {
289
289
  keyCode: 73,
290
290
  // I Key
291
- handle: ["snp_edit", "promo_review", "pgm_edit", "dubbing_review"].includes(_this.props.playerType) ? function (player, actions) {
291
+ handle: function handle(player, actions) {
292
292
  var _this$props4 = _this.props,
293
293
  markers = _this$props4.markers,
294
294
  playerType = _this$props4.playerType,
@@ -296,88 +296,86 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
296
296
  playerReadOnlyMode = _this$props4.playerReadOnlyMode,
297
297
  disablePlayerActions = _this$props4.disablePlayerActions,
298
298
  playerSelectedMarker = _this$props4.playerSelectedMarker,
299
- frameRate = _this$props4.frameRate;
300
- if (playerReadOnlyMode || disablePlayerActions.includes('marking_controls')) {
301
- return;
302
- }
303
- var currentAdjustedTime = (0, _utils.handleAdjustingVideoAsPerFrame)(player.currentTime, frameRate);
304
- for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
305
- args[_key - 2] = arguments[_key];
306
- }
307
- var isOverLapTime = args[0].timeAfterOverlap;
308
- if (isOverLapTime) {
309
- onAddMarker(args[0].timeAfterOverlap, playerSelectedMarker.rightMarker, 'update');
310
- } else {
311
- if (playerType !== 'panel') {
312
- var createPoint = true;
313
- if (markers && markers.length && markers[0].values && markers[0].values.length) {
314
- var markerArr = markers[0].values;
315
- if (Object.keys(player.selectedMarker).length) {
316
- markerArr = markerArr.filter(function (marker) {
317
- return marker.start_time !== player.selectedMarker.leftMarker && marker.end_time !== player.selectedMarker.rightMarker;
299
+ frameRate = _this$props4.frameRate,
300
+ onMarkerSelect = _this$props4.onMarkerSelect;
301
+ var isHandleDisabled = ["snp_edit", "promo_review", "pgm_edit", "dubbing_review"].includes(playerType);
302
+ if (!isHandleDisabled) {
303
+ if (playerReadOnlyMode || disablePlayerActions.includes('marking_controls')) {
304
+ return;
305
+ }
306
+ var currentAdjustedTime = (0, _utils.handleAdjustingVideoAsPerFrame)(player.currentTime, frameRate);
307
+ for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
308
+ args[_key - 2] = arguments[_key];
309
+ }
310
+ var isOverLapTime = args[0].timeAfterOverlap;
311
+ if (isOverLapTime) {
312
+ onAddMarker(args[0].timeAfterOverlap, playerSelectedMarker.rightMarker, 'update');
313
+ } else {
314
+ if (playerType !== 'panel') {
315
+ var createPoint = true;
316
+ if (markers && markers.length && markers[0].values && markers[0].values.length) {
317
+ var markerArr = markers[0].values;
318
+ if (Object.keys(player.selectedMarker).length) {
319
+ markerArr = markerArr.filter(function (marker) {
320
+ return marker.start_time !== player.selectedMarker.leftMarker && marker.end_time !== player.selectedMarker.rightMarker;
321
+ });
322
+ }
323
+ markerArr.filter(function (marker) {
324
+ if (currentAdjustedTime >= marker.start_time && currentAdjustedTime <= marker.end_time || playerSelectedMarker.leftMarker > -1 && currentAdjustedTime > marker.start_time && playerSelectedMarker.leftMarker < marker.start_time || playerSelectedMarker.leftMarker > -1 && currentAdjustedTime < marker.start_time && playerSelectedMarker.leftMarker > marker.end_time) {
325
+ createPoint = false;
326
+ }
318
327
  });
319
328
  }
320
- markerArr.filter(function (marker) {
321
- if (currentAdjustedTime >= marker.start_time && currentAdjustedTime <= marker.end_time || playerSelectedMarker.leftMarker > -1 && currentAdjustedTime > marker.start_time && playerSelectedMarker.leftMarker < marker.start_time || playerSelectedMarker.leftMarker > -1 && currentAdjustedTime < marker.start_time && playerSelectedMarker.leftMarker > marker.end_time) {
322
- createPoint = false;
323
- }
324
- });
325
- }
326
- if (!createPoint && playerSelectedMarker.markerType === 'update' && currentAdjustedTime > player.selectedMarker.leftMarker && currentAdjustedTime < player.selectedMarker.rightMarker) {
327
- createPoint = true;
328
- }
329
- if (createPoint) {
330
- if (playerSelectedMarker.rightMarker < 0 || playerSelectedMarker.rightMarker > -1 && currentAdjustedTime < playerSelectedMarker.rightMarker) {
331
- // actions.handleMarkerPointChange(
332
- // player.markerType !== 'update' ? 'add' : 'update',
333
- // 'left',
334
- // currentAdjustedTime
335
- // );
336
- var data = {
337
- markerType: playerSelectedMarker.data && Object.keys(playerSelectedMarker.data).length ? 'update' : 'add',
338
- markerPos: 'left',
339
- currentTime: currentAdjustedTime
340
- };
341
- onAddMarker(currentAdjustedTime, -1, '', true, data);
342
- if (playerSelectedMarker.leftMarker > -1 && playerSelectedMarker.rightMarker > -1 && (!playerSelectedMarker.markerCreate || playerSelectedMarker.markerType === 'update' || playerSelectedMarker.data && Object.keys(playerSelectedMarker.data).length)) {
343
- onAddMarker(currentAdjustedTime, playerSelectedMarker.rightMarker, 'update');
329
+ if (!createPoint && playerSelectedMarker.markerType === 'update' && currentAdjustedTime > player.selectedMarker.leftMarker && currentAdjustedTime < player.selectedMarker.rightMarker) {
330
+ createPoint = true;
331
+ }
332
+ if (createPoint) {
333
+ if (playerSelectedMarker.rightMarker < 0 || playerSelectedMarker.rightMarker > -1 && currentAdjustedTime < playerSelectedMarker.rightMarker) {
334
+ // actions.handleMarkerPointChange(
335
+ // player.markerType !== 'update' ? 'add' : 'update',
336
+ // 'left',
337
+ // currentAdjustedTime
338
+ // );
339
+ var data = {
340
+ markerType: playerSelectedMarker.data && Object.keys(playerSelectedMarker.data).length ? 'update' : 'add',
341
+ markerPos: 'left',
342
+ currentTime: currentAdjustedTime
343
+ };
344
+ onAddMarker(currentAdjustedTime, -1, '', true, data);
345
+ if (playerSelectedMarker.leftMarker > -1 && playerSelectedMarker.rightMarker > -1 && (!playerSelectedMarker.markerCreate || playerSelectedMarker.markerType === 'update' || playerSelectedMarker.data && Object.keys(playerSelectedMarker.data).length)) {
346
+ onAddMarker(currentAdjustedTime, playerSelectedMarker.rightMarker, 'update');
347
+ }
344
348
  }
345
349
  }
346
350
  }
347
351
  }
348
- }
349
- } : function (player) {
350
- var _this$props5 = _this.props,
351
- onAddMarker = _this$props5.onAddMarker,
352
- playerReadOnlyMode = _this$props5.playerReadOnlyMode,
353
- disablePlayerActions = _this$props5.disablePlayerActions,
354
- playerSelectedMarker = _this$props5.playerSelectedMarker,
355
- frameRate = _this$props5.frameRate;
356
- if (playerReadOnlyMode || disablePlayerActions.includes('marking_controls')) {
357
- return;
358
- }
359
- //for single annotations here
360
- var currentAdjustedTime = (0, _utils.handleAdjustingVideoAsPerFrame)(player.currentTime, frameRate);
361
- if (currentAdjustedTime < (playerSelectedMarker === null || playerSelectedMarker === void 0 ? void 0 : playerSelectedMarker.rightMarker) || playerSelectedMarker.leftMarker === -1 || playerSelectedMarker.rightMarker === -1) {
362
- onAddMarker(currentAdjustedTime, playerSelectedMarker === null || playerSelectedMarker === void 0 ? void 0 : playerSelectedMarker.rightMarker, '', false, {
363
- markerType: 'create'
364
- });
352
+ } else {
353
+ if (playerReadOnlyMode || disablePlayerActions.includes('marking_controls')) {
354
+ return;
355
+ }
356
+ //for single annotations here
357
+ var _currentAdjustedTime = (0, _utils.handleAdjustingVideoAsPerFrame)(player.currentTime, frameRate);
358
+ if (_currentAdjustedTime < (playerSelectedMarker === null || playerSelectedMarker === void 0 ? void 0 : playerSelectedMarker.rightMarker) || playerSelectedMarker.leftMarker === -1 || playerSelectedMarker.rightMarker === -1) {
359
+ onAddMarker(_currentAdjustedTime, playerSelectedMarker === null || playerSelectedMarker === void 0 ? void 0 : playerSelectedMarker.rightMarker, '', false, {
360
+ markerType: 'create'
361
+ });
362
+ }
365
363
  }
366
364
  }
367
365
  }, {
368
366
  keyCode: 79,
369
367
  // O Key
370
368
  handle: function handle(player, actions) {
371
- var _this$props6 = _this.props,
372
- markers = _this$props6.markers,
373
- onMarkerSelect = _this$props6.onMarkerSelect,
374
- playerType = _this$props6.playerType,
375
- onAddMarker = _this$props6.onAddMarker,
376
- playerReadOnlyMode = _this$props6.playerReadOnlyMode,
377
- disablePlayerActions = _this$props6.disablePlayerActions,
378
- playerSelectedMarker = _this$props6.playerSelectedMarker,
379
- frameRate = _this$props6.frameRate,
380
- pauseOnOutMarkerSelect = _this$props6.pauseOnOutMarkerSelect;
369
+ var _this$props5 = _this.props,
370
+ markers = _this$props5.markers,
371
+ onMarkerSelect = _this$props5.onMarkerSelect,
372
+ playerType = _this$props5.playerType,
373
+ onAddMarker = _this$props5.onAddMarker,
374
+ playerReadOnlyMode = _this$props5.playerReadOnlyMode,
375
+ disablePlayerActions = _this$props5.disablePlayerActions,
376
+ playerSelectedMarker = _this$props5.playerSelectedMarker,
377
+ frameRate = _this$props5.frameRate,
378
+ pauseOnOutMarkerSelect = _this$props5.pauseOnOutMarkerSelect;
381
379
  if (playerReadOnlyMode || disablePlayerActions.includes('marking_controls')) {
382
380
  return;
383
381
  }
@@ -603,10 +601,10 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
603
601
  }, {
604
602
  key: "componentDidUpdate",
605
603
  value: function componentDidUpdate(prevProps) {
606
- var _this$props7 = this.props,
607
- shortcuts = _this$props7.shortcuts,
608
- player = _this$props7.player,
609
- frameRate = _this$props7.frameRate;
604
+ var _this$props6 = this.props,
605
+ shortcuts = _this$props6.shortcuts,
606
+ player = _this$props6.player,
607
+ frameRate = _this$props6.frameRate;
610
608
  if (prevProps.shortcuts !== shortcuts) {
611
609
  this.mergeShortcuts();
612
610
  }
@@ -630,10 +628,10 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
630
628
  }, {
631
629
  key: "rewindVideo",
632
630
  value: function rewindVideo() {
633
- var _this$props8 = this.props,
634
- player = _this$props8.player,
635
- actions = _this$props8.actions,
636
- frameRate = _this$props8.frameRate;
631
+ var _this$props7 = this.props,
632
+ player = _this$props7.player,
633
+ actions = _this$props7.actions,
634
+ frameRate = _this$props7.frameRate;
637
635
  if (player.currentTime == 0 || !player.rewindActive) {
638
636
  clearInterval(this.intervalRewind);
639
637
  this.intervalRewind = null;
@@ -762,11 +760,11 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
762
760
  }, {
763
761
  key: "handleKeyPress",
764
762
  value: function handleKeyPress(e) {
765
- var _this$props9 = this.props,
766
- player = _this$props9.player,
767
- actions = _this$props9.actions,
768
- frameRate = _this$props9.frameRate,
769
- markers = _this$props9.markers;
763
+ var _this$props8 = this.props,
764
+ player = _this$props8.player,
765
+ actions = _this$props8.actions,
766
+ frameRate = _this$props8.frameRate,
767
+ markers = _this$props8.markers;
770
768
  if (!player.isActive) {
771
769
  return;
772
770
  }
@@ -805,10 +803,10 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
805
803
  }, {
806
804
  key: "handleClick",
807
805
  value: function handleClick(e) {
808
- var _this$props10 = this.props,
809
- player = _this$props10.player,
810
- actions = _this$props10.actions,
811
- clickable = _this$props10.clickable;
806
+ var _this$props9 = this.props,
807
+ player = _this$props9.player,
808
+ actions = _this$props9.actions,
809
+ clickable = _this$props9.clickable;
812
810
  if (!this.canBeClicked(player, e) || !clickable) {
813
811
  return;
814
812
  }
@@ -818,10 +816,10 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
818
816
  }, {
819
817
  key: "handleDoubleClick",
820
818
  value: function handleDoubleClick(e) {
821
- var _this$props11 = this.props,
822
- player = _this$props11.player,
823
- actions = _this$props11.actions,
824
- dblclickable = _this$props11.dblclickable;
819
+ var _this$props10 = this.props,
820
+ player = _this$props10.player,
821
+ actions = _this$props10.actions,
822
+ dblclickable = _this$props10.dblclickable;
825
823
  if (!this.canBeClicked(player, e) || !dblclickable) {
826
824
  return;
827
825
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@desynova-digital/player",
3
- "version": "4.0.34",
3
+ "version": "4.0.35",
4
4
  "description": "Video Player Package for Contido Application",
5
5
  "main": "index.js",
6
6
  "scripts": {