mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

update device discovery

Browse source
This commit is contained in:
Luke Pulverenti 2016-09-13 13:49:13 -04:00
parent 62265de2e5
commit fdc83ada98
21 changed files with 119 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

16
dashboard-ui/scripts/dashboardpage.js
View file

@ -168,20 +168,20 @@
itemHtml += '<i class="listItemIcon md-icon">dvr</i>';
itemHtml += '<div class="listItemBody three-line">';
itemHtml += '<div class="listItemBody two-line">';
itemHtml += '<h3 class="listItemBodyText">';
itemHtml += '<div class="listItemBodyText">';
itemHtml += item.Title;
itemHtml += '</h3>';
itemHtml += '</div>';
itemHtml += '<div class="listItemBodyText secondary">';
var date = datetime.parseISO8601Date(item.Date, true);
itemHtml += date.toLocaleDateString();
itemHtml += '</div>';
itemHtml += '<div class="listItemBodyText secondary listItemBodyText-nowrap">';
itemHtml += item.Description;
itemHtml += '</div>';
//itemHtml += '<div class="listItemBodyText secondary listItemBodyText-nowrap">';
//itemHtml += item.Description;
//itemHtml += '</div>';
itemHtml += '</div>';
@ -1067,9 +1067,9 @@
html += '<div class="listItemBody three-line">';
html += '<h3 class="listItemBodyText">';
html += '<div class="listItemBodyText">';
html += entry.Name;
html += '</h3>';
html += '</div>';
html += '<div class="listItemBodyText secondary">';
var date = datetime.parseISO8601Date(entry.Date, true);

4
dashboard-ui/scripts/site.js
View file

@ -1633,7 +1633,7 @@ var AppInfo = {};
define("imageFetcher", [embyWebComponentsBowerPath + "/images/basicimagefetcher"], returnFirstDependency);
}
var preferNativeAlerts = browser.mobile || browser.tv || browser.xboxOne;
var preferNativeAlerts = (browser.mobile && !browser.animate) || browser.tv || browser.xboxOne || browser.ps4;
// use native alerts if preferred and supported (not supported in opera tv)
if (preferNativeAlerts && window.alert) {
define("alert", [embyWebComponentsBowerPath + "/alert/nativealert"], returnFirstDependency);
@ -2182,7 +2182,7 @@ var AppInfo = {};
defineRoute({
path: '/livetvtunerprovider-satip.html',
dependencies: ['emby-input', 'paper-checkbox'],
dependencies: ['emby-input'],
autoFocus: false,
roles: 'admin',
controller: 'dashboard/livetvtunerprovider-satip'