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

add ShortOverview

Browse source
This commit is contained in:
Luke Pulverenti 2014-06-24 00:18:02 -04:00
parent 0784ca7a0a
commit 9caea924a1
3 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/css/chromecast.css
View file

@ -28,7 +28,7 @@
margin-right: .5em; margin-right: .5em;
height: 100%; height: 100%;
position: relative; position: relative;
top: -18px; top: -19px;
font-family: "Open Sans"; font-family: "Open Sans";
} }

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

@ -76,7 +76,7 @@
html += LibraryBrowser.getPosterViewHtml({ html += LibraryBrowser.getPosterViewHtml({
items: result.Items, items: result.Items,
preferThumb: true, preferThumb: true,
shape: 'auto', shape: 'autosmall',
showTitle: true, showTitle: true,
centerText: true, centerText: true,
context: 'home', context: 'home',
@ -245,7 +245,7 @@
var options = { var options = {
Limit: screenWidth >= 1920 ? 9 : (screenWidth >= 1440 ? 8 : (screenWidth >= 800 ? 6 : 6)), Limit: screenWidth >= 1920 ? 7 : (screenWidth >= 1440 ? 5 : (screenWidth >= 800 ? 6 : 6)),
Fields: "PrimaryImageAspectRatio", Fields: "PrimaryImageAspectRatio",
Filters: "IsUnplayed", Filters: "IsUnplayed",
UserId: Dashboard.getCurrentUserId(), UserId: Dashboard.getCurrentUserId(),
@ -268,7 +268,7 @@
} }
html += LibraryBrowser.getPosterViewHtml({ html += LibraryBrowser.getPosterViewHtml({
items: result.Items, items: result.Items,
shape: 'auto', shape: 'autosmall',
defaultShape: 'square', defaultShape: 'square',
showTitle: true, showTitle: true,
centerText: true, centerText: true,
@ -306,7 +306,7 @@
html += LibraryBrowser.getPosterViewHtml({ html += LibraryBrowser.getPosterViewHtml({
items: result.Items, items: result.Items,
shape: "auto", shape: "autosmall",
showTitle: true, showTitle: true,
showParentTitle: true, showParentTitle: true,
overlayText: screenWidth >= 600, overlayText: screenWidth >= 600,

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

@ -5,11 +5,11 @@
var self = this; var self = this;
var testableVideoElement = document.createElement('video'); var testableVideoElement = document.createElement('video');
var currentMediaElement;
var currentProgressInterval; var currentProgressInterval;
var canClientSeek; var canClientSeek;
var currentPlaylistIndex = 0; var currentPlaylistIndex = 0;
self.currentMediaElement = null;
self.currentItem = null; self.currentItem = null;
self.currentMediaSource = null; self.currentMediaSource = null;
@ -44,7 +44,7 @@
self.getCurrentTicks = function (mediaElement) { self.getCurrentTicks = function (mediaElement) {
var playerTime = Math.floor(10000000 * (mediaElement || currentMediaElement).currentTime); var playerTime = Math.floor(10000000 * (mediaElement || self.currentMediaElement).currentTime);
//if (!self.isCopyingTimestamps) { //if (!self.isCopyingTimestamps) {
playerTime += self.startTimeTicksOffset; playerTime += self.startTimeTicksOffset;
@ -77,7 +77,7 @@
currentProgressInterval = setInterval(function () { currentProgressInterval = setInterval(function () {
if (currentMediaElement) { if (self.currentMediaElement) {
sendProgressUpdate(); sendProgressUpdate();
} }
@ -104,7 +104,7 @@
self.changeStream = function (ticks, params) { self.changeStream = function (ticks, params) {
var element = currentMediaElement; var element = self.currentMediaElement;
if (canClientSeek && params == null) { if (canClientSeek && params == null) {
@ -223,7 +223,7 @@
currentTimeElement.html(timeText); currentTimeElement.html(timeText);
} }
var state = self.getPlayerStateInternal(currentMediaElement, self.currentItem, self.currentMediaSource); var state = self.getPlayerStateInternal(self.currentMediaElement, self.currentItem, self.currentMediaSource);
$(self).trigger('positionchange', [state]); $(self).trigger('positionchange', [state]);
}; };
@ -496,7 +496,7 @@
throw new Error("Unrecognized media type"); throw new Error("Unrecognized media type");
} }
currentMediaElement = mediaElement; self.currentMediaElement = mediaElement;
if (item.MediaType === "Video") { if (item.MediaType === "Video") {
@ -512,7 +512,7 @@
var mediaControls = $("#videoControls"); var mediaControls = $("#videoControls");
var state = self.getPlayerStateInternal(currentMediaElement, item, self.currentMediaSource); var state = self.getPlayerStateInternal(self.currentMediaElement, item, self.currentMediaSource);
var url = ""; var url = "";
@ -693,7 +693,7 @@
self.queue = function (options) { self.queue = function (options) {
if (!currentMediaElement) { if (!self.currentMediaElement) {
self.play(options); self.play(options);
return; return;
} }
@ -727,7 +727,7 @@
self.queueNext = function (options) { self.queueNext = function (options) {
if (!currentMediaElement) { if (!self.currentMediaElement) {
self.play(options); self.play(options);
return; return;
} }
@ -758,11 +758,11 @@
self.pause = function () { self.pause = function () {
currentMediaElement.pause(); self.currentMediaElement.pause();
}; };
self.unpause = function () { self.unpause = function () {
currentMediaElement.play(); self.currentMediaElement.play();
}; };
self.seek = function (position) { self.seek = function (position) {
@ -782,11 +782,11 @@
self.toggleMute = function () { self.toggleMute = function () {
if (currentMediaElement) { if (self.currentMediaElement) {
console.log('MediaPlayer toggling mute'); console.log('MediaPlayer toggling mute');
if (currentMediaElement.volume) { if (self.currentMediaElement.volume) {
self.mute(); self.mute();
} else { } else {
self.unMute(); self.unMute();
@ -796,27 +796,27 @@
self.volumeDown = function () { self.volumeDown = function () {
if (currentMediaElement) { if (self.currentMediaElement) {
self.setVolume(Math.max(currentMediaElement.volume - .02, 0) * 100); self.setVolume(Math.max(self.currentMediaElement.volume - .02, 0) * 100);
} }
}; };
self.volumeUp = function () { self.volumeUp = function () {
if (currentMediaElement) { if (self.currentMediaElement) {
self.setVolume(Math.min(currentMediaElement.volume + .02, 1) * 100); self.setVolume(Math.min(self.currentMediaElement.volume + .02, 1) * 100);
} }
}; };
// Sets volume using a 0-100 scale // Sets volume using a 0-100 scale
self.setVolume = function (val) { self.setVolume = function (val) {
if (currentMediaElement) { if (self.currentMediaElement) {
console.log('MediaPlayer setting volume to ' + val); console.log('MediaPlayer setting volume to ' + val);
currentMediaElement.volume = val / 100; self.currentMediaElement.volume = val / 100;
self.onVolumeChanged(currentMediaElement); self.onVolumeChanged(self.currentMediaElement);
self.saveVolume(); self.saveVolume();
} }
@ -938,7 +938,7 @@
self.stop = function () { self.stop = function () {
var elem = currentMediaElement; var elem = self.currentMediaElement;
elem.pause(); elem.pause();
@ -953,7 +953,7 @@
} }
elem.src = ""; elem.src = "";
currentMediaElement = null; self.currentMediaElement = null;
self.currentItem = null; self.currentItem = null;
self.currentMediaSource = null; self.currentMediaSource = null;
@ -968,14 +968,14 @@
}; };
self.isPlaying = function () { self.isPlaying = function () {
return currentMediaElement != null; return self.currentMediaElement != null;
}; };
self.getPlayerState = function () { self.getPlayerState = function () {
var deferred = $.Deferred(); var deferred = $.Deferred();
var result = self.getPlayerStateInternal(currentMediaElement, self.currentItem, self.currentMediaSource); var result = self.getPlayerStateInternal(self.currentMediaElement, self.currentItem, self.currentMediaSource);
deferred.resolveWith(null, [result]); deferred.resolveWith(null, [result]);
@ -1140,15 +1140,15 @@
$(window).on("beforeunload popstate", function () { $(window).on("beforeunload popstate", function () {
// Try to report playback stopped before the browser closes // Try to report playback stopped before the browser closes
if (self.currentItem && currentMediaElement && currentProgressInterval) { if (self.currentItem && self.currentMediaElement && currentProgressInterval) {
self.onPlaybackStopped.call(currentMediaElement); self.onPlaybackStopped.call(self.currentMediaElement);
} }
}); });
function sendProgressUpdate() { function sendProgressUpdate() {
var state = self.getPlayerStateInternal(currentMediaElement, self.currentItem, self.currentMediaSource); var state = self.getPlayerStateInternal(self.currentMediaElement, self.currentItem, self.currentMediaSource);
var info = { var info = {
QueueableMediaTypes: state.NowPlayingItem.MediaType, QueueableMediaTypes: state.NowPlayingItem.MediaType,