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

Browse source
This commit is contained in:
Luke Pulverenti 2015-07-06 12:40:55 -04:00
parent 5cb377b6a9
commit 99768ecffe
12 changed files with 81 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dashboard-ui/bower_components/iron-flex-layout/.bower.json vendored
View file

@ -23,14 +23,14 @@
"paper-styles": "polymerelements/paper-styles#^1.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
},
"homepage": "https://github.com/PolymerElements/iron-flex-layout",
"homepage": "https://github.com/polymerelements/iron-flex-layout",
"_release": "1.0.2",
"_resolution": {
"type": "version",
"tag": "v1.0.2",
"commit": "50bcecf40ab23caa7c2cd90030555e00c5ba7154"
},
"_source": "git://github.com/PolymerElements/iron-flex-layout.git",
"_source": "git://github.com/polymerelements/iron-flex-layout.git",
"_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-flex-layout"
"_originalSource": "polymerelements/iron-flex-layout"
}

6
dashboard-ui/bower_components/iron-meta/.bower.json vendored
View file

@ -25,14 +25,14 @@
"web-component-tester": "*",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
},
"homepage": "https://github.com/PolymerElements/iron-meta",
"homepage": "https://github.com/polymerelements/iron-meta",
"_release": "1.0.3",
"_resolution": {
"type": "version",
"tag": "v1.0.3",
"commit": "91529259262b0d8f33fed44bc3fd47aedf35cb04"
},
"_source": "git://github.com/PolymerElements/iron-meta.git",
"_source": "git://github.com/polymerelements/iron-meta.git",
"_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-meta"
"_originalSource": "polymerelements/iron-meta"
}

6
dashboard-ui/bower_components/iron-selector/.bower.json vendored
View file

@ -28,14 +28,14 @@
"web-component-tester": "*",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
},
"homepage": "https://github.com/PolymerElements/iron-selector",
"homepage": "https://github.com/polymerelements/iron-selector",
"_release": "1.0.2",
"_resolution": {
"type": "version",
"tag": "v1.0.2",
"commit": "ea22d91d11ba6f72c01faa952d5e600f9d1773cf"
},
"_source": "git://github.com/PolymerElements/iron-selector.git",
"_source": "git://github.com/polymerelements/iron-selector.git",
"_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-selector"
"_originalSource": "polymerelements/iron-selector"
}

4
dashboard-ui/bower_components/paper-behaviors/.bower.json vendored
View file

@ -42,7 +42,7 @@
"tag": "v1.0.2",
"commit": "4dd226a2cc5b780a73d0058cd9998b6e0af1cb2c"
},
"_source": "git://github.com/PolymerElements/paper-behaviors.git",
"_source": "git://github.com/polymerelements/paper-behaviors.git",
"_target": "^1.0.0",
"_originalSource": "PolymerElements/paper-behaviors"
"_originalSource": "polymerelements/paper-behaviors"
}

6
dashboard-ui/bower_components/paper-ripple/.bower.json vendored
View file

@ -26,14 +26,14 @@
"web-component-tester": "*",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
},
"homepage": "https://github.com/PolymerElements/paper-ripple",
"homepage": "https://github.com/polymerelements/paper-ripple",
"_release": "1.0.1",
"_resolution": {
"type": "version",
"tag": "v1.0.1",
"commit": "af19d904802437c305390bb03415c11661de3d0a"
},
"_source": "git://github.com/PolymerElements/paper-ripple.git",
"_source": "git://github.com/polymerelements/paper-ripple.git",
"_target": "^1.0.0",
"_originalSource": "PolymerElements/paper-ripple"
"_originalSource": "polymerelements/paper-ripple"
}

4
dashboard-ui/bower_components/paper-styles/.bower.json vendored
View file

