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

normalize tv recording objects

Browse source
This commit is contained in:
Luke Pulverenti 2015-05-31 14:22:51 -04:00
parent 740e8a62a8
commit 82382681fc
9 changed files with 40 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -192,7 +192,7 @@
var html = '';
html += '<div class="sidebarHeader">';
html += Globalize.translate('HeaderLibrary');
html += Globalize.translate('HeaderMedia');
html += '</div>';
html += items.map(function (i) {

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

@ -725,8 +725,9 @@
contentType = 'video/' + mediaSource.Container;
if (mediaSource.enableDirectPlay) {
mediaUrl = mediaSource.Path;
mediaUrl = FileSystem.translateFilePath(mediaSource.Path);
playMethod = 'DirectPlay';
} else {
if (mediaSource.SupportsDirectStream) {
@ -761,9 +762,9 @@
if (mediaSource.enableDirectPlay) {
mediaUrl = mediaSource.Path;
mediaUrl = FileSystem.translateFilePath(mediaSource.Path);
playMethod = 'DirectPlay';
} else {
var isDirectStream = mediaSource.SupportsDirectStream;

1
dashboard-ui/scripts/musicrecommended.js
View file

@ -33,7 +33,6 @@
$('#recentlyAddedSongs', page).html(LibraryBrowser.getPosterViewHtml({
items: items,
showUnplayedIndicator: false,
showChildCountIndicator: true,
showLatestItemsPopup: false,
shape: getSquareShape(),
showTitle: true,

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

@ -701,7 +701,7 @@ var Dashboard = {
}
},
ensureToolsMenu: function (page, user) {
ensureToolsMenu: function (page) {
var sidebar = $('.toolsSidebar', page);
@ -720,10 +720,6 @@ var Dashboard = {
item = items[i];
if (!user.Policy.IsAdministrator) {
break;
}
if (item.divider) {
menuHtml += "<div class='sidebarDivider ui-bar-inherit'></div>";
}
@ -738,7 +734,15 @@ var Dashboard = {
menuHtml += '<a data-transition="none" class="sidebarLink" href="' + item.href + '">';
}
menuHtml += '<span class="fa ' + item.icon + ' sidebarLinkIcon"' + style + '></span>';
var icon = item.icon;
if (icon) {
if (icon.indexOf('fa') == 0) {
menuHtml += '<span class="fa ' + icon + ' sidebarLinkIcon"' + style + '></span>';
} else {
menuHtml += '<i class="material-icons sidebarLinkIcon"' + style + '>' + icon + '</i>';
}
}
menuHtml += '<span class="sidebarLinkText">';
menuHtml += item.name;
@ -1969,20 +1973,20 @@ $(document).on('pagecreate', ".page", function () {
if (apiClient && apiClient.accessToken() && Dashboard.getCurrentUserId()) {
Dashboard.getCurrentUser().done(function (user) {
var isSettingsPage = page.hasClass('type-interior');
if (!user.Policy.IsAdministrator && isSettingsPage) {
if (isSettingsPage) {
Dashboard.ensureToolsMenu(page);
Dashboard.getCurrentUser().done(function (user) {
if (!user.Policy.IsAdministrator) {
Dashboard.logout();
return;
}
if (isSettingsPage) {
Dashboard.ensureToolsMenu(page, user);
}
});
}
}
else {

3
dashboard-ui/thirdparty/apiclient/apiclient.js vendored
View file

@ -192,7 +192,7 @@
if (connectionMode == MediaBrowser.ConnectionMode.Local && currentServerInfo.RemoteAddress) {
newConnectionMode = MediaBrowser.ConnectionMode.Remote;
}
else if (connectionMode == MediaBrowser.ConnectionMode.Remote && currentServerInfo.LocalAddress) {
else if (connectionMode != MediaBrowser.ConnectionMode.Local && currentServerInfo.LocalAddress) {
newConnectionMode = MediaBrowser.ConnectionMode.Local;
}
else {
@ -204,6 +204,7 @@
function tryReconnectInternal(deferred, connectionMode, currentRetryCount) {
connectionMode = switchConnectionMode(connectionMode);
var url = MediaBrowser.ServerInfo.getServerAddress(self.serverInfo(), connectionMode);
logger.log("Attempting reconnection to " + url);

4
dashboard-ui/thirdparty/cordova/android/filesystem.js vendored
View file

@ -4,6 +4,10 @@
fileExists: function (path) {
return NativeFileSystem.fileExists(path);
},
translateFilePath: function (path) {
return NativeFileSystem.translateFilePath(path);
}
};

2
dashboard-ui/thirdparty/cordova/android/iap.js vendored
View file

@ -35,7 +35,7 @@
}
function beginPurchase(id) {
return NativeIapManager.beginPurchase(id);
return MainActivity.beginPurchase(id);
}
window.IapManager = {

5
dashboard-ui/thirdparty/cordova/filesystem.js vendored
View file

@ -4,8 +4,11 @@
fileExists: function (path) {
return false;
}
},
translateFilePath: function (path) {
return path;
}
};
})();

5
dashboard-ui/thirdparty/filesystem.js vendored
View file

@ -4,8 +4,11 @@
fileExists: function (path) {
return false;
}
},
translateFilePath: function (path) {
return path;
}
};
})();