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

updated playlist images

Browse source
This commit is contained in:
Luke Pulverenti 2013-06-07 12:17:45 -04:00
parent 2a188455c6
commit 6446cf2020
4 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
dashboard-ui/css/images/media/playcircle.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 953 B

Before After
Before After

BIN
dashboard-ui/css/images/media/remove.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 880 B

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

@ -19,6 +19,7 @@
var curentDurationTicks; var curentDurationTicks;
var isStaticStream; var isStaticStream;
var culturesPromise; var culturesPromise;
var isStopping;
self.playlist = []; self.playlist = [];
var currentPlaylistIndex = 0; var currentPlaylistIndex = 0;
@ -76,6 +77,8 @@
function onPlaybackStopped() { function onPlaybackStopped() {
isStopping = true;
currentTimeElement.empty(); currentTimeElement.empty();
var endTime = this.currentTime; var endTime = this.currentTime;
@ -88,6 +91,8 @@
ApiClient.reportPlaybackStopped(Dashboard.getCurrentUserId(), currentItem.Id, position); ApiClient.reportPlaybackStopped(Dashboard.getCurrentUserId(), currentItem.Id, position);
isStopping = false;
self.queuePlayNext(); self.queuePlayNext();
} }
@ -448,9 +453,6 @@
function playVideo(item, startPosition, user) { function playVideo(item, startPosition, user) {
//stop/kill videoJS
if (currentMediaElement) self.stop();
// Account for screen rotation. Use the larger dimension as the width. // Account for screen rotation. Use the larger dimension as the width.
var screenWidth = Math.max(screen.height, screen.width); var screenWidth = Math.max(screen.height, screen.width);
@ -808,7 +810,7 @@
self.playInternal = function (item, startPosition, user) { self.playInternal = function (item, startPosition, user) {
if (self.isPlaying()) { if (self.isPlaying() && !isStopping) {
self.stop(); self.stop();
} }

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

@ -21,12 +21,12 @@
var parentName = item.SeriesName || item.Album || item.ProductionYear || ''; var parentName = item.SeriesName || item.Album || item.ProductionYear || '';
html += '<tr>'; html += '<tr>';
html += '<td><a href="#" data-index="' + i + '" class="lnkPlay"><img src="css/images/media/playCircle.png" style="height: 24px;" /></a></td>'; html += '<td><a href="#" data-index="' + i + '" class="lnkPlay"><img src="css/images/media/playcircle.png" style="height: 20px;" /></a></td>';
html += '<td>' + name + '</td>'; html += '<td>' + name + '</td>';
html += '<td>' + parentName + '</td>'; html += '<td>' + parentName + '</td>';
html += '<td>' + ticks_to_human(item.RunTimeTicks) + '</td>'; html += '<td>' + ticks_to_human(item.RunTimeTicks) + '</td>';
html += '<td>' + LibraryBrowser.getUserDataIconsHtml(item) + '</td>'; html += '<td>' + LibraryBrowser.getUserDataIconsHtml(item) + '</td>';
html += '<td><a href="#" data-index="' + i + '" class="lnkRemove"><img src="css/images/media/playCircle.png" style="height: 24px;" /></a></td>'; html += '<td><a href="#" data-index="' + i + '" class="lnkRemove"><img src="css/images/media/remove.png" style="height: 20px;" /></a></td>';
html += '</tr>'; html += '</tr>';
}); });