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

9
dashboard-ui/scripts/playlistedit.js
View file

@ -41,7 +41,7 @@
query.UserId = Dashboard.getCurrentUserId();
ApiClient.getJSON(ApiClient.getUrl('Playlists/' + item.Id + '/Items', query)).done(function (result) {
ApiClient.getJSON(ApiClient.getUrl('Playlists/' + item.Id + '/Items', query)).then(function (result) {
// Scroll back up so they can see the results from the beginning
window.scrollTo(0, 0);
@ -101,6 +101,7 @@
}
ImageLoader.lazyChildren(elem);
$(elem).createCardMenus();
$(elem).off('needsrefresh').on('needsrefresh', function () {
@ -141,11 +142,11 @@
type: 'POST'
}).done(function () {
}).then(function () {
Dashboard.hideLoadingMsg();
}).fail(function () {
}, function () {
Dashboard.hideLoadingMsg();
reloadItems(page, item);
@ -162,7 +163,7 @@
type: 'DELETE'
}).done(function () {
}).then(function () {
reloadItems(page, item);
});