moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-03 08:09:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-54721-master' of git://github.com/FMCorz/moodle

Browse source
This commit is contained in:
David Monllao 2016-05-30 11:15:20 +08:00
commit 571f30b376
4 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/tool/lp/amd/build/user_competency_course_navigation.min.js vendored
View file

@ -1 +1 @@
define(["jquery"],function(a){var b=function(b,c,d,e,f,g){this._baseUrl=d,this._userId=e+"",this._competencyId=f+"",this._courseId=g,a(b).on("change",this._userChanged.bind(this)),a(c).on("change",this._competencyChanged.bind(this))};return b.prototype._userChanged=function(b){var c=a(b.target).val(),d="?userid="+c+"&courseid="+this._courseId+"&competencyid="+this._competencyId;document.location=this._baseUrl+d},b.prototype._competencyChanged=function(b){var c=a(b.target).val(),d="?userid="+this._userId+"&courseid="+this._courseId+"&competencyid="+c;document.location=this._baseUrl+d},b.prototype._competencyId=null,b.prototype._userId=null,b.prototype._courseId=null,b.prototype._baseUrl=null,b.prototype._ignoreFirstUser=null,b.prototype._ignoreFirstCompetency=null,b}); define(["jquery"],function(a){var b=function(b,c,d,e,f,g){this._baseUrl=d,this._userId=e+"",this._competencyId=f+"",this._courseId=g,a(b).on("change",this._userChanged.bind(this)),a(c).on("change",this._competencyChanged.bind(this))};return b.prototype._userChanged=function(b){var c=a(b.target).val(),d="?userid="+c+"&courseid="+this._courseId+"&competencyid="+this._competencyId;document.location=this._baseUrl+d},b.prototype._competencyChanged=function(b){var c=a(b.target).val(),d="?userid="+this._userId+"&courseid="+this._courseId+"&competencyid="+c;document.location=this._baseUrl+d},b.prototype._competencyId=null,b.prototype._userId=null,b.prototype._courseId=null,b.prototype._baseUrl=null,b.prototype._ignoreFirstCompetency=null,b});

2
admin/tool/lp/amd/src/user_competency_course_navigation.js
View file

@ -75,8 +75,6 @@ define(['jquery'], function($) {
UserCompetencyCourseNavigation.prototype._courseId = null; UserCompetencyCourseNavigation.prototype._courseId = null;
/** @type {String} Plugin base url. */ /** @type {String} Plugin base url. */
UserCompetencyCourseNavigation.prototype._baseUrl = null; UserCompetencyCourseNavigation.prototype._baseUrl = null;
/** @type {Boolean} Ignore the first change event for users. */
UserCompetencyCourseNavigation.prototype._ignoreFirstUser = null;
/** @type {Boolean} Ignore the first change event for competencies. */ /** @type {Boolean} Ignore the first change event for competencies. */
UserCompetencyCourseNavigation.prototype._ignoreFirstCompetency = null; UserCompetencyCourseNavigation.prototype._ignoreFirstCompetency = null;

2
report/competency/amd/build/user_course_navigation.min.js vendored
View file

@ -1 +1 @@
define(["jquery"],function(a){var b=function(b,c,d,e){this._baseUrl=c,this._userId=d+"",this._courseId=e,this._ignoreFirstUser=!0,a(b).on("change",this._userChanged.bind(this))};return b.prototype._userChanged=function(b){if(this._ignoreFirstUser)return void(this._ignoreFirstUser=!1);var c=a(b.target).val(),d="?user="+c+"&id="+this._courseId;document.location=this._baseUrl+d},b.prototype._userId=null,b.prototype._courseId=null,b.prototype._baseUrl=null,b.prototype._ignoreFirstUser=null,b}); define(["jquery"],function(a){var b=function(b,c,d,e){this._baseUrl=c,this._userId=d+"",this._courseId=e,a(b).on("change",this._userChanged.bind(this))};return b.prototype._userChanged=function(b){var c=a(b.target).val(),d="?user="+c+"&id="+this._courseId;document.location=this._baseUrl+d},b.prototype._userId=null,b.prototype._courseId=null,b.prototype._baseUrl=null,b});

8
report/competency/amd/src/user_course_navigation.js
View file

@ -35,7 +35,6 @@ define(['jquery'], function($) {
this._baseUrl = baseUrl; this._baseUrl = baseUrl;
this._userId = userId + ''; this._userId = userId + '';
this._courseId = courseId; this._courseId = courseId;
this._ignoreFirstUser = true;
$(userSelector).on('change', this._userChanged.bind(this)); $(userSelector).on('change', this._userChanged.bind(this));
}; };
@ -47,11 +46,6 @@ define(['jquery'], function($) {
* @param {Event} e * @param {Event} e
*/ */
UserCourseNavigation.prototype._userChanged = function(e) { UserCourseNavigation.prototype._userChanged = function(e) {
if (this._ignoreFirstUser) {
this._ignoreFirstUser = false;
return;
}
var newUserId = $(e.target).val(); var newUserId = $(e.target).val();
var queryStr = '?user=' + newUserId + '&id=' + this._courseId; var queryStr = '?user=' + newUserId + '&id=' + this._courseId;
document.location = this._baseUrl + queryStr; document.location = this._baseUrl + queryStr;
@ -63,8 +57,6 @@ define(['jquery'], function($) {
UserCourseNavigation.prototype._courseId = null; UserCourseNavigation.prototype._courseId = null;
/** @type {String} Plugin base url. */ /** @type {String} Plugin base url. */
UserCourseNavigation.prototype._baseUrl = null; UserCourseNavigation.prototype._baseUrl = null;
/** @type {Boolean} Ignore the first change event for users. */
UserCourseNavigation.prototype._ignoreFirstUser = null;
return /** @alias module:report_competency/user_course_navigation */ UserCourseNavigation; return /** @alias module:report_competency/user_course_navigation */ UserCourseNavigation;