mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
add m3u url to sat page
This commit is contained in:
parent
0bd0cc2719
commit
f9963247df
15 changed files with 70 additions and 47 deletions
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "material-design-lite",
|
"name": "material-design-lite",
|
||||||
"version": "1.1.2",
|
"version": "1.1.3",
|
||||||
"homepage": "https://github.com/google/material-design-lite",
|
"homepage": "https://github.com/google/material-design-lite",
|
||||||
"authors": [
|
"authors": [
|
||||||
"Material Design Lite team"
|
"Material Design Lite team"
|
||||||
|
@ -26,14 +26,13 @@
|
||||||
"test",
|
"test",
|
||||||
"tests"
|
"tests"
|
||||||
],
|
],
|
||||||
"_release": "1.1.2",
|
"_release": "1.1.3",
|
||||||
"_resolution": {
|
"_resolution": {
|
||||||
"type": "version",
|
"type": "version",
|
||||||
"tag": "v1.1.2",
|
"tag": "v1.1.3",
|
||||||
"commit": "38b5d9fbd7b86af5d8a5aaaadcc4bcfe71915195"
|
"commit": "95a2cd49c679d9825930d72de7e6fdd155e9150f"
|
||||||
},
|
},
|
||||||
"_source": "git://github.com/google/material-design-lite.git",
|
"_source": "git://github.com/google/material-design-lite.git",
|
||||||
"_target": "~1.1.2",
|
"_target": "~1.1.2",
|
||||||
"_originalSource": "material-design-lite",
|
"_originalSource": "material-design-lite"
|
||||||
"_direct": true
|
|
||||||
}
|
}
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "material-design-lite",
|
"name": "material-design-lite",
|
||||||
"version": "1.1.2",
|
"version": "1.1.3",
|
||||||
"homepage": "https://github.com/google/material-design-lite",
|
"homepage": "https://github.com/google/material-design-lite",
|
||||||
"authors": [
|
"authors": [
|
||||||
"Material Design Lite team"
|
"Material Design Lite team"
|
||||||
|
|
|
@ -230,8 +230,15 @@ componentHandler = (function() {
|
||||||
'Unable to find a registered component for the given class.');
|
'Unable to find a registered component for the given class.');
|
||||||
}
|
}
|
||||||
|
|
||||||
var ev = document.createEvent('Events');
|
var ev;
|
||||||
|
if ('CustomEvent' in window && typeof window.CustomEvent === 'function') {
|
||||||
|
ev = new Event('mdl-componentupgraded', {
|
||||||
|
'bubbles': true, 'cancelable': false
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
ev = document.createEvent('Events');
|
||||||
ev.initEvent('mdl-componentupgraded', true, true);
|
ev.initEvent('mdl-componentupgraded', true, true);
|
||||||
|
}
|
||||||
element.dispatchEvent(ev);
|
element.dispatchEvent(ev);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -354,9 +361,15 @@ componentHandler = (function() {
|
||||||
upgrades.splice(componentPlace, 1);
|
upgrades.splice(componentPlace, 1);
|
||||||
component.element_.setAttribute('data-upgraded', upgrades.join(','));
|
component.element_.setAttribute('data-upgraded', upgrades.join(','));
|
||||||
|
|
||||||
var ev = document.createEvent('Events');
|
var ev;
|
||||||
|
if ('CustomEvent' in window && typeof window.CustomEvent === 'function') {
|
||||||
|
ev = new Event('mdl-componentdowngraded', {
|
||||||
|
'bubbles': true, 'cancelable': false
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
ev = document.createEvent('Events');
|
||||||
ev.initEvent('mdl-componentdowngraded', true, true);
|
ev.initEvent('mdl-componentdowngraded', true, true);
|
||||||
component.element_.dispatchEvent(ev);
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3567,15 +3580,6 @@ function MaterialLayoutTab(tab, tabs, panels, layout) {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
tab.show = selectTab;
|
tab.show = selectTab;
|
||||||
tab.addEventListener('click', function (e) {
|
|
||||||
e.preventDefault();
|
|
||||||
var href = tab.href.split('#')[1];
|
|
||||||
var panel = layout.content_.querySelector('#' + href);
|
|
||||||
layout.resetTabState_(tabs);
|
|
||||||
layout.resetPanelState_(panels);
|
|
||||||
tab.classList.add(layout.CssClasses_.IS_ACTIVE);
|
|
||||||
panel.classList.add(layout.CssClasses_.IS_ACTIVE);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
window['MaterialLayoutTab'] = MaterialLayoutTab;
|
window['MaterialLayoutTab'] = MaterialLayoutTab;
|
||||||
// The component registers itself. It can assume componentHandler is available
|
// The component registers itself. It can assume componentHandler is available
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "material-design-lite",
|
"name": "material-design-lite",
|
||||||
"version": "1.1.2",
|
"version": "1.1.3",
|
||||||
"description": "Material Design Components in CSS, JS and HTML",
|
"description": "Material Design Components in CSS, JS and HTML",
|
||||||
"private": true,
|
"private": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
|
|
|
@ -558,15 +558,6 @@
|
||||||
|
|
||||||
tab.show = selectTab;
|
tab.show = selectTab;
|
||||||
|
|
||||||
tab.addEventListener('click', function(e) {
|
|
||||||
e.preventDefault();
|
|
||||||
var href = tab.href.split('#')[1];
|
|
||||||
var panel = layout.content_.querySelector('#' + href);
|
|
||||||
layout.resetTabState_(tabs);
|
|
||||||
layout.resetPanelState_(panels);
|
|
||||||
tab.classList.add(layout.CssClasses_.IS_ACTIVE);
|
|
||||||
panel.classList.add(layout.CssClasses_.IS_ACTIVE);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
window['MaterialLayoutTab'] = MaterialLayoutTab;
|
window['MaterialLayoutTab'] = MaterialLayoutTab;
|
||||||
|
|
||||||
|
|
|
@ -227,8 +227,15 @@ componentHandler = (function() {
|
||||||
'Unable to find a registered component for the given class.');
|
'Unable to find a registered component for the given class.');
|
||||||
}
|
}
|
||||||
|
|
||||||
var ev = document.createEvent('Events');
|
var ev;
|
||||||
|
if ('CustomEvent' in window && typeof window.CustomEvent === 'function') {
|
||||||
|
ev = new Event('mdl-componentupgraded', {
|
||||||
|
'bubbles': true, 'cancelable': false
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
ev = document.createEvent('Events');
|
||||||
ev.initEvent('mdl-componentupgraded', true, true);
|
ev.initEvent('mdl-componentupgraded', true, true);
|
||||||
|
}
|
||||||
element.dispatchEvent(ev);
|
element.dispatchEvent(ev);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -351,9 +358,15 @@ componentHandler = (function() {
|
||||||
upgrades.splice(componentPlace, 1);
|
upgrades.splice(componentPlace, 1);
|
||||||
component.element_.setAttribute('data-upgraded', upgrades.join(','));
|
component.element_.setAttribute('data-upgraded', upgrades.join(','));
|
||||||
|
|
||||||
var ev = document.createEvent('Events');
|
var ev;
|
||||||
|
if ('CustomEvent' in window && typeof window.CustomEvent === 'function') {
|
||||||
|
ev = new Event('mdl-componentdowngraded', {
|
||||||
|
'bubbles': true, 'cancelable': false
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
ev = document.createEvent('Events');
|
||||||
ev.initEvent('mdl-componentdowngraded', true, true);
|
ev.initEvent('mdl-componentdowngraded', true, true);
|
||||||
component.element_.dispatchEvent(ev);
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
font-family: $preferred_font;
|
font-family: $preferred_font;
|
||||||
will-change: transform;
|
will-change: transform;
|
||||||
transform: translate(-50%, 80px);
|
transform: translate(0, 80px);
|
||||||
transition: transform 0.25s $animation-curve-fast-out-linear-in;
|
transition: transform 0.25s $animation-curve-fast-out-linear-in;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
@media(max-width: $snackbar-tablet-breakpoint - 1) {
|
@media(max-width: $snackbar-tablet-breakpoint - 1) {
|
||||||
|
@ -42,11 +42,16 @@
|
||||||
min-width: 288px;
|
min-width: 288px;
|
||||||
max-width: 568px;
|
max-width: 568px;
|
||||||
border-radius: 2px;
|
border-radius: 2px;
|
||||||
|
transform: translate(-50%, 80px);
|
||||||
}
|
}
|
||||||
&--active {
|
&--active {
|
||||||
transform: translate(-50%, 0);
|
transform: translate(0, 0);
|
||||||
pointer-events: auto;
|
pointer-events: auto;
|
||||||
transition: transform 0.25s $animation-curve-linear-out-slow-in;
|
transition: transform 0.25s $animation-curve-linear-out-slow-in;
|
||||||
|
|
||||||
|
@media(min-width: $snackbar-tablet-breakpoint) {
|
||||||
|
transform: translate(-50%, 0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&__text {
|
&__text {
|
||||||
|
|
|
@ -18,6 +18,11 @@
|
||||||
<div>
|
<div>
|
||||||
<paper-input class="txtDevicePath" label="${LabelTunerIpAddress}" required="required"></paper-input>
|
<paper-input class="txtDevicePath" label="${LabelTunerIpAddress}" required="required"></paper-input>
|
||||||
</div>
|
</div>
|
||||||
|
<div>
|
||||||
|
<paper-input class="txtM3uUrl" label="${LabelOptionalM3uUrl}" required="required"></paper-input>
|
||||||
|
<div class="fieldDescription">${LabelOptionalM3uUrlHelp}</div>
|
||||||
|
</div>
|
||||||
|
<br />
|
||||||
<div>
|
<div>
|
||||||
<br />
|
<br />
|
||||||
<label class="selectLabel">Diseq C</label>
|
<label class="selectLabel">Diseq C</label>
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
})[0];
|
})[0];
|
||||||
|
|
||||||
page.querySelector('.txtDevicePath').value = info.Url || '';
|
page.querySelector('.txtDevicePath').value = info.Url || '';
|
||||||
|
page.querySelector('.txtM3uUrl').value = info.M3UUrl || '';
|
||||||
page.querySelector('.chkEnabled').checked = info.IsEnabled;
|
page.querySelector('.chkEnabled').checked = info.IsEnabled;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -47,6 +48,7 @@
|
||||||
|
|
||||||
function fillInfoFromPage(page, info) {
|
function fillInfoFromPage(page, info) {
|
||||||
info.Url = page.querySelector('.txtDevicePath').value;
|
info.Url = page.querySelector('.txtDevicePath').value;
|
||||||
|
info.M3UUrl = page.querySelector('.txtM3uUrl').value;
|
||||||
info.IsEnabled = page.querySelector('.chkEnabled').checked;
|
info.IsEnabled = page.querySelector('.chkEnabled').checked;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2430,5 +2430,7 @@
|
||||||
"OptionEnableAnonymousUsageReportingHelp": "Allow Emby to collect anonymous data such as installed plugins, the version numbers of your Emby apps, etc. This information is only used for the purpose of improving the software.",
|
"OptionEnableAnonymousUsageReportingHelp": "Allow Emby to collect anonymous data such as installed plugins, the version numbers of your Emby apps, etc. This information is only used for the purpose of improving the software.",
|
||||||
"LabelFileOrUrl": "File or url:",
|
"LabelFileOrUrl": "File or url:",
|
||||||
"OptionEnableForAllTuners": "Enable for all tuner devices",
|
"OptionEnableForAllTuners": "Enable for all tuner devices",
|
||||||
"HeaderSelectTuners": "SelectTuners"
|
"HeaderTuners": "Tuners",
|
||||||
|
"LabelOptionalM3uUrl": "M3U url (optional):",
|
||||||
|
"LabelOptionalM3uUrlHelp": "Some devices support an M3U channel listing."
|
||||||
}
|
}
|
||||||
|
|
|
@ -2430,5 +2430,7 @@
|
||||||
"OptionEnableAnonymousUsageReportingHelp": "Allow Emby to collect anonymous data such as installed plugins, the version numbers of your Emby apps, etc. This information is only used for the purpose of improving the software.",
|
"OptionEnableAnonymousUsageReportingHelp": "Allow Emby to collect anonymous data such as installed plugins, the version numbers of your Emby apps, etc. This information is only used for the purpose of improving the software.",
|
||||||
"LabelFileOrUrl": "File or url:",
|
"LabelFileOrUrl": "File or url:",
|
||||||
"OptionEnableForAllTuners": "Enable for all tuner devices",
|
"OptionEnableForAllTuners": "Enable for all tuner devices",
|
||||||
"HeaderTuners": "Tuners"
|
"HeaderTuners": "Tuners",
|
||||||
|
"LabelOptionalM3uUrl": "M3U url (optional):",
|
||||||
|
"LabelOptionalM3uUrlHelp": "Some devices support an M3U channel listing."
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue