@gcorevideo/player 2.28.13 → 2.28.16
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.
- package/assets/bottom-gear/gear-sub-menu.scss +9 -3
- package/dist/core.js +2553 -1324
- package/dist/index.css +281 -276
- package/dist/index.embed.js +2584 -1332
- package/dist/index.js +2591 -1332
- package/lib/build.d.ts.map +1 -1
- package/lib/build.js +1 -1
- package/lib/plugins/cmcd-config/CmcdConfig.d.ts +1 -1
- package/lib/plugins/cmcd-config/CmcdConfig.d.ts.map +1 -1
- package/lib/plugins/cmcd-config/CmcdConfig.js +7 -3
- package/lib/plugins/media-control/MediaControl.d.ts +1 -0
- package/lib/plugins/media-control/MediaControl.d.ts.map +1 -1
- package/lib/plugins/media-control/MediaControl.js +29 -3
- package/package.json +2 -2
- package/src/build.ts +1 -1
- package/src/plugins/cmcd-config/CmcdConfig.ts +8 -5
- package/src/plugins/media-control/MediaControl.ts +33 -5
- package/src/plugins/media-control/__tests__/MediaControl.test.ts +2 -2
- package/src/plugins/media-control/__tests__/__snapshots__/MediaControl.test.ts.snap +1 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/vitest.config.ts +0 -1
package/lib/build.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,cAAc,EAAE,MAAiB,
|
|
1
|
+
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,cAAc,EAAE,MAAiB,CAAA"}
|
package/lib/build.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CmcdConfig.d.ts","sourceRoot":"","sources":["../../../src/plugins/cmcd-config/CmcdConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,IAAI,EAAE,UAAU,EAAU,MAAM,cAAc,CAAA;AA4BrE;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAID;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,UAAW,SAAQ,UAAU;IACxC,OAAO,CAAC,GAAG,CAAQ;IAEnB,OAAO,CAAC,GAAG,CAAK;IAEhB;;OAEG;IACH,IAAI,IAAI,WAEP;IAED;;OAEG;IACH,
|
|
1
|
+
{"version":3,"file":"CmcdConfig.d.ts","sourceRoot":"","sources":["../../../src/plugins/cmcd-config/CmcdConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,IAAI,EAAE,UAAU,EAAU,MAAM,cAAc,CAAA;AA4BrE;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAID;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,UAAW,SAAQ,UAAU;IACxC,OAAO,CAAC,GAAG,CAAQ;IAEnB,OAAO,CAAC,GAAG,CAAK;IAEhB;;OAEG;IACH,IAAI,IAAI,WAEP;IAED;;OAEG;IACH,MAAM,KAAK,OAAO,WAEjB;IAED;;OAEG;IACH,IAAI,gBAAgB,WAEnB;gBAEW,IAAI,EAAE,IAAI;IAMtB;;OAEG;IACM,UAAU;IAOnB;;;;OAIG;IACH,SAAS,IAAI;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE;YAO3B,cAAc;IAgC5B,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,YAAY;CAGrB"}
|
|
@@ -54,7 +54,7 @@ export class CmcdConfig extends CorePlugin {
|
|
|
54
54
|
/**
|
|
55
55
|
* @internal
|
|
56
56
|
*/
|
|
57
|
-
get version() {
|
|
57
|
+
static get version() {
|
|
58
58
|
return '0.1.0';
|
|
59
59
|
}
|
|
60
60
|
/**
|
|
@@ -66,7 +66,7 @@ export class CmcdConfig extends CorePlugin {
|
|
|
66
66
|
constructor(core) {
|
|
67
67
|
super(core);
|
|
68
68
|
this.sid = this.options.cmcd?.sessionId ?? generateSessionId();
|
|
69
|
-
this.setContentId()
|
|
69
|
+
// this.setContentId()
|
|
70
70
|
}
|
|
71
71
|
/**
|
|
72
72
|
* @internal
|
|
@@ -120,7 +120,11 @@ export class CmcdConfig extends CorePlugin {
|
|
|
120
120
|
}
|
|
121
121
|
}
|
|
122
122
|
generateContentId() {
|
|
123
|
-
|
|
123
|
+
const src = this.core.options.source ??
|
|
124
|
+
(typeof this.core.options.sources[0] == 'string'
|
|
125
|
+
? this.core.options.sources[0]
|
|
126
|
+
: this.core.options.sources[0].source);
|
|
127
|
+
return new URL(src).pathname.slice(0, 64);
|
|
124
128
|
}
|
|
125
129
|
setContentId() {
|
|
126
130
|
this.cid = this.options.cmcd?.contentId ?? this.generateContentId();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MediaControl.d.ts","sourceRoot":"","sources":["../../../src/plugins/media-control/MediaControl.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,YAAY,EAMZ,IAAI,EACL,MAAM,cAAc,CAAA;AASrB,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAI5C,OAAO,kDAAkD,CAAA;
|
|
1
|
+
{"version":3,"file":"MediaControl.d.ts","sourceRoot":"","sources":["../../../src/plugins/media-control/MediaControl.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,7 @@ const STANDARD_MEDIA_CONTROL_ELEMENTS = [
|
|
|
31
31
|
'volume',
|
|
32
32
|
];
|
|
33
33
|
const MENU_VMARGIN = 12;
|
|
34
|
+
const DEFAULT_HIDE_DELAY = 2000;
|
|
34
35
|
// TODO export
|
|
35
36
|
const DEFAULT_SETTINGS = {
|
|
36
37
|
default: ['seekbar'],
|
|
@@ -280,7 +281,7 @@ export class MediaControl extends UICorePlugin {
|
|
|
280
281
|
bindEvents() {
|
|
281
282
|
this.listenTo(this.core, Events.CORE_ACTIVE_CONTAINER_CHANGED, this.onActiveContainerChanged);
|
|
282
283
|
this.listenTo(this.core, Events.CORE_MOUSE_MOVE, this.show);
|
|
283
|
-
this.listenTo(this.core, Events.CORE_MOUSE_LEAVE,
|
|
284
|
+
this.listenTo(this.core, Events.CORE_MOUSE_LEAVE, this.delayHide);
|
|
284
285
|
this.listenTo(this.core, Events.CORE_FULLSCREEN, this.show);
|
|
285
286
|
this.listenTo(this.core, Events.CORE_OPTIONS_CHANGE, this.configure);
|
|
286
287
|
this.listenTo(this.core, Events.CORE_RESIZE, this.playerResize);
|
|
@@ -325,6 +326,8 @@ export class MediaControl extends UICorePlugin {
|
|
|
325
326
|
this.listenTo(this.core, Events.CONTAINER_DESTROYED, () => {
|
|
326
327
|
this.cancelRenderTimer();
|
|
327
328
|
});
|
|
329
|
+
this.listenTo(this.core.activeContainer, Events.CONTAINER_MOUSE_ENTER, this.show);
|
|
330
|
+
this.listenTo(this.core.activeContainer, Events.CONTAINER_MOUSE_LEAVE, this.delayHide);
|
|
328
331
|
}
|
|
329
332
|
/**
|
|
330
333
|
* Hides the media control UI
|
|
@@ -492,6 +495,13 @@ export class MediaControl extends UICorePlugin {
|
|
|
492
495
|
this.$el.removeClass('w370');
|
|
493
496
|
this.$el.removeClass('w270');
|
|
494
497
|
this.verticalVolume = false;
|
|
498
|
+
trace(`${T} playerResize`, {
|
|
499
|
+
size,
|
|
500
|
+
width: this.container.$el.width(),
|
|
501
|
+
height: this.container.$el.height(),
|
|
502
|
+
hideVolumeBar: this.options.hideVolumeBar,
|
|
503
|
+
isMobile: Browser.isMobile,
|
|
504
|
+
});
|
|
495
505
|
try {
|
|
496
506
|
const skinWidth = this.container.$el.width() || size.width;
|
|
497
507
|
if (skinWidth <= 370 || this.options.hideVolumeBar) {
|
|
@@ -751,7 +761,7 @@ export class MediaControl extends UICorePlugin {
|
|
|
751
761
|
if (this.disabled || this.options.disableControlPanel) {
|
|
752
762
|
return;
|
|
753
763
|
}
|
|
754
|
-
const timeout =
|
|
764
|
+
const timeout = DEFAULT_HIDE_DELAY;
|
|
755
765
|
const mousePointerMoved = event &&
|
|
756
766
|
event.clientX !== this.lastMouseX &&
|
|
757
767
|
event.clientY !== this.lastMouseY;
|
|
@@ -774,6 +784,16 @@ export class MediaControl extends UICorePlugin {
|
|
|
774
784
|
this.updateCursorStyle(showing);
|
|
775
785
|
}
|
|
776
786
|
hide(delay = 0) {
|
|
787
|
+
trace(`${T} hide`, {
|
|
788
|
+
delay,
|
|
789
|
+
visible: this.isVisible(),
|
|
790
|
+
disabled: this.disabled,
|
|
791
|
+
hideMediaControl: this.options.hideMediaControl,
|
|
792
|
+
userKeepVisible: this.userKeepVisible,
|
|
793
|
+
keepVisible: this.keepVisible,
|
|
794
|
+
draggingSeekBar: this.draggingSeekBar,
|
|
795
|
+
draggingVolumeBar: this.draggingVolumeBar,
|
|
796
|
+
});
|
|
777
797
|
if (!this.isVisible()) {
|
|
778
798
|
return;
|
|
779
799
|
}
|
|
@@ -1110,7 +1130,7 @@ export class MediaControl extends UICorePlugin {
|
|
|
1110
1130
|
if (!this.hasUpdate || !this.metadataLoaded) {
|
|
1111
1131
|
return this;
|
|
1112
1132
|
}
|
|
1113
|
-
const timeout = this.options.hideMediaControlDelay ||
|
|
1133
|
+
const timeout = this.options.hideMediaControlDelay || DEFAULT_HIDE_DELAY;
|
|
1114
1134
|
this.$el.html(MediaControl.template({ settings: this.settings }));
|
|
1115
1135
|
this.createCachedElements();
|
|
1116
1136
|
this.drawDurationAndPosition();
|
|
@@ -1233,6 +1253,12 @@ export class MediaControl extends UICorePlugin {
|
|
|
1233
1253
|
this.$el.removeClass('dvr');
|
|
1234
1254
|
}
|
|
1235
1255
|
}
|
|
1256
|
+
delayHide(e) {
|
|
1257
|
+
trace(`${T} delayHide`, {
|
|
1258
|
+
e,
|
|
1259
|
+
});
|
|
1260
|
+
this.hide(this.options.hideMediaControlDelay || DEFAULT_HIDE_DELAY);
|
|
1261
|
+
}
|
|
1236
1262
|
}
|
|
1237
1263
|
MediaControl.extend = function (properties) {
|
|
1238
1264
|
return extend(MediaControl, properties);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gcorevideo/player",
|
|
3
|
-
"version": "2.28.
|
|
3
|
+
"version": "2.28.16",
|
|
4
4
|
"description": "Gcore JavaScript video player",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"type": "module",
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"@types/sinonjs__fake-timers": "^8.1.5",
|
|
47
47
|
"assert": "^2.1.0",
|
|
48
48
|
"eventemitter3": "^5.0.1",
|
|
49
|
-
"happy-dom": "^
|
|
49
|
+
"happy-dom": "^20.0.8",
|
|
50
50
|
"nodemon": "^3.1.9",
|
|
51
51
|
"rollup": "^4.27.4",
|
|
52
52
|
"rollup-plugin-polyfill-node": "^0.13.0",
|
package/src/build.ts
CHANGED
|
@@ -78,7 +78,7 @@ export class CmcdConfig extends CorePlugin {
|
|
|
78
78
|
/**
|
|
79
79
|
* @internal
|
|
80
80
|
*/
|
|
81
|
-
get version() {
|
|
81
|
+
static get version() {
|
|
82
82
|
return '0.1.0'
|
|
83
83
|
}
|
|
84
84
|
|
|
@@ -92,7 +92,7 @@ export class CmcdConfig extends CorePlugin {
|
|
|
92
92
|
constructor(core: Core) {
|
|
93
93
|
super(core)
|
|
94
94
|
this.sid = this.options.cmcd?.sessionId ?? generateSessionId()
|
|
95
|
-
this.setContentId()
|
|
95
|
+
// this.setContentId()
|
|
96
96
|
}
|
|
97
97
|
|
|
98
98
|
/**
|
|
@@ -150,9 +150,12 @@ export class CmcdConfig extends CorePlugin {
|
|
|
150
150
|
}
|
|
151
151
|
|
|
152
152
|
private generateContentId() {
|
|
153
|
-
|
|
154
|
-
this.core.options.source ??
|
|
155
|
-
|
|
153
|
+
const src =
|
|
154
|
+
this.core.options.source ??
|
|
155
|
+
(typeof this.core.options.sources[0] == 'string'
|
|
156
|
+
? this.core.options.sources[0]
|
|
157
|
+
: this.core.options.sources[0].source)
|
|
158
|
+
return new URL(src).pathname.slice(0, 64)
|
|
156
159
|
}
|
|
157
160
|
|
|
158
161
|
private setContentId() {
|
|
@@ -51,6 +51,8 @@ const STANDARD_MEDIA_CONTROL_ELEMENTS: string[] = [
|
|
|
51
51
|
|
|
52
52
|
const MENU_VMARGIN = 12
|
|
53
53
|
|
|
54
|
+
const DEFAULT_HIDE_DELAY = 2000
|
|
55
|
+
|
|
54
56
|
/**
|
|
55
57
|
* Built-in media control elements.
|
|
56
58
|
* @public
|
|
@@ -415,9 +417,7 @@ export class MediaControl extends UICorePlugin {
|
|
|
415
417
|
this.onActiveContainerChanged,
|
|
416
418
|
)
|
|
417
419
|
this.listenTo(this.core, Events.CORE_MOUSE_MOVE, this.show)
|
|
418
|
-
this.listenTo(this.core, Events.CORE_MOUSE_LEAVE,
|
|
419
|
-
this.hide(this.options.hideMediaControlDelay),
|
|
420
|
-
)
|
|
420
|
+
this.listenTo(this.core, Events.CORE_MOUSE_LEAVE, this.delayHide)
|
|
421
421
|
this.listenTo(this.core, Events.CORE_FULLSCREEN, this.show)
|
|
422
422
|
this.listenTo(this.core, Events.CORE_OPTIONS_CHANGE, this.configure)
|
|
423
423
|
this.listenTo(this.core, Events.CORE_RESIZE, this.playerResize)
|
|
@@ -522,6 +522,8 @@ export class MediaControl extends UICorePlugin {
|
|
|
522
522
|
this.listenTo(this.core, Events.CONTAINER_DESTROYED, () => {
|
|
523
523
|
this.cancelRenderTimer()
|
|
524
524
|
})
|
|
525
|
+
this.listenTo(this.core.activeContainer, Events.CONTAINER_MOUSE_ENTER, this.show)
|
|
526
|
+
this.listenTo(this.core.activeContainer, Events.CONTAINER_MOUSE_LEAVE, this.delayHide)
|
|
525
527
|
}
|
|
526
528
|
|
|
527
529
|
/**
|
|
@@ -717,6 +719,14 @@ export class MediaControl extends UICorePlugin {
|
|
|
717
719
|
this.$el.removeClass('w370')
|
|
718
720
|
this.$el.removeClass('w270')
|
|
719
721
|
this.verticalVolume = false
|
|
722
|
+
trace(`${T} playerResize`, {
|
|
723
|
+
size,
|
|
724
|
+
width: this.container.$el.width(),
|
|
725
|
+
height: this.container.$el.height(),
|
|
726
|
+
hideVolumeBar: this.options.hideVolumeBar,
|
|
727
|
+
isMobile: Browser.isMobile,
|
|
728
|
+
})
|
|
729
|
+
|
|
720
730
|
try {
|
|
721
731
|
const skinWidth = this.container.$el.width() || size.width
|
|
722
732
|
|
|
@@ -1038,7 +1048,7 @@ export class MediaControl extends UICorePlugin {
|
|
|
1038
1048
|
return
|
|
1039
1049
|
}
|
|
1040
1050
|
|
|
1041
|
-
const timeout =
|
|
1051
|
+
const timeout = DEFAULT_HIDE_DELAY
|
|
1042
1052
|
const mousePointerMoved =
|
|
1043
1053
|
event &&
|
|
1044
1054
|
event.clientX !== this.lastMouseX &&
|
|
@@ -1068,6 +1078,17 @@ export class MediaControl extends UICorePlugin {
|
|
|
1068
1078
|
}
|
|
1069
1079
|
|
|
1070
1080
|
private hide(delay = 0) {
|
|
1081
|
+
trace(`${T} hide`, {
|
|
1082
|
+
delay,
|
|
1083
|
+
visible: this.isVisible(),
|
|
1084
|
+
disabled: this.disabled,
|
|
1085
|
+
hideMediaControl: this.options.hideMediaControl,
|
|
1086
|
+
userKeepVisible: this.userKeepVisible,
|
|
1087
|
+
keepVisible: this.keepVisible,
|
|
1088
|
+
draggingSeekBar: this.draggingSeekBar,
|
|
1089
|
+
draggingVolumeBar: this.draggingVolumeBar,
|
|
1090
|
+
})
|
|
1091
|
+
|
|
1071
1092
|
if (!this.isVisible()) {
|
|
1072
1093
|
return
|
|
1073
1094
|
}
|
|
@@ -1473,7 +1494,7 @@ export class MediaControl extends UICorePlugin {
|
|
|
1473
1494
|
if (!this.hasUpdate || !this.metadataLoaded) {
|
|
1474
1495
|
return this
|
|
1475
1496
|
}
|
|
1476
|
-
const timeout = this.options.hideMediaControlDelay ||
|
|
1497
|
+
const timeout = this.options.hideMediaControlDelay || DEFAULT_HIDE_DELAY
|
|
1477
1498
|
|
|
1478
1499
|
this.$el.html(MediaControl.template({ settings: this.settings }))
|
|
1479
1500
|
|
|
@@ -1625,6 +1646,13 @@ export class MediaControl extends UICorePlugin {
|
|
|
1625
1646
|
this.$el.removeClass('dvr')
|
|
1626
1647
|
}
|
|
1627
1648
|
}
|
|
1649
|
+
|
|
1650
|
+
private delayHide(e: unknown) {
|
|
1651
|
+
trace(`${T} delayHide`, {
|
|
1652
|
+
e,
|
|
1653
|
+
})
|
|
1654
|
+
this.hide(this.options.hideMediaControlDelay || DEFAULT_HIDE_DELAY)
|
|
1655
|
+
}
|
|
1628
1656
|
}
|
|
1629
1657
|
|
|
1630
1658
|
MediaControl.extend = function (properties) {
|
|
@@ -57,10 +57,10 @@ describe('MediaControl', () => {
|
|
|
57
57
|
core.activePlayback.emit(Events.PLAYBACK_LOADEDMETADATA)
|
|
58
58
|
core.activeContainer.emit(Events.CONTAINER_LOADEDMETADATA)
|
|
59
59
|
})
|
|
60
|
-
// TODO review why delay is needed
|
|
60
|
+
// TODO review why such a short delay is needed
|
|
61
61
|
it('should wait a delay before rendering anything', async () => {
|
|
62
62
|
expect(mediaControl.el.innerHTML).toBe('')
|
|
63
|
-
await new Promise((resolve) => setTimeout(resolve,
|
|
63
|
+
await new Promise((resolve) => setTimeout(resolve, 25))
|
|
64
64
|
expect(mediaControl.el.innerHTML).toMatchSnapshot()
|
|
65
65
|
expect(
|
|
66
66
|
mediaControl.$el.find('.media-control-left-panel [data-playpause]')
|
|
@@ -325,7 +325,7 @@ exports[`MediaControl > rendering timing > once metadata is loaded > should wait
|
|
|
325
325
|
<span class="drawer-text" data-volume=""></span>
|
|
326
326
|
</div>
|
|
327
327
|
|
|
328
|
-
<div class="bar-container
|
|
328
|
+
<div class="bar-container" data-volume="">
|
|
329
329
|
<div class="bar-background" data-volume="">
|
|
330
330
|
<div class="bar-fill-1 gcore-skin-main-color" data-volume="" style="width: 100%;"></div>
|
|
331
331
|
</div>
|