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

11
dashboard-ui/scripts/livetvrecordings.js
View file

@ -86,7 +86,7 @@
userId: Dashboard.getCurrentUserId(),
IsInProgress: true
}).done(function (result) {
}).then(function (result) {
renderRecordings(page.querySelector('#activeRecordings'), result.Items);
@ -98,7 +98,7 @@
limit: 12,
IsInProgress: false
}).done(function (result) {
}).then(function (result) {
renderRecordings(page.querySelector('#latestRecordings'), result.Items);
});
@ -107,10 +107,11 @@
userId: Dashboard.getCurrentUserId()
}).done(function (result) {
renderRecordingGroups(page, result.Items);
}).then(function (result) {
require(['paper-fab', 'paper-item-body', 'paper-icon-item'], function () {
renderRecordingGroups(page, result.Items);
});
});
}