@gcorevideo/player 2.28.19 → 2.28.20
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.scss +2 -2
- package/assets/icons/new/arrow-right.svg +1 -1
- package/assets/icons/new/hd.svg +1 -1
- package/assets/icons/new/speed.svg +1 -1
- package/dist/core.js +1 -1
- package/dist/index.css +344 -344
- package/dist/index.embed.js +29 -19
- package/dist/index.js +29 -20
- package/lib/plugins/level-selector/QualityLevels.d.ts.map +1 -1
- package/lib/plugins/level-selector/QualityLevels.js +4 -0
- package/lib/plugins/media-control/MediaControl.d.ts.map +1 -1
- package/lib/plugins/media-control/MediaControl.js +6 -4
- package/lib/plugins/subtitles/ClosedCaptions.d.ts.map +1 -1
- package/lib/plugins/subtitles/ClosedCaptions.js +14 -11
- package/package.json +1 -1
- package/src/plugins/level-selector/QualityLevels.ts +4 -0
- package/src/plugins/media-control/MediaControl.ts +6 -4
- package/src/plugins/subtitles/ClosedCaptions.ts +15 -12
- package/src/plugins/subtitles/__tests__/ClosedCaptions.test.ts +9 -3
- package/tsconfig.tsbuildinfo +1 -1
package/dist/index.embed.js
CHANGED
|
@@ -51825,9 +51825,7 @@ class MediaControl extends UICorePlugin {
|
|
|
51825
51825
|
this.listenTo(this.core.activeContainer, Events$1.CONTAINER_PAUSE, this.changeTogglePlay);
|
|
51826
51826
|
this.listenTo(this.core.activeContainer, Events$1.CONTAINER_STOP, this.changeTogglePlay);
|
|
51827
51827
|
this.listenTo(this.core.activeContainer, Events$1.CONTAINER_DBLCLICK, this.toggleFullscreen);
|
|
51828
|
-
this.listenTo(this.core.activeContainer, Events$1.CONTAINER_CLICK, () =>
|
|
51829
|
-
this.clickaway(this.core.activeContainer.$el[0]);
|
|
51830
|
-
});
|
|
51828
|
+
this.listenTo(this.core.activeContainer, Events$1.CONTAINER_CLICK, () => this.clickaway(this.core.activeContainer.$el[0]));
|
|
51831
51829
|
this.listenTo(this.core.activeContainer, Events$1.CONTAINER_TIMEUPDATE, this.onTimeUpdate);
|
|
51832
51830
|
this.listenTo(this.core.activeContainer, Events$1.CONTAINER_PROGRESS, this.updateProgressBar);
|
|
51833
51831
|
this.listenTo(this.core.activeContainer, Events$1.CONTAINER_SETTINGSUPDATE, this.updateSettings);
|
|
@@ -52748,7 +52746,11 @@ class MediaControl extends UICorePlugin {
|
|
|
52748
52746
|
}
|
|
52749
52747
|
// 2 seconds delay is needed since on mobile devices mouse(touch)move events are not dispatched immediately
|
|
52750
52748
|
// as opposed to the click event
|
|
52751
|
-
clickaway = clickaway(() =>
|
|
52749
|
+
clickaway = clickaway(() => {
|
|
52750
|
+
if (Browser.isMobile) {
|
|
52751
|
+
setTimeout(this.resetUserKeepVisible, 0);
|
|
52752
|
+
}
|
|
52753
|
+
});
|
|
52752
52754
|
}
|
|
52753
52755
|
MediaControl.extend = function (properties) {
|
|
52754
52756
|
return extend(MediaControl, properties);
|
|
@@ -53141,7 +53143,7 @@ class BigMuteButton extends UICorePlugin {
|
|
|
53141
53143
|
|
|
53142
53144
|
const pluginHtml$3 = "<button class=\"media-control-button gplayer-lite-btn gcore-skin-button-color gear-icon\"\n id=\"gear-button\"\n aria-expanded=\"false\"\n aria-controls=\"gear-options\">\n <%= icon %>\n</button>\n<div class=\"gear-wrapper gcore-skin-bg-color\" id=\"gear-options-wrapper\">\n <ul class=\"gear-options-list\" id=\"gear-options\" role=\"menu\"></ul>\n</div>\n";
|
|
53143
53145
|
|
|
53144
|
-
insertStyle(".media-control-skin-1 .media-control-item.media-control-gear {\n order: 99;\n}\n.media-control-skin-1 .media-control-item.media-control-gear .gear-wrapper {\n position: absolute;\n right: 16px;\n bottom: 52px;\n width: 250px;\n min-height: 48px;\n z-index: 9999;\n border-radius: 4px;\n box-shadow: 0 0 1px 1px var(--gplayer-mc-popup-border-color);\n}\n.media-control-skin-1 .media-control-item.media-control-gear .gear-options-list {\n padding: 8px 0;\n}\n.media-control-skin-1 .media-control-item.media-control-gear .gear-option {\n margin: 0;\n text-align: left;\n line-height: 22px;\n padding: 5px 14px;\n width: 250px;\n font-size: 12px;\n display: flex;\n align-items: center;\n justify-content: flex-start;\n gap: 8px;\n}\n.media-control-skin-1 .media-control-item.media-control-gear .gear-option_icon {\n flex: 24px 0 0;\n height:
|
|
53146
|
+
insertStyle(".media-control-skin-1 .media-control-item.media-control-gear {\n order: 99;\n}\n.media-control-skin-1 .media-control-item.media-control-gear .gear-wrapper {\n position: absolute;\n right: 16px;\n bottom: 52px;\n width: 250px;\n min-height: 48px;\n z-index: 9999;\n border-radius: 4px;\n box-shadow: 0 0 1px 1px var(--gplayer-mc-popup-border-color);\n}\n.media-control-skin-1 .media-control-item.media-control-gear .gear-options-list {\n padding: 8px 0;\n}\n.media-control-skin-1 .media-control-item.media-control-gear .gear-option {\n margin: 0;\n text-align: left;\n line-height: 22px;\n padding: 5px 14px;\n width: 250px;\n font-size: 12px;\n display: flex;\n align-items: center;\n justify-content: flex-start;\n gap: 8px;\n}\n.media-control-skin-1 .media-control-item.media-control-gear .gear-option_icon {\n flex: 24px 0 0;\n height: 20px;\n}\n.media-control-skin-1 .media-control-item.media-control-gear .gear-option_icon.hidden {\n visibility: hidden;\n display: inline-block;\n}\n.media-control-skin-1 .media-control-item.media-control-gear .gear-option_label {\n flex: 0 1 100%;\n}\n.media-control-skin-1 .media-control-item.media-control-gear .gear-option_arrow-right-icon {\n flex: 0 0 14px;\n height: 20px;\n}\n.media-control-skin-1 .media-control-item.media-control-gear .gear-option_value {\n flex: 1 0 auto;\n}");
|
|
53145
53147
|
|
|
53146
53148
|
insertStyle("*,\n:focus,\n:visited {\n outline: none !important;\n}\n\n.gear-wrapper .go-back {\n font-weight: 600;\n font-size: 14px;\n line-height: 20px;\n width: 100%;\n text-align: left;\n padding: 12px;\n}\n.gear-wrapper .go-back .arrow-left-icon {\n float: left;\n padding-top: 2px;\n padding-right: 2px;\n}\n.gear-wrapper .go-back .arrow-left-icon svg {\n height: 16px;\n}\n.gear-wrapper .gear-options-list,\n.gear-wrapper .gear-sub-menu {\n list-style-type: none;\n}\n.gear-wrapper ul.gear-sub-menu {\n width: 100%;\n min-width: 60px;\n border-top: 2px solid rgb(36, 36, 36);\n overflow-y: auto;\n}\n.gear-wrapper ul.gear-sub-menu li {\n font-size: 12px;\n text-align: left;\n}\n.gear-wrapper ul.gear-sub-menu li a {\n display: block;\n text-decoration: none;\n height: 30px;\n padding: 5px 10px;\n line-height: 22px;\n color: var(--gplayer-mc-text-dim-color);\n}\n.gear-wrapper ul.gear-sub-menu li a:hover {\n color: var(--gplayer-mc-text-color);\n background-color: rgba(0, 0, 0, 0.4);\n}\n.gear-wrapper ul.gear-sub-menu li a:hover a {\n color: var(--gplayer-mc-text-color);\n text-decoration: none;\n}\n.gear-wrapper ul.gear-sub-menu li a .check-icon {\n width: 30px;\n height: 20px;\n float: left;\n display: block;\n}\n.gear-wrapper ul.gear-sub-menu li a .check-icon svg {\n display: none;\n}\n.gear-wrapper ul.gear-sub-menu li.current a .check-icon svg {\n display: inline;\n}");
|
|
53147
53149
|
|
|
@@ -56894,9 +56896,9 @@ const buttonHtml$1 = "<button class='gplayer-lite-btn gcore-skin-text-color gear
|
|
|
56894
56896
|
|
|
56895
56897
|
const listHtml$1 = "<button class=\"gplayer-lite-btn go-back gcore-skin-text-color\" id=\"playback-rate-back-button\">\n <span class=\"arrow-left-icon\"><%= arrowLeftIcon %></span>\n <%= i18n.t('playback_rate') %>\n</button>\n<ul class=\"gear-sub-menu\" id=\"playback-rate-menu\">\n <% for (const item of playbackRates) { %>\n <li<%= item.value === current ? ' class=\"current\"' : '' %>>\n <a href=\"#\" class=\"gear-sub-menu_btn gcore-skin-text-color<%= item.value === current ? ' gcore-skin-active' : '' %>\" data-rate=\"<%= item.value %>\">\n <span class=\"check-icon\"><%= checkIcon %></span>\n <%= item.label %>\n </a>\n </li>\n <% } %>\n</ul>";
|
|
56896
56898
|
|
|
56897
|
-
const speedIcon = "<svg width=\"
|
|
56899
|
+
const speedIcon = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 24 24\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n <path\n d=\"M11.9854 23.9999C11.4272 23.9999 10.9571 23.5293 10.9571 22.9704C10.9571 22.4115 11.4272 21.9409 11.9854 21.9409C17.4492 21.9409 21.9143 17.4704 21.9143 11.9999C21.9143 6.52948 17.4492 2.05899 11.9854 2.05899C11.4272 2.05899 10.9571 1.58836 10.9571 1.02949C10.9571 0.470625 11.4272 0 11.9854 0C18.5949 0 24 5.38224 24 12.0291C24 18.6766 18.5949 24 11.9854 24V23.9999ZM10.2227 17.853L17.4785 13.4413C18.0072 13.1178 18.301 12.5885 18.301 11.9707C18.301 11.353 17.9779 10.8237 17.4785 10.5002L10.2227 6.08852C9.69405 5.76499 9.01826 5.76499 8.4896 6.05919C7.96094 6.35338 7.60828 6.94157 7.60828 7.5591V16.3824C7.60828 17.0002 7.93142 17.5883 8.4896 17.8824C8.75393 18.0294 9.04779 18.1177 9.34139 18.1177C9.63523 18.1177 9.95838 18.0294 10.2227 17.853V17.853ZM15.9216 11.9707L9.66457 15.7647V8.17661L15.9216 11.9707ZM8.22516 22.3529C8.4602 21.8236 8.25447 21.2058 7.7258 20.9705C7.19714 20.7353 6.69755 20.4413 6.2277 20.0882C5.75764 19.7646 5.11137 19.8822 4.78824 20.3235C4.46509 20.7941 4.58251 21.4412 5.02327 21.7647C5.58146 22.1764 6.19819 22.5293 6.81519 22.8235C6.96211 22.8824 7.10903 22.9117 7.25574 22.9117C7.66699 22.941 8.04893 22.7057 8.22513 22.3528L8.22516 22.3529ZM3.58381 19.0882C4.05387 18.7647 4.17127 18.1177 3.84814 17.647C3.52502 17.1764 3.23115 16.6765 2.99635 16.1471C2.76132 15.6178 2.14456 15.4118 1.6157 15.6472C1.08704 15.8825 0.881306 16.5 1.11634 17.0295C1.41018 17.6472 1.7626 18.2648 2.14459 18.8236C2.35032 19.1178 2.67325 19.2646 2.99638 19.2646C3.20191 19.2942 3.40763 19.2353 3.58384 19.0882L3.58381 19.0882ZM1.14563 13.9707C1.70382 13.9118 2.14435 13.4118 2.08576 12.853C2.05645 12.5588 2.05645 12.2648 2.05645 11.9706C2.05645 11.6764 2.05645 11.4117 2.08576 11.1178C2.14456 10.5589 1.70381 10.059 1.14563 10.0001C0.587439 9.94122 0.0881057 10.3825 0.0293019 10.9414C1.96979e-07 11.2942 0 11.6178 0 11.9709C0 12.3237 0.0293018 12.6768 0.0588091 13.0297C0.117618 13.5589 0.558169 13.9709 1.08706 13.9709C1.08686 13.9707 1.11636 13.9707 1.14567 13.9707L1.14563 13.9707ZM2.96687 7.79432C3.2019 7.26502 3.49553 6.76482 3.81866 6.2944C4.1418 5.82377 4.02439 5.17672 3.55432 4.8532C3.08427 4.52967 2.438 4.64722 2.11486 5.11786C1.73292 5.67672 1.38047 6.2942 1.08661 6.91193C0.851579 7.44123 1.08661 8.05897 1.58597 8.29426C1.73289 8.35314 1.87981 8.38247 2.02652 8.38247C2.40888 8.41181 2.7906 8.1767 2.96686 7.7943L2.96687 7.79432ZM6.22757 3.85328C6.69762 3.52974 7.19696 3.23554 7.69635 2.97089C8.22501 2.73558 8.43074 2.11807 8.19571 1.58857C7.96068 1.05927 7.34392 0.85329 6.81505 1.08861C6.19806 1.3828 5.58128 1.73565 5.02314 2.14741C4.55308 2.47094 4.43568 3.11797 4.78811 3.5886C4.99384 3.8828 5.31676 4.02969 5.6399 4.02969C5.84583 4.05902 6.05135 4.00014 6.22757 3.85325V3.85328Z\"\n fill=\"#C9C9C9\"/>\n</svg>\n";
|
|
56898
56900
|
|
|
56899
|
-
const arrowRightIcon = "<svg width=\"
|
|
56901
|
+
const arrowRightIcon = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 24 24\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n <path\n d=\"M8.70725 20.7073C8.51225 20.9023 8.25625 21.0002 8.00025 21.0002C7.74425 21.0002 7.48825 20.9023 7.29325 20.7073C6.90225 20.3162 6.90225 19.6842 7.29325 19.2932L14.5863 12.0002L7.29325 4.70725C6.90225 4.31625 6.90225 3.68425 7.29325 3.29325C7.68425 2.90225 8.31625 2.90225 8.70725 3.29325L16.7073 11.2933C17.0983 11.6842 17.0983 12.3162 16.7073 12.7072L8.70725 20.7073Z\"\n fill=\"#C9C9C9\"/>\n</svg>\n";
|
|
56900
56902
|
|
|
56901
56903
|
const arrowLeftIcon = "<svg width=\"24\" height=\"24\" viewBox=\"0 0 24 24\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n <path fill-rule=\"evenodd\" clip-rule=\"evenodd\"\n d=\"M16.7073 19.2932C17.0983 19.6842 17.0983 20.3162 16.7073 20.7073C16.5123 20.9023 16.2563 21.0002 16.0003 21.0002C15.7443 21.0002 15.4882 20.9023 15.2933 20.7073L7.29325 12.7072C6.90225 12.3162 6.90225 11.6842 7.29325 11.2933L15.2933 3.29325C15.6842 2.90225 16.3163 2.90225 16.7073 3.29325C17.0983 3.68425 17.0983 4.31625 16.7073 4.70725L9.41425 12.0002L16.7073 19.2932Z\"\n fill=\"#C9C9C9\"/>\n</svg>\n";
|
|
56902
56904
|
|
|
@@ -57413,7 +57415,7 @@ const buttonHtml = "<button class='gplayer-lite-btn gcore-skin-text-color gear-o
|
|
|
57413
57415
|
|
|
57414
57416
|
const listHtml = "<button class=\"gplayer-lite-btn go-back gcore-skin-text-color\" id=\"level-selector-back-button\">\n <span class=\"arrow-left-icon\"><%= arrowLeftIcon %></span>\n <%= i18n.t('quality') %>\n</button>\n<ul class=\"gear-sub-menu quality-levels\" id=\"level-selector-menu\" role=\"menu\">\n <% if (!removeAuto) { %>\n <li>\n <a href=\"#\"\n class=\"gear-sub-menu_btn gcore-skin-text-color\"\n data-id=\"-1\"\n id=\"level_selector_auto\"\n aria-checked=\"<%= current === -1 %>\"\n role=\"menuitemradio\"\n >\n <span class=\"check-icon\"><%= checkIcon %></span>\n <%= i18n.t('auto') %>\n </a>\n </li>\n <% } %>\n <% for (const item of levels.slice().reverse()) {\n var disabled = maxLevel >= 0 && item.level > maxLevel\n var checked = item.level === current\n %>\n <li class=\"<%= disabled ? ' disabled' : ''%><%=checked ? ' current' : ''%>\">\n <a href=\"#\"\n class=\"gear-sub-menu_btn gcore-skin-text-color<%= checked ? ' gcore-skin-active' : '' %>\"\n data-id=\"<%= item.level %>\"\n aria-disabled=\"<%= disabled %>\"\n aria-checked=\"<%= checked %>\"\n role=\"menuitemradio\"\n id=\"level_selector_<%= item.width > item.height ? item.height : item.width %>\"\n >\n <span class=\"check-icon\"><%= checkIcon %></span>\n <%= labels[item.level] %>\n </a>\n </li>\n <% } %>\n</ul>\n";
|
|
57415
57417
|
|
|
57416
|
-
const hdIcon = "<svg width=\"
|
|
57418
|
+
const hdIcon = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 24 24\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n <path\n d=\"M14.9562 8.22232H13.9961V15.1873H14.9562C15.8914 15.1873 16.766 14.8253 17.4195 14.1676C18.0786 13.5037 18.4415 12.6281 18.4415 11.7026C18.4415 9.7837 16.8781 8.22253 14.9561 8.22253L14.9562 8.22232Z\"\n fill=\"#C9C9C9\"/>\n <path\n d=\"M22.0801 4H1.91994C0.859222 4 0 4.86406 0 5.91994V17.4878C0 18.5437 0.859222 19.4078 1.91994 19.4078H22.0801C23.1408 19.4078 24 18.5437 24 17.4878V5.91994C24 4.86406 23.1408 4 22.0801 4ZM10.3975 15.3473C10.3975 15.6124 10.1827 15.8272 9.91754 15.8272C9.65216 15.8272 9.43761 15.6122 9.43761 15.3473V12.0239H5.55956V15.3473C5.55956 15.6124 5.34481 15.8272 5.07963 15.8272C4.81425 15.8272 4.5997 15.6122 4.5997 15.3473L4.59949 7.74042C4.59949 7.47524 4.81425 7.26049 5.07943 7.26049C5.34481 7.26049 5.55936 7.47544 5.55936 7.74042V11.0636H9.43741V7.74042C9.43741 7.47524 9.65216 7.26049 9.91734 7.26049C10.1827 7.26049 10.3973 7.47544 10.3973 7.74042L10.3975 15.3473ZM18.1005 14.8438C17.2652 15.6844 16.1486 16.1472 14.9561 16.1472H13.5161C13.2507 16.1472 13.0361 15.9323 13.0361 15.6673V7.74263C13.0361 7.47745 13.2509 7.26269 13.5161 7.26269H14.9561C17.4072 7.26269 19.4013 9.25438 19.4013 11.7027C19.4013 12.8835 18.9392 13.9991 18.1005 14.844V14.8438Z\"\n fill=\"#C9C9C9\"/>\n</svg>\n";
|
|
57417
57419
|
|
|
57418
57420
|
insertStyle(".quality-levels li.disabled {\n opacity: 0.5;\n pointer-events: none;\n}\n.quality-levels li.current {\n background-color: #000;\n}");
|
|
57419
57421
|
|
|
@@ -57553,6 +57555,7 @@ class QualityLevels extends UICorePlugin {
|
|
|
57553
57555
|
*/
|
|
57554
57556
|
render() {
|
|
57555
57557
|
if (!this.shouldRender()) {
|
|
57558
|
+
this.$el.hide();
|
|
57556
57559
|
return this;
|
|
57557
57560
|
}
|
|
57558
57561
|
this.renderDropdown();
|
|
@@ -57572,6 +57575,9 @@ class QualityLevels extends UICorePlugin {
|
|
|
57572
57575
|
}));
|
|
57573
57576
|
}
|
|
57574
57577
|
updateButton() {
|
|
57578
|
+
if (!this.shouldRender()) {
|
|
57579
|
+
return;
|
|
57580
|
+
}
|
|
57575
57581
|
this.core.getPlugin('bottom_gear')
|
|
57576
57582
|
?.addItem('quality', this.$el)
|
|
57577
57583
|
.html(QualityLevels.buttonTemplate({
|
|
@@ -58419,8 +58425,7 @@ class ClosedCaptions extends UICorePlugin {
|
|
|
58419
58425
|
}
|
|
58420
58426
|
get preselectedLanguage() {
|
|
58421
58427
|
return (this.core.options.cc?.language ??
|
|
58422
|
-
this.core.options.subtitles?.language
|
|
58423
|
-
'');
|
|
58428
|
+
this.core.options.subtitles?.language);
|
|
58424
58429
|
}
|
|
58425
58430
|
/**
|
|
58426
58431
|
* @internal
|
|
@@ -58473,13 +58478,17 @@ class ClosedCaptions extends UICorePlugin {
|
|
|
58473
58478
|
this.applyTracks();
|
|
58474
58479
|
this.mount();
|
|
58475
58480
|
}
|
|
58476
|
-
onSubtitleChanged({ id }) {
|
|
58481
|
+
onSubtitleChanged({ id: _ }) {
|
|
58482
|
+
// ignoring the subtitle selected by the playback engine or user agent
|
|
58483
|
+
const id = this.track?.id ?? -1;
|
|
58477
58484
|
if (id === -1) {
|
|
58478
58485
|
this.clearSubtitleText();
|
|
58479
58486
|
}
|
|
58480
58487
|
for (const track of this.tracks) {
|
|
58488
|
+
// Native subtitles are always hidden
|
|
58489
|
+
track.track.mode = 'hidden';
|
|
58481
58490
|
if (track.id === id) {
|
|
58482
|
-
track.track.mode = 'showing'
|
|
58491
|
+
// track.track.mode = 'showing'
|
|
58483
58492
|
this.setSubtitleText(this.getSubtitleText(track.track));
|
|
58484
58493
|
track.track.oncuechange = (e) => {
|
|
58485
58494
|
try {
|
|
@@ -58497,7 +58506,7 @@ class ClosedCaptions extends UICorePlugin {
|
|
|
58497
58506
|
}
|
|
58498
58507
|
else {
|
|
58499
58508
|
track.track.oncuechange = null;
|
|
58500
|
-
track.track.mode = 'hidden'
|
|
58509
|
+
// track.track.mode = 'hidden'
|
|
58501
58510
|
}
|
|
58502
58511
|
}
|
|
58503
58512
|
}
|
|
@@ -58624,12 +58633,11 @@ class ClosedCaptions extends UICorePlugin {
|
|
|
58624
58633
|
applyPreselectedSubtitles() {
|
|
58625
58634
|
if (!this.isPreselectedApplied) {
|
|
58626
58635
|
this.isPreselectedApplied = true;
|
|
58627
|
-
if
|
|
58628
|
-
|
|
58629
|
-
}
|
|
58636
|
+
// if the language is undefined, then let the engine decide
|
|
58637
|
+
// to hide the subtitles forcefully, set the language to 'none'
|
|
58630
58638
|
setTimeout(() => {
|
|
58631
58639
|
this.selectItem(this.tracks.find((t) => t.track.language === this.preselectedLanguage) ?? null);
|
|
58632
|
-
},
|
|
58640
|
+
}, 0);
|
|
58633
58641
|
}
|
|
58634
58642
|
}
|
|
58635
58643
|
hideMenu() {
|
|
@@ -58658,8 +58666,10 @@ class ClosedCaptions extends UICorePlugin {
|
|
|
58658
58666
|
return this.$el.find('#gplayer-cc-menu li'); // TODO fix semantically
|
|
58659
58667
|
}
|
|
58660
58668
|
selectSubtitles() {
|
|
58661
|
-
|
|
58662
|
-
|
|
58669
|
+
this.track ? this.track.id : -1;
|
|
58670
|
+
// TODO find out if this is needed
|
|
58671
|
+
// this.core.activePlayback.closedCaptionsTrackId = trackId
|
|
58672
|
+
this.core.activePlayback.closedCaptionsTrackId = -1;
|
|
58663
58673
|
}
|
|
58664
58674
|
getSubtitleText(track) {
|
|
58665
58675
|
const currentTime = this.core.activePlayback?.getCurrentTime() ?? 0;
|
package/dist/index.js
CHANGED
|
@@ -51409,7 +51409,7 @@ class Player {
|
|
|
51409
51409
|
}
|
|
51410
51410
|
}
|
|
51411
51411
|
|
|
51412
|
-
var version$1 = "2.28.
|
|
51412
|
+
var version$1 = "2.28.20";
|
|
51413
51413
|
|
|
51414
51414
|
var packages = {
|
|
51415
51415
|
"node_modules/@clappr/core": {
|
|
@@ -52009,9 +52009,7 @@ class MediaControl extends UICorePlugin {
|
|
|
52009
52009
|
this.listenTo(this.core.activeContainer, Events$1.CONTAINER_PAUSE, this.changeTogglePlay);
|
|
52010
52010
|
this.listenTo(this.core.activeContainer, Events$1.CONTAINER_STOP, this.changeTogglePlay);
|
|
52011
52011
|
this.listenTo(this.core.activeContainer, Events$1.CONTAINER_DBLCLICK, this.toggleFullscreen);
|
|
52012
|
-
this.listenTo(this.core.activeContainer, Events$1.CONTAINER_CLICK, () =>
|
|
52013
|
-
this.clickaway(this.core.activeContainer.$el[0]);
|
|
52014
|
-
});
|
|
52012
|
+
this.listenTo(this.core.activeContainer, Events$1.CONTAINER_CLICK, () => this.clickaway(this.core.activeContainer.$el[0]));
|
|
52015
52013
|
this.listenTo(this.core.activeContainer, Events$1.CONTAINER_TIMEUPDATE, this.onTimeUpdate);
|
|
52016
52014
|
this.listenTo(this.core.activeContainer, Events$1.CONTAINER_PROGRESS, this.updateProgressBar);
|
|
52017
52015
|
this.listenTo(this.core.activeContainer, Events$1.CONTAINER_SETTINGSUPDATE, this.updateSettings);
|
|
@@ -52936,7 +52934,11 @@ class MediaControl extends UICorePlugin {
|
|
|
52936
52934
|
}
|
|
52937
52935
|
// 2 seconds delay is needed since on mobile devices mouse(touch)move events are not dispatched immediately
|
|
52938
52936
|
// as opposed to the click event
|
|
52939
|
-
clickaway = clickaway(() =>
|
|
52937
|
+
clickaway = clickaway(() => {
|
|
52938
|
+
if (Browser.isMobile) {
|
|
52939
|
+
setTimeout(this.resetUserKeepVisible, 0);
|
|
52940
|
+
}
|
|
52941
|
+
});
|
|
52940
52942
|
}
|
|
52941
52943
|
MediaControl.extend = function (properties) {
|
|
52942
52944
|
return extend(MediaControl, properties);
|
|
@@ -58129,9 +58131,9 @@ const buttonHtml$1 = "<button class='gplayer-lite-btn gcore-skin-text-color gear
|
|
|
58129
58131
|
|
|
58130
58132
|
const listHtml$1 = "<button class=\"gplayer-lite-btn go-back gcore-skin-text-color\" id=\"playback-rate-back-button\">\n <span class=\"arrow-left-icon\"><%= arrowLeftIcon %></span>\n <%= i18n.t('playback_rate') %>\n</button>\n<ul class=\"gear-sub-menu\" id=\"playback-rate-menu\">\n <% for (const item of playbackRates) { %>\n <li<%= item.value === current ? ' class=\"current\"' : '' %>>\n <a href=\"#\" class=\"gear-sub-menu_btn gcore-skin-text-color<%= item.value === current ? ' gcore-skin-active' : '' %>\" data-rate=\"<%= item.value %>\">\n <span class=\"check-icon\"><%= checkIcon %></span>\n <%= item.label %>\n </a>\n </li>\n <% } %>\n</ul>";
|
|
58131
58133
|
|
|
58132
|
-
const speedIcon = "<svg width=\"
|
|
58134
|
+
const speedIcon = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 24 24\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n <path\n d=\"M11.9854 23.9999C11.4272 23.9999 10.9571 23.5293 10.9571 22.9704C10.9571 22.4115 11.4272 21.9409 11.9854 21.9409C17.4492 21.9409 21.9143 17.4704 21.9143 11.9999C21.9143 6.52948 17.4492 2.05899 11.9854 2.05899C11.4272 2.05899 10.9571 1.58836 10.9571 1.02949C10.9571 0.470625 11.4272 0 11.9854 0C18.5949 0 24 5.38224 24 12.0291C24 18.6766 18.5949 24 11.9854 24V23.9999ZM10.2227 17.853L17.4785 13.4413C18.0072 13.1178 18.301 12.5885 18.301 11.9707C18.301 11.353 17.9779 10.8237 17.4785 10.5002L10.2227 6.08852C9.69405 5.76499 9.01826 5.76499 8.4896 6.05919C7.96094 6.35338 7.60828 6.94157 7.60828 7.5591V16.3824C7.60828 17.0002 7.93142 17.5883 8.4896 17.8824C8.75393 18.0294 9.04779 18.1177 9.34139 18.1177C9.63523 18.1177 9.95838 18.0294 10.2227 17.853V17.853ZM15.9216 11.9707L9.66457 15.7647V8.17661L15.9216 11.9707ZM8.22516 22.3529C8.4602 21.8236 8.25447 21.2058 7.7258 20.9705C7.19714 20.7353 6.69755 20.4413 6.2277 20.0882C5.75764 19.7646 5.11137 19.8822 4.78824 20.3235C4.46509 20.7941 4.58251 21.4412 5.02327 21.7647C5.58146 22.1764 6.19819 22.5293 6.81519 22.8235C6.96211 22.8824 7.10903 22.9117 7.25574 22.9117C7.66699 22.941 8.04893 22.7057 8.22513 22.3528L8.22516 22.3529ZM3.58381 19.0882C4.05387 18.7647 4.17127 18.1177 3.84814 17.647C3.52502 17.1764 3.23115 16.6765 2.99635 16.1471C2.76132 15.6178 2.14456 15.4118 1.6157 15.6472C1.08704 15.8825 0.881306 16.5 1.11634 17.0295C1.41018 17.6472 1.7626 18.2648 2.14459 18.8236C2.35032 19.1178 2.67325 19.2646 2.99638 19.2646C3.20191 19.2942 3.40763 19.2353 3.58384 19.0882L3.58381 19.0882ZM1.14563 13.9707C1.70382 13.9118 2.14435 13.4118 2.08576 12.853C2.05645 12.5588 2.05645 12.2648 2.05645 11.9706C2.05645 11.6764 2.05645 11.4117 2.08576 11.1178C2.14456 10.5589 1.70381 10.059 1.14563 10.0001C0.587439 9.94122 0.0881057 10.3825 0.0293019 10.9414C1.96979e-07 11.2942 0 11.6178 0 11.9709C0 12.3237 0.0293018 12.6768 0.0588091 13.0297C0.117618 13.5589 0.558169 13.9709 1.08706 13.9709C1.08686 13.9707 1.11636 13.9707 1.14567 13.9707L1.14563 13.9707ZM2.96687 7.79432C3.2019 7.26502 3.49553 6.76482 3.81866 6.2944C4.1418 5.82377 4.02439 5.17672 3.55432 4.8532C3.08427 4.52967 2.438 4.64722 2.11486 5.11786C1.73292 5.67672 1.38047 6.2942 1.08661 6.91193C0.851579 7.44123 1.08661 8.05897 1.58597 8.29426C1.73289 8.35314 1.87981 8.38247 2.02652 8.38247C2.40888 8.41181 2.7906 8.1767 2.96686 7.7943L2.96687 7.79432ZM6.22757 3.85328C6.69762 3.52974 7.19696 3.23554 7.69635 2.97089C8.22501 2.73558 8.43074 2.11807 8.19571 1.58857C7.96068 1.05927 7.34392 0.85329 6.81505 1.08861C6.19806 1.3828 5.58128 1.73565 5.02314 2.14741C4.55308 2.47094 4.43568 3.11797 4.78811 3.5886C4.99384 3.8828 5.31676 4.02969 5.6399 4.02969C5.84583 4.05902 6.05135 4.00014 6.22757 3.85325V3.85328Z\"\n fill=\"#C9C9C9\"/>\n</svg>\n";
|
|
58133
58135
|
|
|
58134
|
-
const arrowRightIcon = "<svg width=\"
|
|
58136
|
+
const arrowRightIcon = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 24 24\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n <path\n d=\"M8.70725 20.7073C8.51225 20.9023 8.25625 21.0002 8.00025 21.0002C7.74425 21.0002 7.48825 20.9023 7.29325 20.7073C6.90225 20.3162 6.90225 19.6842 7.29325 19.2932L14.5863 12.0002L7.29325 4.70725C6.90225 4.31625 6.90225 3.68425 7.29325 3.29325C7.68425 2.90225 8.31625 2.90225 8.70725 3.29325L16.7073 11.2933C17.0983 11.6842 17.0983 12.3162 16.7073 12.7072L8.70725 20.7073Z\"\n fill=\"#C9C9C9\"/>\n</svg>\n";
|
|
58135
58137
|
|
|
58136
58138
|
const arrowLeftIcon = "<svg width=\"24\" height=\"24\" viewBox=\"0 0 24 24\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n <path fill-rule=\"evenodd\" clip-rule=\"evenodd\"\n d=\"M16.7073 19.2932C17.0983 19.6842 17.0983 20.3162 16.7073 20.7073C16.5123 20.9023 16.2563 21.0002 16.0003 21.0002C15.7443 21.0002 15.4882 20.9023 15.2933 20.7073L7.29325 12.7072C6.90225 12.3162 6.90225 11.6842 7.29325 11.2933L15.2933 3.29325C15.6842 2.90225 16.3163 2.90225 16.7073 3.29325C17.0983 3.68425 17.0983 4.31625 16.7073 4.70725L9.41425 12.0002L16.7073 19.2932Z\"\n fill=\"#C9C9C9\"/>\n</svg>\n";
|
|
58137
58139
|
|
|
@@ -58651,7 +58653,7 @@ const buttonHtml = "<button class='gplayer-lite-btn gcore-skin-text-color gear-o
|
|
|
58651
58653
|
|
|
58652
58654
|
const listHtml = "<button class=\"gplayer-lite-btn go-back gcore-skin-text-color\" id=\"level-selector-back-button\">\n <span class=\"arrow-left-icon\"><%= arrowLeftIcon %></span>\n <%= i18n.t('quality') %>\n</button>\n<ul class=\"gear-sub-menu quality-levels\" id=\"level-selector-menu\" role=\"menu\">\n <% if (!removeAuto) { %>\n <li>\n <a href=\"#\"\n class=\"gear-sub-menu_btn gcore-skin-text-color\"\n data-id=\"-1\"\n id=\"level_selector_auto\"\n aria-checked=\"<%= current === -1 %>\"\n role=\"menuitemradio\"\n >\n <span class=\"check-icon\"><%= checkIcon %></span>\n <%= i18n.t('auto') %>\n </a>\n </li>\n <% } %>\n <% for (const item of levels.slice().reverse()) {\n var disabled = maxLevel >= 0 && item.level > maxLevel\n var checked = item.level === current\n %>\n <li class=\"<%= disabled ? ' disabled' : ''%><%=checked ? ' current' : ''%>\">\n <a href=\"#\"\n class=\"gear-sub-menu_btn gcore-skin-text-color<%= checked ? ' gcore-skin-active' : '' %>\"\n data-id=\"<%= item.level %>\"\n aria-disabled=\"<%= disabled %>\"\n aria-checked=\"<%= checked %>\"\n role=\"menuitemradio\"\n id=\"level_selector_<%= item.width > item.height ? item.height : item.width %>\"\n >\n <span class=\"check-icon\"><%= checkIcon %></span>\n <%= labels[item.level] %>\n </a>\n </li>\n <% } %>\n</ul>\n";
|
|
58653
58655
|
|
|
58654
|
-
const hdIcon = "<svg width=\"
|
|
58656
|
+
const hdIcon = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 24 24\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n <path\n d=\"M14.9562 8.22232H13.9961V15.1873H14.9562C15.8914 15.1873 16.766 14.8253 17.4195 14.1676C18.0786 13.5037 18.4415 12.6281 18.4415 11.7026C18.4415 9.7837 16.8781 8.22253 14.9561 8.22253L14.9562 8.22232Z\"\n fill=\"#C9C9C9\"/>\n <path\n d=\"M22.0801 4H1.91994C0.859222 4 0 4.86406 0 5.91994V17.4878C0 18.5437 0.859222 19.4078 1.91994 19.4078H22.0801C23.1408 19.4078 24 18.5437 24 17.4878V5.91994C24 4.86406 23.1408 4 22.0801 4ZM10.3975 15.3473C10.3975 15.6124 10.1827 15.8272 9.91754 15.8272C9.65216 15.8272 9.43761 15.6122 9.43761 15.3473V12.0239H5.55956V15.3473C5.55956 15.6124 5.34481 15.8272 5.07963 15.8272C4.81425 15.8272 4.5997 15.6122 4.5997 15.3473L4.59949 7.74042C4.59949 7.47524 4.81425 7.26049 5.07943 7.26049C5.34481 7.26049 5.55936 7.47544 5.55936 7.74042V11.0636H9.43741V7.74042C9.43741 7.47524 9.65216 7.26049 9.91734 7.26049C10.1827 7.26049 10.3973 7.47544 10.3973 7.74042L10.3975 15.3473ZM18.1005 14.8438C17.2652 15.6844 16.1486 16.1472 14.9561 16.1472H13.5161C13.2507 16.1472 13.0361 15.9323 13.0361 15.6673V7.74263C13.0361 7.47745 13.2509 7.26269 13.5161 7.26269H14.9561C17.4072 7.26269 19.4013 9.25438 19.4013 11.7027C19.4013 12.8835 18.9392 13.9991 18.1005 14.844V14.8438Z\"\n fill=\"#C9C9C9\"/>\n</svg>\n";
|
|
58655
58657
|
|
|
58656
58658
|
// const T = 'plugins.quality_levels'
|
|
58657
58659
|
const VERSION$2 = 'v2.22.5';
|
|
@@ -58789,6 +58791,7 @@ class QualityLevels extends UICorePlugin {
|
|
|
58789
58791
|
*/
|
|
58790
58792
|
render() {
|
|
58791
58793
|
if (!this.shouldRender()) {
|
|
58794
|
+
this.$el.hide();
|
|
58792
58795
|
return this;
|
|
58793
58796
|
}
|
|
58794
58797
|
this.renderDropdown();
|
|
@@ -58808,6 +58811,9 @@ class QualityLevels extends UICorePlugin {
|
|
|
58808
58811
|
}));
|
|
58809
58812
|
}
|
|
58810
58813
|
updateButton() {
|
|
58814
|
+
if (!this.shouldRender()) {
|
|
58815
|
+
return;
|
|
58816
|
+
}
|
|
58811
58817
|
this.core.getPlugin('bottom_gear')
|
|
58812
58818
|
?.addItem('quality', this.$el)
|
|
58813
58819
|
.html(QualityLevels.buttonTemplate({
|
|
@@ -59786,8 +59792,7 @@ class ClosedCaptions extends UICorePlugin {
|
|
|
59786
59792
|
}
|
|
59787
59793
|
get preselectedLanguage() {
|
|
59788
59794
|
return (this.core.options.cc?.language ??
|
|
59789
|
-
this.core.options.subtitles?.language
|
|
59790
|
-
'');
|
|
59795
|
+
this.core.options.subtitles?.language);
|
|
59791
59796
|
}
|
|
59792
59797
|
/**
|
|
59793
59798
|
* @internal
|
|
@@ -59840,14 +59845,17 @@ class ClosedCaptions extends UICorePlugin {
|
|
|
59840
59845
|
this.applyTracks();
|
|
59841
59846
|
this.mount();
|
|
59842
59847
|
}
|
|
59843
|
-
onSubtitleChanged({ id }) {
|
|
59844
|
-
|
|
59848
|
+
onSubtitleChanged({ id: _ }) {
|
|
59849
|
+
// ignoring the subtitle selected by the playback engine or user agent
|
|
59850
|
+
const id = this.track?.id ?? -1;
|
|
59845
59851
|
if (id === -1) {
|
|
59846
59852
|
this.clearSubtitleText();
|
|
59847
59853
|
}
|
|
59848
59854
|
for (const track of this.tracks) {
|
|
59855
|
+
// Native subtitles are always hidden
|
|
59856
|
+
track.track.mode = 'hidden';
|
|
59849
59857
|
if (track.id === id) {
|
|
59850
|
-
track.track.mode = 'showing'
|
|
59858
|
+
// track.track.mode = 'showing'
|
|
59851
59859
|
this.setSubtitleText(this.getSubtitleText(track.track));
|
|
59852
59860
|
track.track.oncuechange = (e) => {
|
|
59853
59861
|
try {
|
|
@@ -59866,7 +59874,7 @@ class ClosedCaptions extends UICorePlugin {
|
|
|
59866
59874
|
}
|
|
59867
59875
|
else {
|
|
59868
59876
|
track.track.oncuechange = null;
|
|
59869
|
-
track.track.mode = 'hidden'
|
|
59877
|
+
// track.track.mode = 'hidden'
|
|
59870
59878
|
}
|
|
59871
59879
|
}
|
|
59872
59880
|
}
|
|
@@ -59995,12 +60003,11 @@ class ClosedCaptions extends UICorePlugin {
|
|
|
59995
60003
|
applyPreselectedSubtitles() {
|
|
59996
60004
|
if (!this.isPreselectedApplied) {
|
|
59997
60005
|
this.isPreselectedApplied = true;
|
|
59998
|
-
if
|
|
59999
|
-
|
|
60000
|
-
}
|
|
60006
|
+
// if the language is undefined, then let the engine decide
|
|
60007
|
+
// to hide the subtitles forcefully, set the language to 'none'
|
|
60001
60008
|
setTimeout(() => {
|
|
60002
60009
|
this.selectItem(this.tracks.find((t) => t.track.language === this.preselectedLanguage) ?? null);
|
|
60003
|
-
},
|
|
60010
|
+
}, 0);
|
|
60004
60011
|
}
|
|
60005
60012
|
}
|
|
60006
60013
|
hideMenu() {
|
|
@@ -60029,8 +60036,10 @@ class ClosedCaptions extends UICorePlugin {
|
|
|
60029
60036
|
return this.$el.find('#gplayer-cc-menu li'); // TODO fix semantically
|
|
60030
60037
|
}
|
|
60031
60038
|
selectSubtitles() {
|
|
60032
|
-
|
|
60033
|
-
|
|
60039
|
+
this.track ? this.track.id : -1;
|
|
60040
|
+
// TODO find out if this is needed
|
|
60041
|
+
// this.core.activePlayback.closedCaptionsTrackId = trackId
|
|
60042
|
+
this.core.activePlayback.closedCaptionsTrackId = -1;
|
|
60034
60043
|
}
|
|
60035
60044
|
getSubtitleText(track) {
|
|
60036
60045
|
const currentTime = this.core.activePlayback?.getCurrentTime() ?? 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QualityLevels.d.ts","sourceRoot":"","sources":["../../../src/plugins/level-selector/QualityLevels.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,YAAY,EAAE,MAAM,cAAc,CAAA;AAgB7D,OAAO,2CAA2C,CAAA;AAMlD;;;GAGG;AACH,MAAM,WAAW,2BAA2B;IAC1C;;OAEG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAChC;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,qBAAa,aAAc,SAAQ,YAAY;IAC7C,OAAO,CAAC,MAAM,CAAqB;IAEnC,OAAO,CAAC,WAAW,CAAe;IAElC,OAAO,CAAC,UAAU,CAAQ;IAE1B,OAAO,CAAC,IAAI,CAAQ;IAEpB,OAAO,CAAC,WAAW,CAAK;IAExB,OAAO,CAAC,eAAe,CAAK;IAE5B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAChB;IAEtB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAuC;IAE3E;;OAEG;IACH,IAAI,IAAI,WAEP;IAED;;OAEG;IACH,IAAI,gBAAgB;;MAEnB;IAED;;OAEG;IACH,MAAM,KAAK,OAAO,WAEjB;IAED;;OAEG;IACH,IAAa,UAAU;;;MAKtB;IAED,IAAa,MAAM;;;MAKlB;IAED;;OAEG;IACM,UAAU;IASnB,OAAO,CAAC,WAAW;IAQnB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,uBAAuB;IAoC/B,OAAO,CAAC,QAAQ;IAQhB,OAAO,CAAC,MAAM;IAUd,OAAO,CAAC,YAAY;IAcpB;;OAEG;IACM,MAAM;
|
|
1
|
+
{"version":3,"file":"QualityLevels.d.ts","sourceRoot":"","sources":["../../../src/plugins/level-selector/QualityLevels.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,YAAY,EAAE,MAAM,cAAc,CAAA;AAgB7D,OAAO,2CAA2C,CAAA;AAMlD;;;GAGG;AACH,MAAM,WAAW,2BAA2B;IAC1C;;OAEG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAChC;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,qBAAa,aAAc,SAAQ,YAAY;IAC7C,OAAO,CAAC,MAAM,CAAqB;IAEnC,OAAO,CAAC,WAAW,CAAe;IAElC,OAAO,CAAC,UAAU,CAAQ;IAE1B,OAAO,CAAC,IAAI,CAAQ;IAEpB,OAAO,CAAC,WAAW,CAAK;IAExB,OAAO,CAAC,eAAe,CAAK;IAE5B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAChB;IAEtB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAuC;IAE3E;;OAEG;IACH,IAAI,IAAI,WAEP;IAED;;OAEG;IACH,IAAI,gBAAgB;;MAEnB;IAED;;OAEG;IACH,MAAM,KAAK,OAAO,WAEjB;IAED;;OAEG;IACH,IAAa,UAAU;;;MAKtB;IAED,IAAa,MAAM;;;MAKlB;IAED;;OAEG;IACM,UAAU;IASnB,OAAO,CAAC,WAAW;IAQnB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,uBAAuB;IAoC/B,OAAO,CAAC,QAAQ;IAQhB,OAAO,CAAC,MAAM;IAUd,OAAO,CAAC,YAAY;IAcpB;;OAEG;IACM,MAAM;IAWf,OAAO,CAAC,cAAc;IAetB,OAAO,CAAC,YAAY;IAiBpB,OAAO,KAAK,aAAa,GAIxB;IAED,OAAO,KAAK,QAAQ,GASnB;IAED,OAAO,CAAC,iBAAiB;IAkBzB,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,QAAQ;IAYhB,OAAO,CAAC,MAAM;IAId,OAAO,CAAC,QAAQ;IAMhB,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,UAAU;IAKlB,OAAO,CAAC,aAAa;IAWrB,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,qBAAqB;CAe9B"}
|
|
@@ -146,6 +146,7 @@ export class QualityLevels extends UICorePlugin {
|
|
|
146
146
|
*/
|
|
147
147
|
render() {
|
|
148
148
|
if (!this.shouldRender()) {
|
|
149
|
+
this.$el.hide();
|
|
149
150
|
return this;
|
|
150
151
|
}
|
|
151
152
|
this.renderDropdown();
|
|
@@ -165,6 +166,9 @@ export class QualityLevels extends UICorePlugin {
|
|
|
165
166
|
}));
|
|
166
167
|
}
|
|
167
168
|
updateButton() {
|
|
169
|
+
if (!this.shouldRender()) {
|
|
170
|
+
return;
|
|
171
|
+
}
|
|
168
172
|
;
|
|
169
173
|
this.core.getPlugin('bottom_gear')
|
|
170
174
|
?.addItem('quality', this.$el)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MediaControl.d.ts","sourceRoot":"","sources":["../../../src/plugins/media-control/MediaControl.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"MediaControl.d.ts","sourceRoot":"","sources":["../../../src/plugins/media-control/MediaControl.ts"],"names":[],"mappings":"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"}
|
|
@@ -312,9 +312,7 @@ export class MediaControl extends UICorePlugin {
|
|
|
312
312
|
this.listenTo(this.core.activeContainer, Events.CONTAINER_PAUSE, this.changeTogglePlay);
|
|
313
313
|
this.listenTo(this.core.activeContainer, Events.CONTAINER_STOP, this.changeTogglePlay);
|
|
314
314
|
this.listenTo(this.core.activeContainer, Events.CONTAINER_DBLCLICK, this.toggleFullscreen);
|
|
315
|
-
this.listenTo(this.core.activeContainer, Events.CONTAINER_CLICK, () =>
|
|
316
|
-
this.clickaway(this.core.activeContainer.$el[0]);
|
|
317
|
-
});
|
|
315
|
+
this.listenTo(this.core.activeContainer, Events.CONTAINER_CLICK, () => this.clickaway(this.core.activeContainer.$el[0]));
|
|
318
316
|
this.listenTo(this.core.activeContainer, Events.CONTAINER_TIMEUPDATE, this.onTimeUpdate);
|
|
319
317
|
this.listenTo(this.core.activeContainer, Events.CONTAINER_PROGRESS, this.updateProgressBar);
|
|
320
318
|
this.listenTo(this.core.activeContainer, Events.CONTAINER_SETTINGSUPDATE, this.updateSettings);
|
|
@@ -1239,7 +1237,11 @@ export class MediaControl extends UICorePlugin {
|
|
|
1239
1237
|
}
|
|
1240
1238
|
// 2 seconds delay is needed since on mobile devices mouse(touch)move events are not dispatched immediately
|
|
1241
1239
|
// as opposed to the click event
|
|
1242
|
-
clickaway = clickaway(() =>
|
|
1240
|
+
clickaway = clickaway(() => {
|
|
1241
|
+
if (Browser.isMobile) {
|
|
1242
|
+
setTimeout(this.resetUserKeepVisible, 0);
|
|
1243
|
+
}
|
|
1244
|
+
});
|
|
1243
1245
|
}
|
|
1244
1246
|
MediaControl.extend = function (properties) {
|
|
1245
1247
|
return extend(MediaControl, properties);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClosedCaptions.d.ts","sourceRoot":"","sources":["../../../src/plugins/subtitles/ClosedCaptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,YAAY,EAAwB,MAAM,cAAc,CAAA;AAOzE,OAAO,sCAAsC,CAAA;AAgB7C;;;GAGG;AACH,MAAM,MAAM,4BAA4B,GAAG;IACzC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,qBAAa,cAAe,SAAQ,YAAY;IAC9C,OAAO,CAAC,oBAAoB,CAAQ;IAEpC,OAAO,CAAC,MAAM,CAAQ;IAEtB,OAAO,CAAC,IAAI,CAAQ;IAEpB,OAAO,CAAC,KAAK,CAA6B;IAE1C,OAAO,CAAC,MAAM,CAAsB;IAEpC,OAAO,CAAC,KAAK,CAA2B;IAExC;;OAEG;IACH,IAAI,IAAI,WAEP;IAED;;OAEG;IACH,IAAI,gBAAgB;;MAEnB;IAED;;OAEG;IACH,MAAM,KAAK,OAAO,WAEjB;IAED,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAyB;IAEhE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAuB;IAE3D;;OAEG;IACH,IAAa,UAAU;;MAItB;IAED;;OAEG;IACH,IAAa,MAAM;;;MAKlB;IAED,OAAO,KAAK,mBAAmB,
|
|
1
|
+
{"version":3,"file":"ClosedCaptions.d.ts","sourceRoot":"","sources":["../../../src/plugins/subtitles/ClosedCaptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,YAAY,EAAwB,MAAM,cAAc,CAAA;AAOzE,OAAO,sCAAsC,CAAA;AAgB7C;;;GAGG;AACH,MAAM,MAAM,4BAA4B,GAAG;IACzC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,qBAAa,cAAe,SAAQ,YAAY;IAC9C,OAAO,CAAC,oBAAoB,CAAQ;IAEpC,OAAO,CAAC,MAAM,CAAQ;IAEtB,OAAO,CAAC,IAAI,CAAQ;IAEpB,OAAO,CAAC,KAAK,CAA6B;IAE1C,OAAO,CAAC,MAAM,CAAsB;IAEpC,OAAO,CAAC,KAAK,CAA2B;IAExC;;OAEG;IACH,IAAI,IAAI,WAEP;IAED;;OAEG;IACH,IAAI,gBAAgB;;MAEnB;IAED;;OAEG;IACH,MAAM,KAAK,OAAO,WAEjB;IAED,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAyB;IAEhE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAuB;IAE3D;;OAEG;IACH,IAAa,UAAU;;MAItB;IAED;;OAEG;IACH,IAAa,MAAM;;;MAKlB;IAED,OAAO,KAAK,mBAAmB,GAK9B;IAED;;OAEG;IACM,UAAU;IASnB,OAAO,CAAC,WAAW;IAkBnB,OAAO,CAAC,kBAAkB;IAgD1B,OAAO,CAAC,mBAAmB;IAQ3B,OAAO,CAAC,iBAAiB;IAkCzB,OAAO,CAAC,WAAW;IAUnB,OAAO,CAAC,SAAS;IAWjB,OAAO,CAAC,UAAU;IASlB,OAAO,CAAC,iBAAiB;IAqBzB;;OAEG;IACH,IAAI;IAcJ;;OAEG;IACH,IAAI;IAiBJ,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,UAAU;IAUlB;;OAEG;IACM,MAAM;IA4Bf,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,UAAU;IAOlB,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,yBAAyB;IAejC,OAAO,CAAC,QAAQ;IAMhB,OAAO,CAAC,UAAU;IAalB,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,eAAe;IAQvB,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,yBAAyB;IAiBjC,OAAO,CAAC,UAAU;IAMlB,OAAO,CAAC,UAAU;IAOlB,OAAO,CAAC,KAAK;CAMd"}
|
|
@@ -93,8 +93,7 @@ export class ClosedCaptions extends UICorePlugin {
|
|
|
93
93
|
}
|
|
94
94
|
get preselectedLanguage() {
|
|
95
95
|
return (this.core.options.cc?.language ??
|
|
96
|
-
this.core.options.subtitles?.language
|
|
97
|
-
'');
|
|
96
|
+
this.core.options.subtitles?.language);
|
|
98
97
|
}
|
|
99
98
|
/**
|
|
100
99
|
* @internal
|
|
@@ -147,14 +146,17 @@ export class ClosedCaptions extends UICorePlugin {
|
|
|
147
146
|
this.applyTracks();
|
|
148
147
|
this.mount();
|
|
149
148
|
}
|
|
150
|
-
onSubtitleChanged({ id }) {
|
|
151
|
-
|
|
149
|
+
onSubtitleChanged({ id: _ }) {
|
|
150
|
+
// ignoring the subtitle selected by the playback engine or user agent
|
|
151
|
+
const id = this.track?.id ?? -1;
|
|
152
152
|
if (id === -1) {
|
|
153
153
|
this.clearSubtitleText();
|
|
154
154
|
}
|
|
155
155
|
for (const track of this.tracks) {
|
|
156
|
+
// Native subtitles are always hidden
|
|
157
|
+
track.track.mode = 'hidden';
|
|
156
158
|
if (track.id === id) {
|
|
157
|
-
track.track.mode = 'showing'
|
|
159
|
+
// track.track.mode = 'showing'
|
|
158
160
|
this.setSubtitleText(this.getSubtitleText(track.track));
|
|
159
161
|
track.track.oncuechange = (e) => {
|
|
160
162
|
try {
|
|
@@ -173,7 +175,7 @@ export class ClosedCaptions extends UICorePlugin {
|
|
|
173
175
|
}
|
|
174
176
|
else {
|
|
175
177
|
track.track.oncuechange = null;
|
|
176
|
-
track.track.mode = 'hidden'
|
|
178
|
+
// track.track.mode = 'hidden'
|
|
177
179
|
}
|
|
178
180
|
}
|
|
179
181
|
}
|
|
@@ -302,12 +304,11 @@ export class ClosedCaptions extends UICorePlugin {
|
|
|
302
304
|
applyPreselectedSubtitles() {
|
|
303
305
|
if (!this.isPreselectedApplied) {
|
|
304
306
|
this.isPreselectedApplied = true;
|
|
305
|
-
if
|
|
306
|
-
|
|
307
|
-
}
|
|
307
|
+
// if the language is undefined, then let the engine decide
|
|
308
|
+
// to hide the subtitles forcefully, set the language to 'none'
|
|
308
309
|
setTimeout(() => {
|
|
309
310
|
this.selectItem(this.tracks.find((t) => t.track.language === this.preselectedLanguage) ?? null);
|
|
310
|
-
},
|
|
311
|
+
}, 0);
|
|
311
312
|
}
|
|
312
313
|
}
|
|
313
314
|
hideMenu() {
|
|
@@ -337,7 +338,9 @@ export class ClosedCaptions extends UICorePlugin {
|
|
|
337
338
|
}
|
|
338
339
|
selectSubtitles() {
|
|
339
340
|
const trackId = this.track ? this.track.id : -1;
|
|
340
|
-
|
|
341
|
+
// TODO find out if this is needed
|
|
342
|
+
// this.core.activePlayback.closedCaptionsTrackId = trackId
|
|
343
|
+
this.core.activePlayback.closedCaptionsTrackId = -1;
|
|
341
344
|
}
|
|
342
345
|
getSubtitleText(track) {
|
|
343
346
|
const currentTime = this.core.activePlayback?.getCurrentTime() ?? 0;
|
package/package.json
CHANGED
|
@@ -217,6 +217,7 @@ export class QualityLevels extends UICorePlugin {
|
|
|
217
217
|
*/
|
|
218
218
|
override render() {
|
|
219
219
|
if (!this.shouldRender()) {
|
|
220
|
+
this.$el.hide()
|
|
220
221
|
return this
|
|
221
222
|
}
|
|
222
223
|
this.renderDropdown()
|
|
@@ -241,6 +242,9 @@ export class QualityLevels extends UICorePlugin {
|
|
|
241
242
|
}
|
|
242
243
|
|
|
243
244
|
private updateButton() {
|
|
245
|
+
if (!this.shouldRender()) {
|
|
246
|
+
return
|
|
247
|
+
}
|
|
244
248
|
;(this.core.getPlugin('bottom_gear') as BottomGear)
|
|
245
249
|
?.addItem('quality', this.$el)
|
|
246
250
|
.html(
|
|
@@ -471,9 +471,7 @@ export class MediaControl extends UICorePlugin {
|
|
|
471
471
|
this.listenTo(
|
|
472
472
|
this.core.activeContainer,
|
|
473
473
|
Events.CONTAINER_CLICK,
|
|
474
|
-
() =>
|
|
475
|
-
this.clickaway(this.core.activeContainer.$el[0])
|
|
476
|
-
},
|
|
474
|
+
() => this.clickaway(this.core.activeContainer.$el[0]),
|
|
477
475
|
)
|
|
478
476
|
this.listenTo(
|
|
479
477
|
this.core.activeContainer,
|
|
@@ -1632,7 +1630,11 @@ export class MediaControl extends UICorePlugin {
|
|
|
1632
1630
|
|
|
1633
1631
|
// 2 seconds delay is needed since on mobile devices mouse(touch)move events are not dispatched immediately
|
|
1634
1632
|
// as opposed to the click event
|
|
1635
|
-
private clickaway = clickaway(() =>
|
|
1633
|
+
private clickaway = clickaway(() => {
|
|
1634
|
+
if (Browser.isMobile) {
|
|
1635
|
+
setTimeout(this.resetUserKeepVisible, 0)
|
|
1636
|
+
}
|
|
1637
|
+
})
|
|
1636
1638
|
}
|
|
1637
1639
|
|
|
1638
1640
|
MediaControl.extend = function (properties) {
|
|
@@ -124,11 +124,10 @@ export class ClosedCaptions extends UICorePlugin {
|
|
|
124
124
|
}
|
|
125
125
|
}
|
|
126
126
|
|
|
127
|
-
private get preselectedLanguage(): string {
|
|
127
|
+
private get preselectedLanguage(): string | undefined {
|
|
128
128
|
return (
|
|
129
129
|
this.core.options.cc?.language ??
|
|
130
|
-
this.core.options.subtitles?.language
|
|
131
|
-
''
|
|
130
|
+
this.core.options.subtitles?.language
|
|
132
131
|
)
|
|
133
132
|
}
|
|
134
133
|
|
|
@@ -218,14 +217,17 @@ export class ClosedCaptions extends UICorePlugin {
|
|
|
218
217
|
this.mount()
|
|
219
218
|
}
|
|
220
219
|
|
|
221
|
-
private onSubtitleChanged({ id }: { id: number }) {
|
|
222
|
-
|
|
220
|
+
private onSubtitleChanged({ id: _ }: { id: number }) {
|
|
221
|
+
// ignoring the subtitle selected by the playback engine or user agent
|
|
222
|
+
const id = this.track?.id ?? -1
|
|
223
223
|
if (id === -1) {
|
|
224
224
|
this.clearSubtitleText()
|
|
225
225
|
}
|
|
226
226
|
for (const track of this.tracks) {
|
|
227
|
+
// Native subtitles are always hidden
|
|
228
|
+
track.track.mode = 'hidden'
|
|
227
229
|
if (track.id === id) {
|
|
228
|
-
track.track.mode = 'showing'
|
|
230
|
+
// track.track.mode = 'showing'
|
|
229
231
|
|
|
230
232
|
this.setSubtitleText(this.getSubtitleText(track.track))
|
|
231
233
|
|
|
@@ -244,7 +246,7 @@ export class ClosedCaptions extends UICorePlugin {
|
|
|
244
246
|
}
|
|
245
247
|
} else {
|
|
246
248
|
track.track.oncuechange = null
|
|
247
|
-
track.track.mode = 'hidden'
|
|
249
|
+
// track.track.mode = 'hidden'
|
|
248
250
|
}
|
|
249
251
|
}
|
|
250
252
|
}
|
|
@@ -408,16 +410,15 @@ export class ClosedCaptions extends UICorePlugin {
|
|
|
408
410
|
private applyPreselectedSubtitles() {
|
|
409
411
|
if (!this.isPreselectedApplied) {
|
|
410
412
|
this.isPreselectedApplied = true
|
|
411
|
-
if
|
|
412
|
-
|
|
413
|
-
}
|
|
413
|
+
// if the language is undefined, then let the engine decide
|
|
414
|
+
// to hide the subtitles forcefully, set the language to 'none'
|
|
414
415
|
setTimeout(() => {
|
|
415
416
|
this.selectItem(
|
|
416
417
|
this.tracks.find(
|
|
417
418
|
(t) => t.track.language === this.preselectedLanguage,
|
|
418
419
|
) ?? null,
|
|
419
420
|
)
|
|
420
|
-
},
|
|
421
|
+
}, 0)
|
|
421
422
|
}
|
|
422
423
|
}
|
|
423
424
|
|
|
@@ -452,7 +453,9 @@ export class ClosedCaptions extends UICorePlugin {
|
|
|
452
453
|
private selectSubtitles() {
|
|
453
454
|
const trackId = this.track ? this.track.id : -1
|
|
454
455
|
|
|
455
|
-
|
|
456
|
+
// TODO find out if this is needed
|
|
457
|
+
// this.core.activePlayback.closedCaptionsTrackId = trackId
|
|
458
|
+
this.core.activePlayback.closedCaptionsTrackId = -1
|
|
456
459
|
}
|
|
457
460
|
|
|
458
461
|
private getSubtitleText(track: TextTrack) {
|