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 xml parsing

Browse source
This commit is contained in:
Luke Pulverenti 2016-11-02 13:08:20 -04:00
parent 1137b4fd13
commit 1c0379bee1
7 changed files with 63 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -14,12 +14,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.4.327",
"_release": "1.4.327",
"version": "1.4.328",
"_release": "1.4.328",
"_resolution": {
"type": "version",
"tag": "1.4.327",
"commit": "93885cc5aa03632b087a477b0d01612d106ee36f"
"tag": "1.4.328",
"commit": "5e1e99f67a55c923bdff70554642c31c0c6dd1ee"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

12
dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js vendored
View file

@ -205,7 +205,7 @@ define(['browser'], function (browser) {
function getMaxBitrate() {
if (browser.edgeUwp) {
return 30000000;
return 32000000;
}
// 10mbps
@ -264,7 +264,6 @@ define(['browser'], function (browser) {
// Otherwise with HLS and mp3 audio we're seeing some browsers
// safari is lying
if ((videoTestElement.canPlayType('audio/mp4; codecs="ac-3"').replace(/no/, '') && !browser.safari) || browser.edgeUwp || browser.tizen) {
if ((options.disableVideoAudioCodecs || []).indexOf('ac3') === -1) {
videoAudioCodecs.push('ac3');
// This works in edge desktop, but not mobile
@ -273,7 +272,6 @@ define(['browser'], function (browser) {
hlsVideoAudioCodecs.push('ac3');
}
}
}
var mp3Added = false;
if (canPlayMkv) {
@ -302,6 +300,14 @@ define(['browser'], function (browser) {
//videoAudioCodecs.push('truehd');
}
videoAudioCodecs = videoAudioCodecs.filter(function(c) {
return (options.disableVideoAudioCodecs || []).indexOf(c) === -1;
});
hlsVideoAudioCodecs = hlsVideoAudioCodecs.filter(function (c) {
return (options.disableHlsVideoAudioCodecs || []).indexOf(c) === -1;
});
var mp4VideoCodecs = [];
if (canPlayH264()) {
mp4VideoCodecs.push('h264');

2
dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js vendored
View file

@ -1236,7 +1236,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
}
if (overlayPlayButton && !item.IsPlaceHolder && (item.LocationType !== 'Virtual' || !item.MediaType || item.Type === 'Program') && item.Type !== 'Person' && item.PlayAccess === 'Full') {
overlayButtons += '<button is="paper-icon-button-light" class="cardOverlayButton itemAction autoSize" data-action="playmenu" onclick="return false;"><i class="md-icon">play_arrow</i></button>';
overlayButtons += '<button is="paper-icon-button-light" class="cardOverlayButton itemAction autoSize" data-action="play" onclick="return false;"><i class="md-icon">play_arrow</i></button>';
}
if (options.overlayMoreButton) {

2
dashboard-ui/bower_components/emby-webcomponents/refreshdialog/refreshdialog.js vendored
View file

@ -42,7 +42,7 @@
html += '<br />';
html += '<div class="formDialogFooter">';
html += '<button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem button-submit">' + globalize.translate('sharedcomponents#ButtonOk') + '</button>';
html += '<button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem button-submit">' + globalize.translate('sharedcomponents#Refresh') + '</button>';
html += '</div>';
html += '</form>';

28
dashboard-ui/scripts/librarymenu.js
View file

@ -402,7 +402,33 @@
return apiClient.getUserViews({}, userId).then(function (result) {
return result.Items;
var items = result.Items;
var list = [];
for (var i = 0, length = items.length; i < length; i++) {
var view = items[i];
list.push(view);
if (view.CollectionType == 'livetv') {
view.ImageTags = {};
view.icon = 'live_tv';
view.onclick = "LibraryBrowser.showTab('livetv.html', 0);";
var guideView = Object.assign({}, view);
guideView.Name = Globalize.translate('ButtonGuide');
guideView.ImageTags = {};
guideView.icon = 'dvr';
guideView.url = 'livetv.html?tab=1';
guideView.onclick = "LibraryBrowser.showTab('livetv.html', 1);";
list.push(guideView);
}
}
return list;
});
}

24
dashboard-ui/scripts/mediaplayer.js
View file

@ -1,4 +1,4 @@
define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appSettings, userSettings, appStorage, datetime) {
define(['appSettings', 'userSettings', 'appStorage', 'datetime', 'browser'], function (appSettings, userSettings, appStorage, datetime, browser) {
'use strict';
function mediaPlayer() {
@ -97,7 +97,7 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
var intervalTime = ApiClient.isWebSocketOpen() ? 1200 : 5000;
// Ease up with safari because it doesn't perform as well
if (browserInfo.safari) {
if (browser.safari) {
intervalTime = Math.max(intervalTime, 5000);
}
self.lastProgressReport = 0;
@ -149,14 +149,20 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
function getProfileOptions(item) {
var disableVideoAudioCodecs = [];
if (!AppInfo.isNativeApp && !item.RunTimeTicks) {
disableVideoAudioCodecs.push('ac3');
}
var options = {};
if (!AppInfo.isNativeApp) {
var disableHlsVideoAudioCodecs = [];
if (!self.canPlayNativeHls()) {
// hls.js does not support this
disableHlsVideoAudioCodecs.push('mp3');
}
if (!item.RunTimeTicks) {
// hls.js does not support this
disableHlsVideoAudioCodecs.push('ac3');
}
options.enableMkvProgressive = item.RunTimeTicks != null;
if (item.RunTimeTicks == null) {
@ -164,7 +170,7 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
}
options.enableMkvProgressive = false;
options.disableVideoAudioCodecs = disableVideoAudioCodecs;
options.disableHlsVideoAudioCodecs = disableHlsVideoAudioCodecs;
}
return options;
@ -1493,7 +1499,7 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
return true;
}
if (browserInfo.mobile) {
if (browser.mobile) {
return false;
}

2
dashboard-ui/thirdparty/paper-button-style.css vendored
View file

@ -68,7 +68,7 @@ button.emby-button.raised.more {
}
button.emby-button.mini:not(.fab) {
padding: 0.4em 0.7em;
padding: 0.5em 0.7em;
}
.ui-body-b .paperListLabel, .ui-body-b .fieldDescription, .ui-body-b .selectLabelUnfocused, .ui-body-b .inputLabelUnfocused, .ui-body-b .textareaLabelUnfocused {