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 polymer

Browse source
This commit is contained in:
Luke Pulverenti 2015-10-05 22:50:20 -04:00
parent d2bb0d6805
commit d96a2b7946
28 changed files with 109 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -364,7 +364,7 @@
html += '<div class="sidebarDivider"></div>';
if (user.localUser && showUserAtTop()) {
html += '<a class="sidebarLink lnkMediaFolder lnkMySettings" onclick="return LibraryMenu.onLinkClicked(event, this);" data-itemid="mysync" href="mypreferencesmenu.html?userId=' + user.localUser.Id + '"><iron-icon icon="settings" class="sidebarLinkIcon"></iron-icon><span class="sidebarLinkText">' + Globalize.translate('ButtonSettings') + '</span></a>';
html += '<a class="sidebarLink lnkMediaFolder lnkMySettings" onclick="return LibraryMenu.onLinkClicked(event, this);" href="mypreferencesmenu.html?userId=' + user.localUser.Id + '"><iron-icon icon="settings" class="sidebarLinkIcon"></iron-icon><span class="sidebarLinkText">' + Globalize.translate('ButtonSettings') + '</span></a>';
}
html += '<a class="sidebarLink lnkMediaFolder lnkMySync" data-itemid="mysync" onclick="return LibraryMenu.onLinkClicked(event, this);" href="mysync.html"><iron-icon icon="sync" class="sidebarLinkIcon"></iron-icon><span class="sidebarLinkText">' + Globalize.translate('ButtonSync') + '</span></a>';

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

@ -5,7 +5,7 @@
window.LocalSync = {
isSupported: function () {
return AppInfo.isNativeApp;
return AppInfo.isNativeApp && Dashboard.capabilities().SupportsSync;
},
sync: function (options) {

5
dashboard-ui/scripts/mediaplayer-video.js
View file

@ -926,11 +926,6 @@
return s.Type == 'Subtitle';
});
// Reports of stuttering with h264 stream copy in IE
if (streamInfo.playMethod == 'Transcode' && streamInfo.url.indexOf('.m3u8') == -1) {
streamInfo.url += '&EnableAutoStreamCopy=false';
}
// Create video player
var mediaPlayerContainer = $("#mediaPlayer").show();
var videoControls = $('.videoControls', mediaPlayerContainer);

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

@ -950,10 +950,16 @@
if (mediaSource.TranscodingSubProtocol == 'hls') {
// Reports of stuttering with h264 stream copy in IE
mediaUrl += '&EnableAutoStreamCopy=false';
mediaUrl += seekParam;
contentType = 'application/x-mpegURL';
} else {
// Reports of stuttering with h264 stream copy in IE
mediaUrl += '&EnableAutoStreamCopy=false';
startTimeTicksOffset = startPosition || 0;
contentType = 'video/' + mediaSource.TranscodingContainer;
}
@ -1893,7 +1899,6 @@
self.createStreamInfo('Audio', item, mediaSource, startPositionTicks).done(function (streamInfo) {
var audioUrl = streamInfo.url;
self.startTimeTicksOffset = streamInfo.startTimeTicksOffset;
var initialVolume = self.getSavedVolume();

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

@ -1549,7 +1549,7 @@ var Dashboard = {
SupportedLiveMediaTypes: ['Audio', 'Video']
};
if (Dashboard.isRunningInCordova()) {
if (Dashboard.isRunningInCordova() && !$.browser.safari) {
caps.SupportsOfflineAccess = true;
caps.SupportsSync = true;
caps.SupportsContentUploading = true;
@ -2317,7 +2317,11 @@ var AppInfo = {};
var deps = [];
if (AppInfo.isNativeApp && $.browser.safari) {
deps.push('cordova/ios/backgroundfetch');
if (Dashboard.capabilities().SupportsSync) {
deps.push('cordova/ios/backgroundfetch');
}
deps.push('cordova/ios/tabbar');
}
if (AppInfo.isNativeApp && $.browser.android) {

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

@ -362,6 +362,10 @@
function isAvailable(item, user) {
if (AppInfo.isNativeApp && !Dashboard.capabilities().SupportsSync) {
return false;
}
return item.SupportsSync;
}