mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 12:32:08 +02:00
Code Issues Projects Releases Wiki Activity

MDL-57139 myoverview: Use promise best practices

Browse Source 
Simplified promise
* Always return
* Make use of promise chaining features to simplfy flow
This commit is contained in:
Dan Poltawski 2017-06-01 12:37:15 +01:00
parent 08c2360e4a
commit 72ed079f60
1 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
blocks/myoverview/amd/src/event_list.js
View File

@ -350,34 +350,37 @@ define(['jquery', 'core/notification', 'core/templates',
// Request data from the server.
return promise.then(function(result) {
return result.events;
}).then(function(calendarEvents) {
if (!calendarEvents.length || (calendarEvents.length < limit)) {
// We have no more events so mark the list as done.
if (!result.events.length) {
// No events, nothing to do.
setLoadedAll(root);
return 0;
}
var calendarEvents = result.events;
// Remember the last id we've seen.
root.attr('data-last-id', calendarEvents[calendarEvents.length - 1].id);
if (calendarEvents.length <= limit) {
// No more events to load, disable loading button.
setLoadedAll(root);
}
if (calendarEvents.length) {
// Remember the last id we've seen.
root.attr('data-last-id', calendarEvents[calendarEvents.length - 1].id);
// Render the events.
return render(root, calendarEvents).then(function(renderCount) {
updateContentVisibility(root, calendarEvents.length);
if (renderCount < calendarEvents.length) {
// if the number of events that was rendered is less than
// the number we sent for rendering we can assume that there
// are no groups to add them in. Since the ordering of the
// events is guaranteed it means that any future requests will
// also yield events that can't be rendered, so let's not bother
// sending any more requests.
setLoadedAll(root);
}
});
} else {
updateContentVisibility(root, calendarEvents.length);
}
// Render the events.
return render(root, calendarEvents).then(function(renderCount) {
if (renderCount < calendarEvents.length) {
// if the number of events that was rendered is less than
// the number we sent for rendering we can assume that there
// are no groups to add them in. Since the ordering of the
// events is guaranteed it means that any future requests will
// also yield events that can't be rendered, so let's not bother
// sending any more requests.
setLoadedAll(root);
}
return calendarEvents.length;
});
}).then(function(eventCount) {
return updateContentVisibility(root, eventCount);
}).fail(
Notification.exception
).always(function() {