wjones/jellyfin-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support remote queuing to web client

Browse Source
This commit is contained in:
Luke Pulverenti
2013-11-30 01:07:45 -05:00
parent 663b5e93a1
commit dbf7337f7c
5 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dashboard-ui/advanced.html
+1 -1
View File
@@ -15,7 +15,7 @@
<input type="checkbox" id="chkRunAtStartup" name="chkRunAtStartup" />
<label for="chkRunAtStartup">Run server at startup</label>
<div id="windowsStartupDescription" class="fieldDescription warningFieldDescription" style="display: none;">
This will start the tray icon on windows startup. If you'd prefer to start the windows service instead, disable this and run the service from the windows control panel. Please note that you cannot run both at the same time, so you will need to exit the tray icon before starting the service.
This will start the tray icon on windows startup. To start the windows service, uncheck this and run the service from the windows control panel. Please note that you cannot run both at the same time, so you will need to exit the tray icon before starting the service.
</div>
</li>
<li>
dashboard-ui/css/site.css
+7
View File
@@ -47,6 +47,13 @@ body {
font-family: 'Open Sans', Arial, Helvetica, sans-serif;
}
.ui-header .ui-btn-inner, .ui-footer .ui-btn-inner, .ui-mini .ui-btn-inner {
font-size: 13.5px;
}
.ui-li-desc {
font-size: 13px;
}
h1 {
font-family: 'Open Sans', Arial, Helvetica, sans-serif;
font-weight: 200;
dashboard-ui/scripts/librarybrowser.js
+1 -1
View File
@@ -1476,7 +1476,7 @@
var html = '';
if (item.Type != "Audio") {
if (item.Type != "Audio" && item.Type != "Season" && item.Type != "Series") {
html += LibraryBrowser.getItemProgressBarHtml(item);
}
dashboard-ui/scripts/mediaplayer.js
+9 -15
View File
@@ -762,7 +762,7 @@
return self.canPlayMediaType(item.MediaType);
};
self.getPlayUrl = function(item) {
self.getPlayUrl = function (item) {
if (item.GameSystem == "Nintendo" && item.MediaType == "Game" && item.ProviderIds.NesBox && item.ProviderIds.NesBoxRom) {
@@ -810,7 +810,7 @@
Dashboard.getCurrentUser().done(function (user) {
var item = items[0];
var videoType = (item.VideoType || "").toLowerCase();
var expirementalText = "This feature is experimental. It may not work at all with some titles. Do you wish to continue?";
@@ -1202,10 +1202,12 @@
}
};
self.queueItem = function (item) {
self.queueItems = function (items) {
self.playlist.push(item);
for (var i = 0, length = items.length; i < length; i++) {
self.playlist.push(items[i]);
}
};
self.queue = function (id) {
@@ -1222,16 +1224,12 @@
}).done(function (result) {
for (var i = 0, length = result.Items.length; i < length; i++) {
self.queueItem(result.Items[i]);
}
self.queueItems(result.Items);
});
} else {
self.queueItem(item);
self.queueItems([item]);
}
});
@@ -1248,11 +1246,7 @@
}).done(function (result) {
for (var i = 0, length = result.Items.length; i < length; i++) {
self.queueItem(result.Items[i]);
}
self.queueItems(result.Items);
});
dashboard-ui/scripts/site.js
+10 -1
View File
@@ -804,7 +804,16 @@ var Dashboard = {
Ids: msg.Data.ItemIds.join(',')
}).done(function (result) {
MediaPlayer.play(result.Items, msg.Data.StartPositionTicks);
if (msg.Data.PlayCommand == "PlayNext") {
MediaPlayer.queueItems(result.Items);
}
else if (msg.Data.PlayCommand == "PlayLast") {
MediaPlayer.queueItems(result.Items);
}
else {
MediaPlayer.play(result.Items, msg.Data.StartPositionTicks);
}
});