@ -34,7 +34,7 @@
"tag": "v1.0.7",
"commit": "c65f5ce6b898bb756fca35cedaa53c3e8011abeb"
},
"_source": "git://github.com/PolymerElements/paper-styles.git",
"_source": "git://github.com/polymerelements/paper-styles.git",
"_target": "^1.0.0",
"_originalSource": "PolymerElements/paper-styles"
"_originalSource": "polymerelements/paper-styles"
}

2
dashboard-ui/dashboard.html
View file

@ -64,7 +64,7 @@
</div>
<p>${MessagePleaseRestartServerToFinishUpdating}</p>
<div class="btnRestartContainer hide">
<button type="button" data-icon="refresh" data-theme="b" onclick="Dashboard.restartServer();" data-mini="true" data-inline="true">${ButtonRestartNow}</button>
<paper-button raised class="submit" onclick="DashboardPage.restartServer();"><iron-icon icon="refresh"></iron-icon><span>${ButtonRestartNow}</span></paper-button>
</div>
</div>

2
dashboard-ui/scripts/htmlmediarenderer.js
View file

@ -467,7 +467,7 @@
if (options.type == 'video' && enableViblast()) {
requirejs(['https://viblast.com/player/free-version/sdqsdx86/viblast.js'], function () {
requirejs(['thirdparty/viblast.js'], function () {
deferred.resolve();
});

2
dashboard-ui/scripts/librarylist.js
View file

@ -494,7 +494,7 @@
var mediaType = card.getAttribute('data-mediatype');
var resumePosition = parseInt(card.getAttribute('data-resumeposition'));
if (type == 'MusicAlbum' || type == 'MusicArtist') {
if (type == 'MusicAlbum' || type == 'MusicArtist' || type == 'MusicGenre') {
isFolder = true;
}

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

@ -504,14 +504,14 @@
// viblast can help us here
//return true;
return window.MediaSource != null;
//return window.MediaSource != null;
}
if ($.browser.msie) {
// viblast can help us here
//return true;
return window.MediaSource != null;
//return window.MediaSource != null;
}
return false;

57
dashboard-ui/scripts/movies.js
View file

@ -2,22 +2,37 @@
var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
// The base query options
var query = {
var data = {};
function getQuery() {
var key = getSavedQueryKey();
var pageData = data[key];
if (!pageData) {
pageData = data[key] = {
query: {
SortBy: "SortName",
SortOrder: "Ascending",
IncludeItemTypes: "Movie",
Recursive: true,
Fields: "PrimaryImageAspectRatio,SortName,MediaSourceCount,IsUnidentified,SyncInfo",
StartIndex: 0,
ImageTypeLimit: 1,
EnableImageTypes: "Primary,Backdrop,Banner,Thumb"
EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
StartIndex: 0,
Limit: LibraryBrowser.getDefaultPageSize()
}
};
pageData.query.ParentId = LibraryMenu.getTopParentId();
LibraryBrowser.loadSavedQueryValues(key, pageData.query);
}
return pageData.query;
}
function getSavedQueryKey() {
return 'movies' + (query.ParentId || '');
return getWindowUrl();
}
function reloadItems(page) {
@ -26,6 +41,8 @@
var userId = Dashboard.getCurrentUserId();
var query = getQuery();
ApiClient.getItems(userId, query).done(function (result) {
// Scroll back up so they can see the results from the beginning
@ -149,12 +166,14 @@
LibraryBrowser.saveQueryValues(getSavedQueryKey(), query);
LibraryBrowser.setLastRefreshed(page);
Dashboard.hideLoadingMsg();
});
}
function updateFilterControls(page) {
var query = getQuery();
// Reset form values using the last used query
$('.radioSortBy', page).each(function () {
@ -209,6 +228,7 @@
filtersLoaded = true;
var query = getQuery();
QueryFilters.loadFilters(page, Dashboard.getCurrentUserId(), query, function () {
reloadItems(page);
@ -226,12 +246,14 @@
});
$('.radioSortBy', this).on('click', function () {
var query = getQuery();
query.StartIndex = 0;
query.SortBy = this.getAttribute('data-sortby');
reloadItems(page);
});
$('.radioSortOrder', this).on('click', function () {
var query = getQuery();
query.StartIndex = 0;
query.SortOrder = this.getAttribute('data-sortorder');
reloadItems(page);
@ -239,6 +261,7 @@
$('.chkStandardFilter', this).on('change', function () {
var query = getQuery();
var filterName = this.getAttribute('data-filter');
var filters = query.Filters || "";
@ -258,6 +281,7 @@
view = this.value;
var query = getQuery();
if (view == "Timeline") {
query.SortBy = "PremiereDate";
@ -274,6 +298,7 @@
$('.chkVideoTypeFilter', this).on('change', function () {
var query = getQuery();
var filterName = this.getAttribute('data-filter');
var filters = query.VideoTypes || "";
@ -291,6 +316,7 @@
$('#chk3D', this).on('change', function () {
var query = getQuery();
query.StartIndex = 0;
query.Is3D = this.checked ? true : null;
@ -299,6 +325,7 @@
$('#chkHD', this).on('change', function () {
var query = getQuery();
query.StartIndex = 0;
query.IsHD = this.checked ? true : null;
@ -307,6 +334,7 @@
$('#chkSD', this).on('change', function () {
var query = getQuery();
query.StartIndex = 0;
query.IsHD = this.checked ? false : null;
@ -315,6 +343,7 @@
$('#chkSubtitle', this).on('change', function () {
var query = getQuery();
query.StartIndex = 0;
query.HasSubtitles = this.checked ? true : null;
@ -323,6 +352,7 @@
$('#chkTrailer', this).on('change', function () {
var query = getQuery();
query.StartIndex = 0;
query.HasTrailer = this.checked ? true : null;
@ -331,6 +361,7 @@
$('#chkSpecialFeature', this).on('change', function () {
var query = getQuery();
query.StartIndex = 0;
query.HasSpecialFeature = this.checked ? true : null;
@ -339,6 +370,7 @@
$('#chkThemeSong', this).on('change', function () {
var query = getQuery();
query.StartIndex = 0;
query.HasThemeSong = this.checked ? true : null;
@ -347,6 +379,7 @@
$('#chkThemeVideo', this).on('change', function () {
var query = getQuery();
query.StartIndex = 0;
query.HasThemeVideo = this.checked ? true : null;
@ -355,6 +388,7 @@
$('.alphabetPicker', this).on('alphaselect', function (e, character) {
var query = getQuery();
query.NameStartsWithOrGreater = character;
query.StartIndex = 0;
@ -362,6 +396,7 @@
}).on('alphaclear', function (e) {
var query = getQuery();
query.NameStartsWithOrGreater = '';
reloadItems(page);
@ -394,6 +429,7 @@
});
$('#selectPageSize', page).on('change', function () {
var query = getQuery();
query.Limit = parseInt(this.value);
query.StartIndex = 0;
reloadItems(page);
@ -401,16 +437,9 @@
}).on('pagebeforeshowready', "#moviesPage", function () {
query.ParentId = LibraryMenu.getTopParentId();
var query = getQuery();
var page = this;
var limit = LibraryBrowser.getDefaultPageSize();
// 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();
@ -418,6 +447,7 @@
QueryFilters.onPageShow(page, query);
if (LibraryBrowser.needsRefresh(page)) {
LibraryBrowser.getSavedViewSetting(viewkey).done(function (val) {
if (val) {
@ -426,6 +456,7 @@
reloadItems(page);
}
});
}
updateFilterControls(page);

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

@ -47,8 +47,9 @@
preferThumb: true,
context: 'music',
showItemCounts: true,
lazy: true,
centerText: true,
lazy: true
overlayPlayButton: true
});
}
else if (view == "ThumbCard") {