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

Merge pull request #1452 from MediaBrowser/dev

Browse source 
Dev
This commit is contained in:
Luke 2016-02-14 01:02:43 -05:00
commit ab015330a9
6 changed files with 56 additions and 16 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

@ -15,12 +15,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.0.74",
"_release": "1.0.74",
"version": "1.0.76",
"_release": "1.0.76",
"_resolution": {
"type": "version",
"tag": "1.0.74",
"commit": "74afb337ff5f0ee41b75ba5ddb5dea5ec9c20a66"
"tag": "1.0.76",
"commit": "8b29590144a9a67065820c7c1a6a4f433f52d9bf"
},
"_source": "git://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "~1.0.0",

16
dashboard-ui/bower_components/emby-webcomponents/browser.js vendored
View file

@ -20,13 +20,17 @@
var browser = match[1] || "";
if (ua.indexOf("windows phone") != -1 || ua.indexOf("iemobile") != -1) {
if (browser == "edge") {
platform_match = [""];
} else {
if (ua.indexOf("windows phone") != -1 || ua.indexOf("iemobile") != -1) {
// http://www.neowin.net/news/ie11-fakes-user-agent-to-fool-gmail-in-windows-phone-81-gdr1-update
browser = "msie";
}
else if (ua.indexOf("like gecko") != -1 && ua.indexOf('webkit') == -1 && ua.indexOf('opera') == -1 && ua.indexOf('chrome') == -1 && ua.indexOf('safari') == -1) {
browser = "msie";
// http://www.neowin.net/news/ie11-fakes-user-agent-to-fool-gmail-in-windows-phone-81-gdr1-update
browser = "msie";
}
else if (ua.indexOf("like gecko") != -1 && ua.indexOf('webkit') == -1 && ua.indexOf('opera') == -1 && ua.indexOf('chrome') == -1 && ua.indexOf('safari') == -1) {
browser = "msie";
}
}
if (browser == 'opr') {

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

@ -103,6 +103,7 @@ define(['browser'], function (browser) {
profile.DirectPlayProfiles = [];
var videoAudioCodecs = [];
var hlsVideoAudioCodecs = [];
var supportsMp3VideoAudio = videoTestElement.canPlayType('video/mp4; codecs="avc1.640029, mp4a.69"').replace(/no/, '') ||
videoTestElement.canPlayType('video/mp4; codecs="avc1.640029, mp4a.6B"').replace(/no/, '');
@ -113,19 +114,27 @@ define(['browser'], function (browser) {
// safari is lying
if (!browser.safari) {
videoAudioCodecs.push('ac3');
// This works in edge desktop, but not mobile
if (!browser.edge || !browser.mobile) {
hlsVideoAudioCodecs.push('ac3');
}
}
}
if (canPlayMkv) {
if (supportsMp3VideoAudio) {
videoAudioCodecs.push('mp3');
hlsVideoAudioCodecs.push('mp3');
}
}
if (videoTestElement.canPlayType('video/mp4; codecs="avc1.640029, mp4a.40.2"').replace(/no/, '')) {
videoAudioCodecs.push('aac');
hlsVideoAudioCodecs.push('aac');
}
if (!canPlayMkv) {
if (supportsMp3VideoAudio) {
videoAudioCodecs.push('mp3');
hlsVideoAudioCodecs.push('mp3');
}
}
@ -197,7 +206,7 @@ define(['browser'], function (browser) {
profile.TranscodingProfiles.push({
Container: 'ts',
Type: 'Video',
AudioCodec: videoAudioCodecs.join(','),
AudioCodec: hlsVideoAudioCodecs.join(','),
VideoCodec: 'h264',
Context: 'Streaming',
Protocol: 'hls'

2
dashboard-ui/scripts/librarybrowser.js
View file

@ -2215,7 +2215,7 @@
// cardContent
html += '</a>';
if (options.overlayPlayButton && !item.IsPlaceHolder && (item.LocationType != 'Virtual' || !item.MediaType || item.Type == 'Program')) {
if (options.overlayPlayButton && !item.IsPlaceHolder && (item.LocationType != 'Virtual' || !item.MediaType || item.Type == 'Program') && item.Type != 'Person') {
html += '<div class="cardOverlayButtonContainer"><paper-icon-button icon="play-arrow" class="cardOverlayPlayButton" onclick="return false;"></paper-icon-button></div>';
}
if (options.overlayMoreButton) {

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

@ -469,7 +469,7 @@
return self.currentItem && self.currentItem.MediaType == mediaType;
};
function translateItemsForPlayback(items) {
function translateItemsForPlayback(items, smart) {
var firstItem = items[0];
var promise;
@ -511,6 +511,33 @@
MediaTypes: "Audio,Video"
});
}
else if (smart && firstItem.Type == "Episode" && items.length == 1) {
promise = ApiClient.getEpisodes(firstItem.SeriesId, {
IsVirtualUnaired: false,
IsMissing: false,
UserId: ApiClient.getCurrentUserId(),
Fields: getItemFields
}).then(function (episodesResult) {
var foundItem = false;
episodesResult.Items = episodesResult.Items.filter(function (e) {
if (foundItem) {
return true;
}
if (e.Id == firstItem.Id) {
foundItem = true;
return true;
}
return false;
});
episodesResult.TotalRecordCount = episodesResult.Items.length;
return episodesResult;
});
}
if (promise) {
return new Promise(function (resolve, reject) {
@ -537,7 +564,7 @@
if (options.items) {
translateItemsForPlayback(options.items).then(function (items) {
translateItemsForPlayback(options.items, true).then(function (items) {
self.playWithIntros(items, options, user);
});
@ -550,7 +577,7 @@
}).then(function (result) {
translateItemsForPlayback(result.Items).then(function (items) {
translateItemsForPlayback(result.Items, true).then(function (items) {
self.playWithIntros(items, options, user);
});

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

@ -1826,7 +1826,7 @@ var AppInfo = {};
// Put the version into the bower path since we can't easily put a query string param on html imports
// Emby server will handle this
if (!Dashboard.isRunningInCordova()) {
bowerPath += window.dashboardVersion;
//bowerPath += window.dashboardVersion;
}
return bowerPath;