Skip to content

Commit

Permalink
Merge branch 'MDL-60753_master' of git://github.com/markn86/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
snake committed Nov 9, 2017
2 parents 7a571b8 + d48d1ba commit 4f3262f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion report/competency/amd/build/grading_popup.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions report/competency/amd/src/grading_popup.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ define(['jquery', 'core/notification', 'core/str', 'core/ajax', 'core/log', 'cor
args: {userid: userId, competencyid: competencyId, courseid: courseId},
}]);

$.when.apply($, requests).then(function() {
this._contextLoaded.bind(this);
$.when.apply($, requests).then(function(context) {
this._contextLoaded.bind(this)(context);
return;
}).catch(notification.exception);
}.bind(this)).catch(notification.exception);
};

/**
Expand Down

0 comments on commit 4f3262f

Please sign in to comment.