milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge from dev

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-14 10:43:03 -05:00
parent 1c8f02ce0f
commit 33b01d778c
911 changed files with 34157 additions and 57125 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -47,7 +47,7 @@
var query = getQuery();
var view = getPageData().view;
ApiClient.getItems(userId, query).done(function (result) {
ApiClient.getItems(userId, query).then(function (result) {
// Scroll back up so they can see the results from the beginning
window.scrollTo(0, 0);
@ -167,7 +167,7 @@
$('.btnChangeLayout', page).on('layoutchange', function (e, layout) {
if (layout == 'Timeline') {
getQuery().SortBy = 'PremiereDate,SortName';
getQuery().SortBy = 'ProductionYear,PremiereDate,SortName';
getQuery().SortOrder = 'Descending';
}