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

3.0.5264.17006

Browse source
This commit is contained in:
Luke Pulverenti 2014-05-31 10:30:59 -04:00
parent dcd20638c8
commit 2ba4a04377
8 changed files with 111 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,9 +13,7 @@
DashboardPage.startInterval();
$(ApiClient).on("websocketmessage", DashboardPage.onWebSocketMessage)
.on("websocketopen", DashboardPage.onWebSocketConnectionChange)
.on("websocketerror", DashboardPage.onWebSocketConnectionChange)
.on("websocketclose", DashboardPage.onWebSocketConnectionChange);
.on("websocketopen", DashboardPage.onWebSocketOpen);
DashboardPage.lastAppUpdateCheck = null;
DashboardPage.lastPluginUpdateCheck = null;
@ -180,9 +178,8 @@
}
},
onWebSocketConnectionChange: function () {
onWebSocketOpen: function () {
DashboardPage.stopInterval();
DashboardPage.startInterval();
},
@ -192,6 +189,10 @@
DashboardPage.renderInfo(page, sessions);
});
ApiClient.getScheduledTasks().done(function (tasks) {
DashboardPage.renderRunningTasks(page, tasks);
});
},
renderInfo: function (page, sessions) {

6
dashboard-ui/scripts/indexpage.js
View file

@ -31,14 +31,18 @@
imgUrl = "css/images/items/folders/games.png";
break;
case "trailers":
imgUrl = "css/images/items/folders/games.png";
imgUrl = "css/images/items/folders/movies.png";
break;
case "adultvideos":
case "homevideos":
imgUrl = "css/images/items/folders/homevideos.png";
break;
case "musicvideos":
imgUrl = "css/images/items/folders/musicvideos.png";
break;
case "books":
imgUrl = "css/images/items/folders/books.png";
break;
case "channels":
imgUrl = "css/images/items/folders/channels.png";
break;

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

@ -4,6 +4,9 @@
var html = '<div class="viewMenuBar ui-bar-b">';
//html += '<a href="index.html" class="headerButton headerButtonLeft headerHomeButton">';
//html += '<img src="css/images/items/folders/home.png" />';
//html += '</a>';
html += '<button type="button" data-role="none" title="Menu" class="headerButton libraryMenuButton headerButtonLeft">';
html += '<img src="css/images/menu.png" />';
html += '</button>';

74
dashboard-ui/scripts/moviecollections.js
View file

@ -32,7 +32,7 @@
updateFilterControls(page);
if (result.TotalRecordCount) {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "portrait",
@ -41,11 +41,11 @@
centerText: true,
lazy: true
});
html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);
$('.noItemsMessage', page).hide();
} else {
$('.noItemsMessage', page).show();
}
@ -69,16 +69,6 @@
LibraryBrowser.saveQueryValues(getSavedQueryKey(), query);
Dashboard.getCurrentUser().done(function(user) {
if (user.Configuration.IsAdministrator) {
$('#btnNewCollection', page).removeClass('hide');
} else {
$('#btnNewCollection', page).addClass('hide');
}
});
Dashboard.hideLoadingMsg();
});
}
@ -116,7 +106,7 @@
function showNewCollectionPanel(page) {
$('#newCollectionPanel', page).panel('toggle');
$('.newCollectionPanel', page).panel('toggle');
$('#txtNewCollectionName', page).val('').focus();
}
@ -190,11 +180,6 @@
reloadItems(page);
});
$('#btnNewCollection', page).on('click', function () {
showNewCollectionPanel(page);
});
}).on('pagebeforeshow', "#boxsetsPage", function () {
query.ParentId = LibraryMenu.getTopParentId();
@ -214,9 +199,48 @@
}).on('pageshow', "#boxsetsPage", function () {
updateFilterControls(this);
}).on('collectionedit', "#boxsetsPage", function () {
reloadItems(this);
});
window.BoxSetsPage = {
})(jQuery, document);
(function ($, document) {
function showNewCollectionPanel(page) {
$('.newCollectionPanel', page).panel('toggle');
$('#txtNewCollectionName', page).val('').focus();
}
$(document).on('pageinit', ".collectionEditorPage", function () {
var page = this;
$('.btnNewCollection', page).on('click', function () {
showNewCollectionPanel(page);
});
}).on('pagebeforeshow', ".collectionEditorPage", function () {
var page = this;
Dashboard.getCurrentUser().done(function (user) {
if (user.Configuration.IsAdministrator) {
$('.btnNewCollection', page).removeClass('hide');
} else {
$('.btnNewCollection', page).addClass('hide');
}
});
});
window.BoxSetEditor = {
onNewCollectionSubmit: function () {
@ -225,11 +249,11 @@
var page = $(this).parents('.page');
var url = ApiClient.getUrl("Collections", {
Name: $('#txtNewCollectionName', page).val(),
IsLocked: !$('#chkEnableInternetMetadata', page).checked(),
ParentId: getParameterByName('parentId') || getParameterByName('topParentId')
ParentId: getParameterByName('parentId') || LibraryMenu.getTopParentId()
});
@ -241,9 +265,9 @@
Dashboard.hideLoadingMsg();
$('#newCollectionPanel', page).panel('toggle');
$('.newCollectionPanel', page).panel('toggle');
reloadItems(page);
$(page).trigger('collectionedit');
});

14
dashboard-ui/scripts/remotecontrol.js
View file

@ -319,10 +319,20 @@
}
}
else if (msg.MessageType === "PlaybackStart") {
firePlaybackEvent('playbackstart', msg.Data);
if (msg.Data.DeviceId != ApiClient.deviceId()) {
if (MediaController.getPlayerInfo().id == msg.Data.Id) {
firePlaybackEvent('playbackstart', msg.Data);
}
}
}
else if (msg.MessageType === "PlaybackStopped") {
firePlaybackEvent('playbackstop', msg.Data);
if (msg.Data.DeviceId != ApiClient.deviceId()) {
if (MediaController.getPlayerInfo().id == msg.Data.Id) {
firePlaybackEvent('playbackstop', msg.Data);
}
}
}
}