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.5666.2

Browse source
This commit is contained in:
Luke Pulverenti 2015-07-08 12:10:34 -04:00
parent 17a0f1578d
commit 8030454e19
13 changed files with 175 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -545,6 +545,10 @@
}
return false;
},
onHardwareMenuButtonClick: function () {
openMainDrawer();
}
};
@ -939,7 +943,7 @@ $.fn.createHoverTouch = function () {
var backUrl;
$(document).on('pagebeforeshow', ".page", function () {
if (getWindowUrl() != backUrl) {
backUrl = null;
}

32
dashboard-ui/scripts/mediaplayer-video.js
View file

@ -626,8 +626,8 @@
html += '<div class="videoTopControlsLogo"></div>';
html += '<div class="videoAdvancedControls">';
html += '<paper-icon-button icon="skip-previous" class="previousTrackButton mediaButton videoTrackControl" onclick="MediaPlayer.previousTrack();"></paper-icon-button>';
html += '<paper-icon-button icon="skip-next" class="nextTrackButton mediaButton videoTrackControl" onclick="MediaPlayer.nextTrack();"></paper-icon-button>';
html += '<paper-icon-button icon="skip-previous" class="previousTrackButton mediaButton videoTrackControl hide" onclick="MediaPlayer.previousTrack();"></paper-icon-button>';
html += '<paper-icon-button icon="skip-next" class="nextTrackButton mediaButton videoTrackControl hide" onclick="MediaPlayer.nextTrack();"></paper-icon-button>';
// Embedding onclicks due to issues not firing in cordova safari
html += '<paper-icon-button icon="audiotrack" class="mediaButton videoAudioButton" onclick="MediaPlayer.showAudioTracksFlyout();"></paper-icon-button>';
@ -652,12 +652,12 @@
html += '<div class="nowPlayingTabs"></div>';
html += '</div>'; // nowPlayingInfo
html += '<paper-icon-button icon="skip-previous" class="previousTrackButton mediaButton videoTrackControl" onclick="MediaPlayer.previousTrack();"></paper-icon-button>';
html += '<paper-icon-button icon="skip-previous" class="previousTrackButton mediaButton videoTrackControl hide" onclick="MediaPlayer.previousTrack();"></paper-icon-button>';
html += '<paper-icon-button id="video-playButton" icon="play-arrow" class="mediaButton unpauseButton" onclick="MediaPlayer.unpause();"></paper-icon-button>';
html += '<paper-icon-button id="video-pauseButton" icon="pause" class="mediaButton pauseButton" onclick="MediaPlayer.pause();"></paper-icon-button>';
html += '<paper-icon-button icon="skip-next" class="nextTrackButton mediaButton videoTrackControl" onclick="MediaPlayer.nextTrack();"></paper-icon-button>';
html += '<paper-icon-button icon="skip-next" class="nextTrackButton mediaButton videoTrackControl hide" onclick="MediaPlayer.nextTrack();"></paper-icon-button>';
html += '<paper-slider pin step=".1" min="0" max="100" value="0" class="videoPositionSlider" style="width:300px;vertical-align:middle;margin-left:-1em;"></paper-slider>';
@ -933,8 +933,11 @@
unbindEventsForPlayback(mediaRenderer);
};
self.playVideo = function (item, mediaSource, startPosition) {
self.playVideo = function (item, mediaSource, startPosition, callback) {
//ApiClient.detectBitrate().done(function (b) {
// alert(b);
//});
requirejs(['videorenderer'], function () {
var streamInfo = self.createStreamInfo('Video', item, mediaSource, startPosition);
@ -953,11 +956,11 @@
Dashboard.hideLoadingMsg();
}).done(function () {
self.playVideoInternal(item, mediaSource, startPosition, streamInfo);
self.playVideoInternal(item, mediaSource, startPosition, streamInfo, callback);
});
} else {
self.playVideoInternal(item, mediaSource, startPosition, streamInfo);
self.playVideoInternal(item, mediaSource, startPosition, streamInfo, callback);
}
});
};
@ -966,7 +969,7 @@
return true;
}
self.playVideoInternal = function (item, mediaSource, startPosition, streamInfo) {
self.playVideoInternal = function (item, mediaSource, startPosition, streamInfo, callback) {
var videoUrl = streamInfo.url;
var contentType = streamInfo.mimeType;
@ -990,7 +993,7 @@
//show stop button
$('#video-playButton', videoControls).hide();
$('#video-pauseButton', videoControls).show();
$('.videoTrackControl').hide();
$('.videoTrackControl').visible(false);
var videoElement = $('#videoElement', mediaPlayerContainer);
@ -1140,7 +1143,7 @@
self.updateNowPlayingInfo(item);
mediaRenderer.init().done(function() {
mediaRenderer.init().done(function () {
var textStreams = subtitleStreams.filter(function (s) {
return s.DeliveryMethod == 'External';
@ -1166,6 +1169,10 @@
if (videoUrl.indexOf('.m3u8') == -1) {
mediaRenderer.unpause();
}
if (callback) {
callback();
}
});
};
@ -1180,7 +1187,7 @@
}
if (length < 2) {
$('.videoTrackControl').hide();
$('.videoTrackControl').visible(false);
return;
}
@ -1202,7 +1209,8 @@
nextTrackButton.removeAttribute('disabled');
}
$('.videoTrackControl', controls).show();
$(previousTrackButton).visible(true);
$(nextTrackButton).visible(true);
};
}

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

@ -975,16 +975,12 @@
if (item.MediaType === "Video") {
requirejs(['videorenderer'], function () {
self.playVideo(item, self.currentMediaSource, startPosition);
self.playVideo(item, self.currentMediaSource, startPosition, callback);
});
} else if (item.MediaType === "Audio") {
playAudio(item, self.currentMediaSource, startPosition);
}
if (callback) {
callback();
playAudio(item, self.currentMediaSource, startPosition, callback);
}
}
@ -1720,10 +1716,14 @@
self.setCurrentTime(currentTicks);
}
function playAudio(item, mediaSource, startPositionTicks) {
function playAudio(item, mediaSource, startPositionTicks, callback) {
requirejs(['audiorenderer'], function () {
playAudioInternal(item, mediaSource, startPositionTicks);
if (callback) {
callback();
}
});
}

82
dashboard-ui/scripts/musicalbumartists.js
View file

@ -4,27 +4,44 @@
var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
// The base query options
var query = {
var data = {};
SortBy: "SortName",
SortOrder: "Ascending",
Recursive: true,
Fields: "PrimaryImageAspectRatio,SortName,DateCreated,SyncInfo,ItemCounts",
StartIndex: 0,
ImageTypeLimit: 1,
EnableImageTypes: "Primary,Backdrop,Banner,Thumb"
};
function getQuery() {
var key = getSavedQueryKey();
var pageData = data[key];
if (!pageData) {
pageData = data[key] = {
query: {
SortBy: "SortName",
SortOrder: "Ascending",
Recursive: true,
Fields: "PrimaryImageAspectRatio,SortName,DateCreated,SyncInfo,ItemCounts",
StartIndex: 0,
ImageTypeLimit: 1,
EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
Limit: LibraryBrowser.getDefaultPageSize()
}
};
pageData.query.ParentId = LibraryMenu.getTopParentId();
LibraryBrowser.loadSavedQueryValues(key, pageData.query);
}
return pageData.query;
}
function getSavedQueryKey() {
return 'musicartists' + (query.ParentId || '');
return getWindowUrl();
}
function reloadItems(page) {
Dashboard.showLoadingMsg();
var query = getQuery();
ApiClient.getAlbumArtists(Dashboard.getCurrentUserId(), query).done(function (result) {
// Scroll back up so they can see the results from the beginning
@ -100,13 +117,15 @@
});
LibraryBrowser.saveQueryValues(getSavedQueryKey(), query);
LibraryBrowser.setLastRefreshed(page);
Dashboard.hideLoadingMsg();
});
}
function updateFilterControls(page) {
var query = getQuery();
$('.chkStandardFilter', page).each(function () {
var filters = "," + (query.Filters || "");
@ -129,6 +148,8 @@
filtersLoaded = true;
var query = getQuery();
QueryFilters.loadFilters(page, Dashboard.getCurrentUserId(), query, function () {
reloadItems(page);
@ -147,6 +168,8 @@
$('.chkStandardFilter', this).on('change', function () {
var query = getQuery();
var filterName = this.getAttribute('data-filter');
var filters = query.Filters || "";
@ -164,6 +187,8 @@
$('.alphabetPicker', this).on('alphaselect', function (e, character) {
var query = getQuery();
query.NameStartsWithOrGreater = character;
query.StartIndex = 0;
@ -171,6 +196,8 @@
}).on('alphaclear', function (e) {
var query = getQuery();
query.NameStartsWithOrGreater = '';
reloadItems(page);
@ -186,6 +213,8 @@
});
$('#selectPageSize', page).on('change', function () {
var query = getQuery();
query.Limit = parseInt(this.value);
query.StartIndex = 0;
reloadItems(page);
@ -194,29 +223,20 @@
}).on('pagebeforeshowready', "#musicAlbumArtistsPage", function () {
var page = this;
query.ParentId = LibraryMenu.getTopParentId();
var query = getQuery();
var limit = LibraryBrowser.getDefaultPageSize(pageSizeKey, 100);
// If the default page size has changed, the start index will have to be reset
if (limit != query.Limit) {
query.Limit = limit;
query.StartIndex = 0;
}
var viewkey = getSavedQueryKey();
LibraryBrowser.loadSavedQueryValues(viewkey, query);
QueryFilters.onPageShow(page, query);
LibraryBrowser.getSavedViewSetting(viewkey).done(function (val) {
if (LibraryBrowser.needsRefresh(page)) {
LibraryBrowser.getSavedViewSetting(getSavedQueryKey()).done(function (val) {
if (val) {
$('#selectView', page).val(val).selectmenu('refresh').trigger('change');
} else {
reloadItems(page);
}
});
if (val) {
$('#selectView', page).val(val).selectmenu('refresh').trigger('change');
} else {
reloadItems(page);
}
});
}
updateFilterControls(this);
});

18
dashboard-ui/scripts/musicalbums.js
View file

@ -2,19 +2,6 @@
var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
// The base query options
var query = {
SortBy: "AlbumArtist,SortName",
SortOrder: "Ascending",
IncludeItemTypes: "MusicAlbum",
Recursive: true,
Fields: "PrimaryImageAspectRatio,SortName,SyncInfo",
StartIndex: 0,
ImageTypeLimit: 1,
EnableImageTypes: "Primary,Backdrop,Banner,Thumb"
};
var data = {};
function getQuery() {
@ -295,12 +282,11 @@
var page = this;
var viewKey = getSavedQueryKey();
LibraryBrowser.loadSavedQueryValues(viewKey, query);
var query = getQuery();
QueryFilters.onPageShow(page, query);
if (LibraryBrowser.needsRefresh(page)) {
LibraryBrowser.getSavedViewSetting(viewKey).done(function (val) {
LibraryBrowser.getSavedViewSetting(getSavedQueryKey()).done(function (val) {
if (val) {
$('#selectView', page).val(val).selectmenu('refresh').trigger('change');

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

@ -78,6 +78,9 @@
ApiClient.updateUserConfiguration(user.Id, user.Configuration).done(function () {
Dashboard.alert(Globalize.translate('SettingsSaved'));
}).always(function () {
Dashboard.hideLoadingMsg();
});
}

12
dashboard-ui/scripts/sections.js
View file

@ -151,11 +151,7 @@
if (items.length) {
html += '<div>';
html += '<h1 style="display:inline-block; vertical-align:middle;" class="listHeader">' + Globalize.translate('HeaderLatestMedia') + '</h1>';
if (user.Policy.EnableUserPreferenceAccess && !AppInfo.isNativeApp) {
html += '<a href="mypreferencesdisplay.html" class="clearLink" style="margin-left:2em;"><paper-button raised class="submit mini"><iron-icon icon="mode-edit"></iron-icon><span>' + Globalize.translate('ButtonEdit') + '</span></paper-button></a>';
}
html += '<h1 class="listHeader">' + Globalize.translate('HeaderLatestMedia') + '</h1>';
html += '</div>';
@ -239,11 +235,7 @@
var cssClass = index !== 0 ? 'listHeader' : 'listHeader';
html += '<div>';
html += '<h1 style="display:inline-block; vertical-align:middle;" class="' + cssClass + '">' + Globalize.translate('HeaderMyMedia') + '</h1>';
if (user.Policy.EnableUserPreferenceAccess && !AppInfo.isNativeApp) {
html += '<a href="mypreferencesdisplay.html" class="clearLink" style="margin-left:2em;"><paper-button raised class="submit mini"><iron-icon icon="mode-edit"></iron-icon><span>' + Globalize.translate('ButtonEdit') + '</span></paper-button></a>';
}
html += '<h1 class="' + cssClass + '">' + Globalize.translate('HeaderMyMedia') + '</h1>';
html += '</div>';

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

@ -2063,9 +2063,7 @@ var AppInfo = {};
function initCordovaWithDeviceId(deferred, deviceId) {
if ($.browser.android) {
require(['cordova/imagestore']);
}
require(['cordova/imagestore']);
var capablities = Dashboard.capabilities();