mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 12:45:04 +01:00
Code Issues Projects Releases Wiki Activity

MDL-55947 core_message: fixed order of notifications in popover

Browse Source
This commit is contained in:
Mark Nelson 2016-09-13 13:18:27 +08:00
parent 89a70ba1a5
commit 30aac24d7a
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
message/amd/src/notification_popover_controller.js
View File

@ -293,6 +293,8 @@ define(['jquery', 'theme_bootstrapbase/bootstrap', 'core/ajax', 'core/templates'
*/
NotificationPopoverController.prototype.renderNotifications = function(notifications, container) {
var promises = [];
var allhtml = [];
var alljs = [];
if (notifications.length) {
$.each(notifications, function(index, notification) {
@ -307,16 +309,23 @@ define(['jquery', 'theme_bootstrapbase/bootstrap', 'core/ajax', 'core/templates'
}
var promise = Templates.render('message/notification_content_item', notification);
promise.then(function(html, js) {
container.append(html);
Templates.runTemplateJS(js);
}.bind(this));
promises.push(promise);
promise.then(function(html, js) {
allhtml[index] = html;
alljs[index] = js;
}.bind(this));
}.bind(this));
}
return $.when.apply($.when, promises);
return $.when.apply($.when, promises).then(function() {
if (notifications.length) {
$.each(notifications, function(index) {
container.append(allhtml[index]);
Templates.runTemplateJS(alljs[index]);
});
}
});
};
/**