diff --git a/grade/report/history/lib.php b/grade/report/history/lib.php
index 46e5c1c7884..95debcc040d 100644
--- a/grade/report/history/lib.php
+++ b/grade/report/history/lib.php
@@ -660,7 +660,7 @@ class grade_report_history extends grade_report {
         $modules = array('moodle-gradereport_history-userselector');
         $arguments = array(
             'courseid'            => $courseid,
-            'ajaxurl'             => '/grade/report/history/ajax.php',
+            'ajaxurl'             => '/grade/report/history/users_ajax.php',
             'url'                 => $PAGE->url->out(false),
             'userfullnames'       => $currentusers,
         );
diff --git a/grade/report/history/styles.css b/grade/report/history/styles.css
index 0691010327e..4097dcfd3b2 100644
--- a/grade/report/history/styles.css
+++ b/grade/report/history/styles.css
@@ -23,7 +23,9 @@ table#gradestable th.header.selected {
 }
 
 /* User Selector */
-.yui3-gradereport_history_usp-hidden {display:none;}
+.yui3-gradereport_history_usp-hidden {
+    display:none;
+}
 
 .gradereport_history_usp .usp-content {
     position: relative;
diff --git a/grade/report/history/ajax.php b/grade/report/history/users_ajax.php
similarity index 94%
rename from grade/report/history/ajax.php
rename to grade/report/history/users_ajax.php
index a92e2f322a3..d23a23d0b53 100644
--- a/grade/report/history/ajax.php
+++ b/grade/report/history/users_ajax.php
@@ -26,7 +26,7 @@
 define('AJAX_SCRIPT', true);
 
 require_once(__DIR__ . '/../../../config.php');
-require_once($CFG->dirroot.'/grade/report/history/lib.php');
+require_once($CFG->dirroot . '/grade/report/history/lib.php');
 
 $id = required_param('id', PARAM_INT); // Course id.
 $search = optional_param('search', '', PARAM_RAW);
@@ -42,10 +42,6 @@ if ($course->id == SITEID) {
 require_sesskey();
 require_login($course);
 
-$PAGE->set_context($context);
-
-echo $OUTPUT->header();
-
 $outcome = new stdClass();
 $outcome->success = true;
 $outcome->response = new stdClass();
@@ -78,5 +74,3 @@ $outcome->response['users'] = array_values($outcome->response['users']);
 $outcome->success = true;
 
 echo json_encode($outcome);
-
-echo $OUTPUT->footer();
diff --git a/grade/report/history/yui/build/moodle-gradereport_history-userselector/moodle-gradereport_history-userselector-debug.js b/grade/report/history/yui/build/moodle-gradereport_history-userselector/moodle-gradereport_history-userselector-debug.js
index ccaeb056e9f..85e6d814e2b 100644
--- a/grade/report/history/yui/build/moodle-gradereport_history-userselector/moodle-gradereport_history-userselector-debug.js
+++ b/grade/report/history/yui/build/moodle-gradereport_history-userselector/moodle-gradereport_history-userselector-debug.js
@@ -31,49 +31,49 @@ YUI.add('moodle-gradereport_history-userselector', function (Y, NAME) {
 
 var COMPONENT = 'gradereport_history';
 var USP = {
-    AJAXURL : 'ajaxurl',
-    BASE : 'base',
-    CHECKBOX_NAME_PREFIX : 'usp-u',
-    COURSEID : 'courseid',
-    DIALOGUE_PREFIX : 'moodle-dialogue',
-    NAME : 'gradereport_history_usp',
-    PAGE : 'page',
-    PARAMS : 'params',
-    PERPAGE : 'perPage',
-    SEARCH : 'search',
-    SEARCHBTN : 'searchbtn',
-    SELECTEDUSERS : 'selectedusers',
-    URL : 'url',
-    USERCOUNT : 'userCount',
-    USERFULLNAMES : 'userfullnames'
+    AJAXURL: 'ajaxurl',
+    BASE: 'base',
+    CHECKBOX_NAME_PREFIX: 'usp-u',
+    COURSEID: 'courseid',
+    DIALOGUE_PREFIX: 'moodle-dialogue',
+    NAME: 'gradereport_history_usp',
+    PAGE: 'page',
+    PARAMS: 'params',
+    PERPAGE: 'perPage',
+    SEARCH: 'search',
+    SEARCHBTN: 'searchbtn',
+    SELECTEDUSERS: 'selectedusers',
+    URL: 'url',
+    USERCOUNT: 'userCount',
+    USERFULLNAMES: 'userfullnames'
 };
 var CSS = {
-    ACCESSHIDE : 'accesshide',
-    AJAXCONTENT : 'usp-ajax-content',
-    CHECKBOX : 'usp-checkbox',
-    CLOSE : 'close',
-    CLOSEBTN : 'usp-finish',
-    CONTENT : 'usp-content',
-    DETAILS : 'details',
-    EXTRAFIELDS : 'extrafields',
-    FIRSTADDED : 'usp-first-added',
-    FULLNAME : 'fullname',
-    HEADER : 'usp-header',
-    HIDDEN : 'hidden',
-    LIGHTBOX : 'usp-loading-lightbox',
-    LOADINGICON : 'loading-icon',
-    MORERESULTS : 'usp-more-results',
-    OPTIONS : 'options',
-    PICTURE : 'usp-picture',
-    RESULTSCOUNT : 'usp-results-count',
-    SEARCH : 'usp-search',
-    SEARCHBTN : 'usp-search-btn',
-    SEARCHFIELD : 'usp-search-field',
-    SEARCHRESULTS : 'usp-search-results',
-    SELECTED : 'selected',
-    USER : 'usp-user',
-    USERS : 'usp-users',
-    WRAP : 'usp-wrap'
+    ACCESSHIDE: 'accesshide',
+    AJAXCONTENT: 'usp-ajax-content',
+    CHECKBOX: 'usp-checkbox',
+    CLOSE: 'close',
+    CLOSEBTN: 'usp-finish',
+    CONTENT: 'usp-content',
+    DETAILS: 'details',
+    EXTRAFIELDS: 'extrafields',
+    FIRSTADDED: 'usp-first-added',
+    FULLNAME: 'fullname',
+    HEADER: 'usp-header',
+    HIDDEN: 'hidden',
+    LIGHTBOX: 'usp-loading-lightbox',
+    LOADINGICON: 'loading-icon',
+    MORERESULTS: 'usp-more-results',
+    OPTIONS: 'options',
+    PICTURE: 'usp-picture',
+    RESULTSCOUNT: 'usp-results-count',
+    SEARCH: 'usp-search',
+    SEARCHBTN: 'usp-search-btn',
+    SEARCHFIELD: 'usp-search-field',
+    SEARCHRESULTS: 'usp-search-results',
+    SELECTED: 'selected',
+    USER: 'usp-user',
+    USERS: 'usp-users',
+    WRAP: 'usp-wrap'
 };
 var SELECTORS = {
     AJAXCONTENT: '.' + CSS.AJAXCONTENT,
@@ -114,7 +114,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      * Whether or not this is the first time the user displays the dialogue within that request.
      *
      * @property _firstDisplay
-     * @type {Boolean}
+     * @type Boolean
      * @private
      */
     _firstDisplay: true,
@@ -122,7 +122,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
     /**
      * The list of all the users selected while the dialogue is open.
      *
-     * @type {Object}
+     * @type Object
      * @property _usersBufferList
      * @private
      */
@@ -144,9 +144,9 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      * @type Function
      * @private
      */
-    _userTemplate : null,
+    _userTemplate: null,
 
-    initializer : function() {
+    initializer: function() {
         var bb = this.get('boundingBox'),
             content,
             params,
@@ -222,7 +222,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      *
      * @method show
      */
-    show : function(e) {
+    show: function(e) {
         var bb;
         this._usersBufferList = {};
         if (this._firstDisplay) {
@@ -250,17 +250,18 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
             // Reset the tab focus.
             this.setUserTabFocus(bb.one(SELECTORS.USER));
         }
-        Y.namespace('M.gradereport_history.UserSelector').superclass.show.call(this);
+        return Y.namespace('M.gradereport_history.UserSelector').superclass.show.call(this);
     },
 
     /**
      * Search for users.
      *
      * @method search
+     * @param {EventFacade} e The event.
+     * @param {Boolean} append Whether we want to append the results to the current results or not.
      */
-    search : function(e, append) {
+    search: function(e, append) {
         if (e) {
-            e.halt();
             e.preventDefault();
         }
         var params;
@@ -277,13 +278,13 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
         params.page = this.get(USP.PAGE);
         params.perpage = this.get(USP.PERPAGE);
 
-        Y.io(M.cfg.wwwroot+this.get(USP.AJAXURL), {
+        Y.io(M.cfg.wwwroot + this.get(USP.AJAXURL), {
             method:'POST',
             data:build_querystring(params),
-            on : {
-                start : this.preSearch,
+            on: {
+                start: this.preSearch,
                 complete: this.processSearchResults,
-                end : this.postSearch
+                end: this.postSearch
             },
             context:this,
             "arguments": {      // Quoted because this is a reserved keyword.
@@ -296,7 +297,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      * Pre search callback.
      *
      * @method preSearch
-     * @param {Mixed} unused Not sure what that is.
+     * @param {String} transactionId The transaction ID.
      * @param {Object} args The arguments passed from YUI.io()
      */
     preSearch: function(unused, args) {
@@ -307,7 +308,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
 
         // Set the number of results to 'loading...'.
         if (!args.append) {
-            bb.one(SELECTORS.RESULTSCOUNT).setContent(M.util.get_string('loading', 'admin'));
+            bb.one(SELECTORS.RESULTSCOUNT).setHTML(M.util.get_string('loading', 'admin'));
         }
     },
 
@@ -315,10 +316,10 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      * Post search callback.
      *
      * @method postSearch
-     * @param {Mixed} unused Not sure what that is.
+     * @param {String} transactionId The transaction ID.
      * @param {Object} args The arguments passed from YUI.io()
      */
-    postSearch: function(unused, args) {
+    postSearch: function(transactionId, args) {
         var bb = this.get('boundingBox'),
             firstAdded = bb.one(SELECTORS.FIRSTADDED),
             firstUser;
@@ -326,11 +327,12 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
         // Hide the lightbox.
         bb.one(SELECTORS.LIGHTBOX).addClass(CSS.HIDDEN);
 
-        // Sets the focus on the newly added user if we are appending results.
         if (args.append && firstAdded) {
+            // Sets the focus on the newly added user if we are appending results.
             this.setUserTabFocus(firstAdded);
             firstAdded.one(SELECTORS.USERSELECT).focus();
         } else {
+            // New search result, set the tab focus on the first user returned.
             firstUser = bb.one(SELECTORS.USER);
             if (firstUser) {
                 this.setUserTabFocus(firstUser);
@@ -342,8 +344,11 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      * Process and display the search results.
      *
      * @method processSearchResults
+     * @param {String} tid The transaction ID.
+     * @param {Object} outcome The response object.
+     * @param {Object} args The arguments passed from YUI.io().
      */
-    processSearchResults : function(tid, outcome, args) {
+    processSearchResults: function(tid, outcome, args) {
         var result = false,
             error = false,
             bb = this.get('boundingBox'),
@@ -371,7 +376,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
         // There was an error.
         if (error) {
             this.setContent('');
-            bb.one(SELECTORS.RESULTSCOUNT).setContent(M.util.get_string('errajaxsearch', COMPONENT));
+            bb.one(SELECTORS.RESULTSCOUNT).setHTML(M.util.get_string('errajaxsearch', COMPONENT));
             return;
         }
 
@@ -446,13 +451,13 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
         totalUsers = parseInt(result.response.totalusers, 10);
         if (!args.append) {
             if (totalUsers === 0) {
-                bb.one(SELECTORS.RESULTSCOUNT).setContent(M.util.get_string('noresults', 'moodle'));
+                bb.one(SELECTORS.RESULTSCOUNT).setHTML(M.util.get_string('noresults', 'moodle'));
                 content = '';
             } else {
                 if (totalUsers === 1) {
-                    bb.one(SELECTORS.RESULTSCOUNT).setContent(M.util.get_string('foundoneuser', COMPONENT));
+                    bb.one(SELECTORS.RESULTSCOUNT).setHTML(M.util.get_string('foundoneuser', COMPONENT));
                 } else {
-                    bb.one(SELECTORS.RESULTSCOUNT).setContent(M.util.get_string('foundnusers', COMPONENT, totalUsers));
+                    bb.one(SELECTORS.RESULTSCOUNT).setHTML(M.util.get_string('foundnusers', COMPONENT, totalUsers));
                 }
 
                 content = create('<div class="'+CSS.SEARCHRESULTS+'"></div>')
@@ -473,15 +478,6 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
         }
     },
 
-    /**
-     * Fetch more results.
-     *
-     * @param {EventFacade} e The event.
-     */
-    fetchMore: function(e) {
-        this.search(e, true);
-    },
-
     /**
      * When the user has finished selecting users.
      *
@@ -498,13 +494,13 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      * Apply the selection made.
      *
      * @method applySelection
-     * @return Void
+     * @param {EventFacade} e The event.
      */
     applySelection: function(e) {
         var userIds = Y.Object.values(this._usersBufferList);
-        this.set(USP.SELECTEDUSERS, userIds);
-        this.set(USP.USERFULLNAMES, this._usersBufferList);
-        this.setnamedisplay();
+        this.set(USP.SELECTEDUSERS, userIds)
+            .set(USP.USERFULLNAMES, this._usersBufferList)
+            .setNameDisplay();
         Y.one(SELECTORS.USERIDS).set('value', userIds.join());
     },
 
@@ -528,7 +524,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      * @method SelectUser
      * @param {EventFacade} e The event.
      */
-    selectUser : function(e) {
+    selectUser: function(e) {
         var user = e.currentTarget.ancestor(SELECTORS.USER),
             checkbox = user.one(SELECTORS.USERSELECT),
             fullname = user.one(SELECTORS.FULLNAME).get('innerHTML'),
@@ -546,7 +542,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
         } else {
             // De-selecting the user.
             delete this._usersBufferList[userId];
-            delete this._usersBufferList[parseInt(userId, 10)]; // Also remove number'd keys.
+            delete this._usersBufferList[parseInt(userId, 10)]; // Also remove numbered keys.
         }
 
         this.markUserNode(user, checked);
@@ -560,17 +556,21 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      *
      * @param {Node} node The user node.
      * @param {Boolean} selected True to mark as selected.
+     * @chainable
      */
     markUserNode: function(node, selected) {
         if (selected) {
-            node.addClass(CSS.SELECTED);
-            node.set('aria-selected', 'true');
-            node.one(SELECTORS.USERSELECT).set('checked', true);
+            node.addClass(CSS.SELECTED)
+                .set('aria-selected', true)
+                .one(SELECTORS.USERSELECT)
+                    .set('checked', true);
         } else {
-            node.removeClass(CSS.SELECTED);
-            node.set('aria-selected', 'false');
-            node.one(SELECTORS.USERSELECT).set('checked', false);
+            node.removeClass(CSS.SELECTED)
+                .set('aria-selected', false)
+                .one(SELECTORS.USERSELECT)
+                    .set('checked', false);
         }
+        return this;
     },
 
     /**
@@ -578,17 +578,19 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      *
      * @method setContent
      * @param {String} content The content.
+     * @chainable
      */
     setContent: function(content) {
-        this.get('boundingBox').one(SELECTORS.AJAXCONTENT).setContent(content);
+        this.get('boundingBox').one(SELECTORS.AJAXCONTENT).setHTML(content);
+        return this;
     },
 
     /**
      * Display the names of the selected users in the form.
      *
-     * @method setnamedisplay
+     * @method setNameDisplay
      */
-    setnamedisplay: function() {
+    setNameDisplay: function() {
         var namelist = Y.Object.values(this.get(USP.USERFULLNAMES));
         Y.one(SELECTORS.SELECTEDNAMES).set('innerHTML', namelist.join(', '));
         Y.one(SELECTORS.USERFULLNAMES).set('value', namelist.join());
@@ -600,8 +602,6 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      * @method userKeyboardNavigation
      */
     userKeyboardNavigation: function(e) {
-        e.preventDefault();
-
         var bb = this.get('boundingBox'),
             users = bb.all(SELECTORS.USER),
             direction = 1,
@@ -614,6 +614,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
 
         user = this.findFocusableUser(users, current, direction);
         if (user) {
+            e.preventDefault();
             user.one(SELECTORS.USERSELECT).focus();
             this.setUserTabFocus(user);
         }
@@ -625,8 +626,8 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      * @param {NodeList} users The list of users.
      * @param {Node} user The user to start with.
      * @param {Number} direction The direction in which to go.
-     * @return {Node} A user node.
-     * @method findNextFocusableUser
+     * @return {Node|null} A user node, or null if not found.
+     * @method findFocusableUser
      */
     findFocusableUser: function(users, user, direction) {
         var index = users.indexOf(user);
@@ -671,146 +672,127 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
     }
 
 }, {
-    NAME : USP.NAME,
-    CSS_PREFIX : USP.CSS_PREFIX,
-    ATTRS : {
-
-        /**
-         * List of extra classes.
-         *
-         * @attribute extraClasses
-         * @type Array
-         */
-        extraClasses: {
-            value: [
-                'gradereport_history_usp'
-            ]
-        },
+    NAME: USP.NAME,
+    CSS_PREFIX: USP.CSS_PREFIX,
+    ATTRS: {
 
         /**
          * The header.
          *
          * @attribute title
+         * @default selectusers language string.
          * @type String
          */
         title: {
             validator: Y.Lang.isString,
-            value: M.util.get_string('selectusers', COMPONENT)
-        },
-
-        /**
-         * Whether to focus on the target that caused the Widget to be shown.
-         *
-         * @attribute focusOnPreviousTargetAfterHide
-         * @type Node
-         */
-        focusOnPreviousTargetAfterHide: {
-            value: true
-        },
-
-        /**
-         *
-         * Width.
-         *
-         * @attribute width
-         * @type {String|Number}
-         */
-        width: {
-            value: '500px'
+            valueFn: function() {
+                return M.util.get_string('selectusers', COMPONENT);
+            }
         },
 
         /**
          * The current page URL.
          *
          * @attribute url
+         * @default null
          * @type String
          */
-        url : {
-            validator : Y.Lang.isString
+        url: {
+            validator: Y.Lang.isString,
+            value: null
         },
 
         /**
          * The URL to the Ajax file.
          *
          * @attribute ajaxurl
+         * @default null
          * @type String
          */
-        ajaxurl : {
-            validator : Y.Lang.isString
+        ajaxurl: {
+            validator: Y.Lang.isString,
+            value: null
         },
 
         /**
          * IDs of the selected users.
          *
          * @attribute selectedusers
+         * @default null
          * @type Array
          */
-        selectedusers : {
-            validator : Y.Lang.isArray,
-            value : null
+        selectedusers: {
+            validator: Y.Lang.isArray,
+            value: null
         },
 
         /**
          * The names of the selected users.
          *
          * @attribute userfullnames
+         * @default null
          * @type Object
          */
-        userfullnames : {
-            validator : Y.Lang.isObject,
-            value : null
+        userfullnames: {
+            validator: Y.Lang.isObject,
+            value: null
         },
 
         /**
          * The course ID.
          *
          * @attribute courseid
+         * @default null
          * @type Number
          */
-        courseid : {
-            value : null
+        courseid: {
+            value: null
         },
 
         /**
          * Array of parameters.
          *
          * @attribute params
+         * @default []
          * @type Array
          */
-        params : {
-            validator : Y.Lang.isArray,
-            value : []
+        params: {
+            validator: Y.Lang.isArray,
+            value: []
         },
 
         /**
          * The page we are on.
          *
          * @attribute page
+         * @default 0
          * @type Number
          */
-        page : {
-            validator : Y.Lang.isNumber,
-            value : 0
+        page: {
+            validator: Y.Lang.isNumber,
+            value: 0
         },
 
         /**
          * The number of users displayed.
          *
          * @attribute userCount
+         * @default 0
          * @type Number
          */
-        userCount : {
-            value : 0,
-            validator : Y.Lang.isNumber
+        userCount: {
+            value: 0,
+            validator: Y.Lang.isNumber
         },
 
         /**
          * The number of results per page.
          *
          * @attribute perPage
+         * @default 25
          * @type Number
          */
-        perPage : {
+        perPage: {
             value: 25,
             Validator: Y.Lang.isNumber
         }
@@ -820,11 +802,47 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
 
 Y.Base.modifyAttrs(Y.namespace('M.gradereport_history.UserSelector'), {
 
+    /**
+     * List of extra classes.
+     *
+     * @attribute extraClasses
+     * @default ['gradereport_history_usp']
+     * @type Array
+     */
+    extraClasses: {
+        value: [
+            'gradereport_history_usp'
+        ]
+    },
+
+    /**
+     * Whether to focus on the target that caused the Widget to be shown.
+     *
+     * @attribute focusOnPreviousTargetAfterHide
+     * @default true
+     * @type Node
+     */
+    focusOnPreviousTargetAfterHide: {
+        value: true
+    },
+
+    /**
+     *
+     * Width.
+     *
+     * @attribute width
+     * @default '500px'
+     * @type String|Number
+     */
+    width: {
+        value: '500px'
+    },
+
     /**
      * Boolean indicating whether or not the Widget is visible.
      *
      * @attribute visible
-     * @default true
+     * @default false
      * @type Boolean
      */
     visible: {
diff --git a/grade/report/history/yui/build/moodle-gradereport_history-userselector/moodle-gradereport_history-userselector-min.js b/grade/report/history/yui/build/moodle-gradereport_history-userselector/moodle-gradereport_history-userselector-min.js
index 73fa4c4ca76..defff24c559 100644
--- a/grade/report/history/yui/build/moodle-gradereport_history-userselector/moodle-gradereport_history-userselector-min.js
+++ b/grade/report/history/yui/build/moodle-gradereport_history-userselector/moodle-gradereport_history-userselector-min.js
@@ -1,2 +1,2 @@
-YUI.add("moodle-gradereport_history-userselector",function(e,t){var n="gradereport_history",r={AJAXURL:"ajaxurl",BASE:"base",CHECKBOX_NAME_PREFIX:"usp-u",COURSEID:"courseid",DIALOGUE_PREFIX:"moodle-dialogue",NAME:"gradereport_history_usp",PAGE:"page",PARAMS:"params",PERPAGE:"perPage",SEARCH:"search",SEARCHBTN:"searchbtn",SELECTEDUSERS:"selectedusers",URL:"url",USERCOUNT:"userCount",USERFULLNAMES:"userfullnames"},i={ACCESSHIDE:"accesshide",AJAXCONTENT:"usp-ajax-content",CHECKBOX:"usp-checkbox",CLOSE:"close",CLOSEBTN:"usp-finish",CONTENT:"usp-content",DETAILS:"details",EXTRAFIELDS:"extrafields",FIRSTADDED:"usp-first-added",FULLNAME:"fullname",HEADER:"usp-header",HIDDEN:"hidden",LIGHTBOX:"usp-loading-lightbox",LOADINGICON:"loading-icon",MORERESULTS:"usp-more-results",OPTIONS:"options",PICTURE:"usp-picture",RESULTSCOUNT:"usp-results-count",SEARCH:"usp-search",SEARCHBTN:"usp-search-btn",SEARCHFIELD:"usp-search-field",SEARCHRESULTS:"usp-search-results",SELECTED:"selected",USER:"usp-user",USERS:"usp-users",WRAP:"usp-wrap"},s={AJAXCONTENT:"."+i.AJAXCONTENT,FINISHBTN:"."+i.CLOSEBTN+" input",FIRSTADDED:"."+i.FIRSTADDED,FULLNAME:"."+i.FULLNAME+" label",LIGHTBOX:"."+i.LIGHTBOX,MORERESULTS:"."+i.MORERESULTS,OPTIONS:"."+i.OPTIONS,PICTURE:"."+i.USER+" .userpicture",RESULTSCOUNT:"."+i.RESULTSCOUNT,RESULTSUSERS:"."+i.SEARCHRESULTS+" ."+i.USERS,SEARCHBTN:"."+i.SEARCHBTN,SEARCHFIELD:"."+i.SEARCHFIELD,SELECTEDNAMES:".felement .selectednames",TRIGGER:".gradereport_history_plugin input.selectortrigger",USER:"."+i.USER,USERFULLNAMES:'input[name="userfullnames"]',USERIDS:'input[name="userids"]',USERSELECT:"."+i.CHECKBOX+" input[type=checkbox]"},o=e.Node.create,u=function(){u.superclass.constructor.apply(this,arguments)};e.namespace("M.gradereport_history").UserSelector=e.extend(u,M.core.dialogue,{_firstDisplay:!0,_usersBufferList:null,_userTabFocus:null,_userTemplate:null,initializer:function(){var t=this.get("boundingBox"),u,a,f;f=e.Handlebars.compile('<div class="{{CSS.WRAP}}"><div class="{{CSS.HEADER}}"><div class="{{CSS.SEARCH}}" role="search"><form><input type="text" class="{{CSS.SEARCHFIELD}}" aria-label="{{get_string "search" "moodle"}}" value="" /><input type="submit" class="{{CSS.SEARCHBTN}}"value="{{get_string "search" "moodle"}}"></form><div aria-live="polite" class="{{CSS.RESULTSCOUNT}}">{{get_string "loading" "admin"}}</div></div></div><div class="{{CSS.CONTENT}}"><form><div class="{{CSS.AJAXCONTENT}}" aria-live="polite"></div><div class="{{CSS.LIGHTBOX}} {{CSS.HIDDEN}}"><img class="{{CSS.LOADINGICON}}" alt="{{get_string "loading" "admin"}}"src="{{{loadingIcon}}}"></div><div class="{{CSS.CLOSEBTN}}"><input type="submit" value="{{get_string "finishselectingusers" COMPONENT}}"></div></form></div></div>'),u=o(f({COMPONENT:n,CSS:i,loadingIcon:M.util.image_url("i/loading","moodle")})),this.getStdModNode(e.WidgetStdMod.HEADER).prepend(o("<h1>"+this.get("title")+"</h1>")),this.setStdModContent(e.WidgetStdMod.BODY,u,e.WidgetStdMod.REPLACE),this.get("boundingBox").one(".moodle-dialogue-wrap").addClass("moodle-dialogue-content"),this.loadUsersFromForm(),e.one(s.TRIGGER).on("click",this.show,this),t.one(s.FINISHBTN).on("click",this.finishSelectingUsers,this),t.delegate("key",this.userKeyboardNavigation,"down:38,40",s.AJAXCONTENT,this),e.delegate("click",this.selectUser,s.AJAXCONTENT,s.USERSELECT,this),e.delegate("click",this.selectUser,s.AJAXCONTENT,s.PICTURE,this),a=this.get(r.PARAMS),a.id=this.get(r.COURSEID),this.set(r.PARAMS,a),t.one(s.SEARCHBTN).on("click",this.search,this,!1)},show:function(t){var n;this._usersBufferList={},this._firstDisplay?(this._firstDisplay=!1,this.search(t,!1)):(this._usersBufferList=e.clone(this.get(r.USERFULLNAMES)),n=this.get("boundingBox"),n.all(s.USER).each(function(e){this.markUserNode(e,!1)},this),e.Object.each(this._usersBufferList,function(e,t){var r=n.one(s.USER+'[data-userid="'+t+'"]');r&&this.markUserNode(r,!0)},this),this.setUserTabFocus(n.one(s.USER))),e.namespace("M.gradereport_history.UserSelector").superclass.show.call(this)},search:function(t,n){t&&(t.halt(),t.preventDefault());var i;n?this.set(r.PAGE,this.get(r.PAGE)+1):(this.set(r.USERCOUNT,0),this.set(r.PAGE,0)),i=this.get(r.PARAMS),i.sesskey=M.cfg.sesskey,i.action="searchusers",i.search=this.get("boundingBox").one(s.SEARCHFIELD).get("value"),i.page=this.get(r.PAGE),i.perpage=this.get(r.PERPAGE),e.io(M.cfg.wwwroot+this.get(r.AJAXURL),{method:"POST",data:build_querystring(i),on:{start:this.preSearch,complete:this.processSearchResults,end:this.postSearch},context:this,arguments:{append:n}})},preSearch:function(e,t){var n=this.get("boundingBox");n.one(s.LIGHTBOX).removeClass(i.HIDDEN),t.append||n.one(s.RESULTSCOUNT).setContent(M.util.get_string("loading","admin"))},postSearch:function(e,t){var n=this.get("boundingBox"),r=n.one(s.FIRSTADDED),o;n.one(s.LIGHTBOX).addClass(i.HIDDEN),t.append&&r?(this.setUserTabFocus(r),r.one(s.USERSELECT).focus()):(o=n.one(s.USER),o&&this.setUserTabFocus(o))},processSearchResults:function(t,u,a){var f=!1,l=!1,c=this.get("boundingBox"),h,p,d,v,m,g=!0,y,b,w,E;try{f=e.JSON.parse(u.responseText);if(!f.success||f.error)l=!0}catch(S){l=!0}if(l){this.setContent(""),c.one(s.RESULTSCOUNT).setContent(M.util.get_string("errajaxsearch",n));return}a.append?h=c.one(s.RESULTSUSERS):h=o('<div role="listbox" aria-activedescendant="" aria-multiselectable="true" class="'+i.USERS+'"></div>'),this._userTemplate||(this._userTemplate=e.Handlebars.compile('<div role="option" aria-selected="false" class="{{CSS.USER}} clearfix" data-userid="{{userId}}"><div class="{{CSS.CHECKBOX}}"><input name="{{USP.CHECKBOX_NAME_PREFIX}}{{userId}}" type="checkbox" tabindex="-1"id="{{checkboxId}}" aria-describedby="{{checkboxId}} {{extraFieldsId}}"/></div><div class="{{CSS.PICTURE}}">{{{picture}}}</div><div class="{{CSS.DETAILS}}"><div class="{{CSS.FULLNAME}}"><label for="{{checkboxId}}">{{fullname}}</label></div><div id="{{extraFieldsId}}" class="{{CSS.EXTRAFIELDS}}">{{extrafields}}</div></div></div>')),p=this._userTemplate,
-d=this.get(r.USERCOUNT),v="";for(m in f.response.users)d++,user=f.response.users[m],e.Object.hasKey(this._usersBufferList,user.userid)?v=!0:v=!1,y=o(p({checkboxId:e.guid(),COMPONENT:n,count:d,CSS:i,extrafields:user.extrafields,extraFieldsId:e.guid(),fullname:user.fullname,picture:user.picture,userId:user.userid,USP:r})),this.markUserNode(y,v),a.append&&g&&(h.all(s.FIRSTADDED).removeClass(i.FIRSTADDED),y.addClass(i.FIRSTADDED),g=!1),h.append(y);this.set(r.USERCOUNT,d),E=parseInt(f.response.totalusers,10),a.append?E<=(this.get(r.PAGE)+1)*this.get(r.PERPAGE)&&c.one(s.MORERESULTS).remove():(E===0?(c.one(s.RESULTSCOUNT).setContent(M.util.get_string("noresults","moodle")),b=""):(E===1?c.one(s.RESULTSCOUNT).setContent(M.util.get_string("foundoneuser",n)):c.one(s.RESULTSCOUNT).setContent(M.util.get_string("foundnusers",n,E)),b=o('<div class="'+i.SEARCHRESULTS+'"></div>').append(h),f.response.totalusers>(this.get(r.PAGE)+1)*this.get(r.PERPAGE)&&(w=o('<div class="'+i.MORERESULTS+'">'+'<a href="#" role="button">'+M.util.get_string("loadmoreusers",n)+"</a></div>"),w.one("a").on("click",this.search,this,!0),w.one("a").on("key",this.search,"space",this,!0),b.append(w))),this.setContent(b))},fetchMore:function(e){this.search(e,!0)},finishSelectingUsers:function(e){e.preventDefault(),this.applySelection(),this.hide()},applySelection:function(t){var n=e.Object.values(this._usersBufferList);this.set(r.SELECTEDUSERS,n),this.set(r.USERFULLNAMES,this._usersBufferList),this.setnamedisplay(),e.one(s.USERIDS).set("value",n.join())},loadUsersFromForm:function(){var t=e.one(s.USERIDS).get("value").split(",");t[0]===""&&(t=[]),this.set(r.SELECTEDUSERS,t)},selectUser:function(e){var t=e.currentTarget.ancestor(s.USER),n=t.one(s.USERSELECT),r=t.one(s.FULLNAME).get("innerHTML"),i=n.get("checked"),o=t.getData("userid");e.currentTarget!==n&&(i=!i),i?this._usersBufferList[o]=r:(delete this._usersBufferList[o],delete this._usersBufferList[parseInt(o,10)]),this.markUserNode(t,i)},markUserNode:function(e,t){t?(e.addClass(i.SELECTED),e.set("aria-selected","true"),e.one(s.USERSELECT).set("checked",!0)):(e.removeClass(i.SELECTED),e.set("aria-selected","false"),e.one(s.USERSELECT).set("checked",!1))},setContent:function(e){this.get("boundingBox").one(s.AJAXCONTENT).setContent(e)},setnamedisplay:function(){var t=e.Object.values(this.get(r.USERFULLNAMES));e.one(s.SELECTEDNAMES).set("innerHTML",t.join(", ")),e.one(s.USERFULLNAMES).set("value",t.join())},userKeyboardNavigation:function(e){e.preventDefault();var t=this.get("boundingBox"),n=t.all(s.USER),r=1,i,o=e.target.ancestor(s.USER,!0);e.keyCode===38&&(r=-1),i=this.findFocusableUser(n,o,r),i&&(i.one(s.USERSELECT).focus(),this.setUserTabFocus(i))},findFocusableUser:function(e,t,n){var r=e.indexOf(t);return e.size()<1?null:r<0?e.item(0):(r+=n,r<0?r=e.size()-1:r>=e.size()&&(r=0),e.item(r))},setUserTabFocus:function(e){this._userTabFocus&&this._userTabFocus.setAttribute("tabindex","-1"),this._userTabFocus=e.one(s.USERSELECT),this._userTabFocus.setAttribute("tabindex","0"),this.get("boundingBox").one(s.RESULTSUSERS).setAttribute("aria-activedescendant",this._userTabFocus.generateID())}},{NAME:r.NAME,CSS_PREFIX:r.CSS_PREFIX,ATTRS:{extraClasses:{value:["gradereport_history_usp"]},title:{validator:e.Lang.isString,value:M.util.get_string("selectusers",n)},focusOnPreviousTargetAfterHide:{value:!0},width:{value:"500px"},url:{validator:e.Lang.isString},ajaxurl:{validator:e.Lang.isString},selectedusers:{validator:e.Lang.isArray,value:null},userfullnames:{validator:e.Lang.isObject,value:null},courseid:{value:null},params:{validator:e.Lang.isArray,value:[]},page:{validator:e.Lang.isNumber,value:0},userCount:{value:0,validator:e.Lang.isNumber},perPage:{value:25,Validator:e.Lang.isNumber}}}),e.Base.modifyAttrs(e.namespace("M.gradereport_history.UserSelector"),{visible:{value:!1},modal:{value:!0},draggable:{value:!0}}),e.namespace("M.gradereport_history.UserSelector").init=function(e){return new u(e)}},"@VERSION@",{requires:["escape","event-delegate","event-key","handlebars","io-base","json-parse","moodle-core-notification-dialogue"]});
+YUI.add("moodle-gradereport_history-userselector",function(e,t){var n="gradereport_history",r={AJAXURL:"ajaxurl",BASE:"base",CHECKBOX_NAME_PREFIX:"usp-u",COURSEID:"courseid",DIALOGUE_PREFIX:"moodle-dialogue",NAME:"gradereport_history_usp",PAGE:"page",PARAMS:"params",PERPAGE:"perPage",SEARCH:"search",SEARCHBTN:"searchbtn",SELECTEDUSERS:"selectedusers",URL:"url",USERCOUNT:"userCount",USERFULLNAMES:"userfullnames"},i={ACCESSHIDE:"accesshide",AJAXCONTENT:"usp-ajax-content",CHECKBOX:"usp-checkbox",CLOSE:"close",CLOSEBTN:"usp-finish",CONTENT:"usp-content",DETAILS:"details",EXTRAFIELDS:"extrafields",FIRSTADDED:"usp-first-added",FULLNAME:"fullname",HEADER:"usp-header",HIDDEN:"hidden",LIGHTBOX:"usp-loading-lightbox",LOADINGICON:"loading-icon",MORERESULTS:"usp-more-results",OPTIONS:"options",PICTURE:"usp-picture",RESULTSCOUNT:"usp-results-count",SEARCH:"usp-search",SEARCHBTN:"usp-search-btn",SEARCHFIELD:"usp-search-field",SEARCHRESULTS:"usp-search-results",SELECTED:"selected",USER:"usp-user",USERS:"usp-users",WRAP:"usp-wrap"},s={AJAXCONTENT:"."+i.AJAXCONTENT,FINISHBTN:"."+i.CLOSEBTN+" input",FIRSTADDED:"."+i.FIRSTADDED,FULLNAME:"."+i.FULLNAME+" label",LIGHTBOX:"."+i.LIGHTBOX,MORERESULTS:"."+i.MORERESULTS,OPTIONS:"."+i.OPTIONS,PICTURE:"."+i.USER+" .userpicture",RESULTSCOUNT:"."+i.RESULTSCOUNT,RESULTSUSERS:"."+i.SEARCHRESULTS+" ."+i.USERS,SEARCHBTN:"."+i.SEARCHBTN,SEARCHFIELD:"."+i.SEARCHFIELD,SELECTEDNAMES:".felement .selectednames",TRIGGER:".gradereport_history_plugin input.selectortrigger",USER:"."+i.USER,USERFULLNAMES:'input[name="userfullnames"]',USERIDS:'input[name="userids"]',USERSELECT:"."+i.CHECKBOX+" input[type=checkbox]"},o=e.Node.create,u=function(){u.superclass.constructor.apply(this,arguments)};e.namespace("M.gradereport_history").UserSelector=e.extend(u,M.core.dialogue,{_firstDisplay:!0,_usersBufferList:null,_userTabFocus:null,_userTemplate:null,initializer:function(){var t=this.get("boundingBox"),u,a,f;f=e.Handlebars.compile('<div class="{{CSS.WRAP}}"><div class="{{CSS.HEADER}}"><div class="{{CSS.SEARCH}}" role="search"><form><input type="text" class="{{CSS.SEARCHFIELD}}" aria-label="{{get_string "search" "moodle"}}" value="" /><input type="submit" class="{{CSS.SEARCHBTN}}"value="{{get_string "search" "moodle"}}"></form><div aria-live="polite" class="{{CSS.RESULTSCOUNT}}">{{get_string "loading" "admin"}}</div></div></div><div class="{{CSS.CONTENT}}"><form><div class="{{CSS.AJAXCONTENT}}" aria-live="polite"></div><div class="{{CSS.LIGHTBOX}} {{CSS.HIDDEN}}"><img class="{{CSS.LOADINGICON}}" alt="{{get_string "loading" "admin"}}"src="{{{loadingIcon}}}"></div><div class="{{CSS.CLOSEBTN}}"><input type="submit" value="{{get_string "finishselectingusers" COMPONENT}}"></div></form></div></div>'),u=o(f({COMPONENT:n,CSS:i,loadingIcon:M.util.image_url("i/loading","moodle")})),this.getStdModNode(e.WidgetStdMod.HEADER).prepend(o("<h1>"+this.get("title")+"</h1>")),this.setStdModContent(e.WidgetStdMod.BODY,u,e.WidgetStdMod.REPLACE),this.get("boundingBox").one(".moodle-dialogue-wrap").addClass("moodle-dialogue-content"),this.loadUsersFromForm(),e.one(s.TRIGGER).on("click",this.show,this),t.one(s.FINISHBTN).on("click",this.finishSelectingUsers,this),t.delegate("key",this.userKeyboardNavigation,"down:38,40",s.AJAXCONTENT,this),e.delegate("click",this.selectUser,s.AJAXCONTENT,s.USERSELECT,this),e.delegate("click",this.selectUser,s.AJAXCONTENT,s.PICTURE,this),a=this.get(r.PARAMS),a.id=this.get(r.COURSEID),this.set(r.PARAMS,a),t.one(s.SEARCHBTN).on("click",this.search,this,!1)},show:function(t){var n;return this._usersBufferList={},this._firstDisplay?(this._firstDisplay=!1,this.search(t,!1)):(this._usersBufferList=e.clone(this.get(r.USERFULLNAMES)),n=this.get("boundingBox"),n.all(s.USER).each(function(e){this.markUserNode(e,!1)},this),e.Object.each(this._usersBufferList,function(e,t){var r=n.one(s.USER+'[data-userid="'+t+'"]');r&&this.markUserNode(r,!0)},this),this.setUserTabFocus(n.one(s.USER))),e.namespace("M.gradereport_history.UserSelector").superclass.show.call(this)},search:function(t,n){t&&t.preventDefault();var i;n?this.set(r.PAGE,this.get(r.PAGE)+1):(this.set(r.USERCOUNT,0),this.set(r.PAGE,0)),i=this.get(r.PARAMS),i.sesskey=M.cfg.sesskey,i.action="searchusers",i.search=this.get("boundingBox").one(s.SEARCHFIELD).get("value"),i.page=this.get(r.PAGE),i.perpage=this.get(r.PERPAGE),e.io(M.cfg.wwwroot+this.get(r.AJAXURL),{method:"POST",data:build_querystring(i),on:{start:this.preSearch,complete:this.processSearchResults,end:this.postSearch},context:this,arguments:{append:n}})},preSearch:function(e,t){var n=this.get("boundingBox");n.one(s.LIGHTBOX).removeClass(i.HIDDEN),t.append||n.one(s.RESULTSCOUNT).setHTML(M.util.get_string("loading","admin"))},postSearch:function(e,t){var n=this.get("boundingBox"),r=n.one(s.FIRSTADDED),o;n.one(s.LIGHTBOX).addClass(i.HIDDEN),t.append&&r?(this.setUserTabFocus(r),r.one(s.USERSELECT).focus()):(o=n.one(s.USER),o&&this.setUserTabFocus(o))},processSearchResults:function(t,u,a){var f=!1,l=!1,c=this.get("boundingBox"),h,p,d,v,m,g=!0,y,b,w,E;try{f=e.JSON.parse(u.responseText);if(!f.success||f.error)l=!0}catch(S){l=!0}if(l){this.setContent(""),c.one(s.RESULTSCOUNT).setHTML(M.util.get_string("errajaxsearch",n));return}a.append?h=c.one(s.RESULTSUSERS):h=o('<div role="listbox" aria-activedescendant="" aria-multiselectable="true" class="'+i.USERS+'"></div>'),this._userTemplate||(this._userTemplate=e.Handlebars.compile('<div role="option" aria-selected="false" class="{{CSS.USER}} clearfix" data-userid="{{userId}}"><div class="{{CSS.CHECKBOX}}"><input name="{{USP.CHECKBOX_NAME_PREFIX}}{{userId}}" type="checkbox" tabindex="-1"id="{{checkboxId}}" aria-describedby="{{checkboxId}} {{extraFieldsId}}"/></div><div class="{{CSS.PICTURE}}">{{{picture}}}</div><div class="{{CSS.DETAILS}}"><div class="{{CSS.FULLNAME}}"><label for="{{checkboxId}}">{{fullname}}</label></div><div id="{{extraFieldsId}}" class="{{CSS.EXTRAFIELDS}}">{{extrafields}}</div></div></div>')),p=this._userTemplate,d=this.get
+(r.USERCOUNT),v="";for(m in f.response.users)d++,user=f.response.users[m],e.Object.hasKey(this._usersBufferList,user.userid)?v=!0:v=!1,y=o(p({checkboxId:e.guid(),COMPONENT:n,count:d,CSS:i,extrafields:user.extrafields,extraFieldsId:e.guid(),fullname:user.fullname,picture:user.picture,userId:user.userid,USP:r})),this.markUserNode(y,v),a.append&&g&&(h.all(s.FIRSTADDED).removeClass(i.FIRSTADDED),y.addClass(i.FIRSTADDED),g=!1),h.append(y);this.set(r.USERCOUNT,d),E=parseInt(f.response.totalusers,10),a.append?E<=(this.get(r.PAGE)+1)*this.get(r.PERPAGE)&&c.one(s.MORERESULTS).remove():(E===0?(c.one(s.RESULTSCOUNT).setHTML(M.util.get_string("noresults","moodle")),b=""):(E===1?c.one(s.RESULTSCOUNT).setHTML(M.util.get_string("foundoneuser",n)):c.one(s.RESULTSCOUNT).setHTML(M.util.get_string("foundnusers",n,E)),b=o('<div class="'+i.SEARCHRESULTS+'"></div>').append(h),f.response.totalusers>(this.get(r.PAGE)+1)*this.get(r.PERPAGE)&&(w=o('<div class="'+i.MORERESULTS+'">'+'<a href="#" role="button">'+M.util.get_string("loadmoreusers",n)+"</a></div>"),w.one("a").on("click",this.search,this,!0),w.one("a").on("key",this.search,"space",this,!0),b.append(w))),this.setContent(b))},finishSelectingUsers:function(e){e.preventDefault(),this.applySelection(),this.hide()},applySelection:function(t){var n=e.Object.values(this._usersBufferList);this.set(r.SELECTEDUSERS,n).set(r.USERFULLNAMES,this._usersBufferList).setNameDisplay(),e.one(s.USERIDS).set("value",n.join())},loadUsersFromForm:function(){var t=e.one(s.USERIDS).get("value").split(",");t[0]===""&&(t=[]),this.set(r.SELECTEDUSERS,t)},selectUser:function(e){var t=e.currentTarget.ancestor(s.USER),n=t.one(s.USERSELECT),r=t.one(s.FULLNAME).get("innerHTML"),i=n.get("checked"),o=t.getData("userid");e.currentTarget!==n&&(i=!i),i?this._usersBufferList[o]=r:(delete this._usersBufferList[o],delete this._usersBufferList[parseInt(o,10)]),this.markUserNode(t,i)},markUserNode:function(e,t){return t?e.addClass(i.SELECTED).set("aria-selected",!0).one(s.USERSELECT).set("checked",!0):e.removeClass(i.SELECTED).set("aria-selected",!1).one(s.USERSELECT).set("checked",!1),this},setContent:function(e){return this.get("boundingBox").one(s.AJAXCONTENT).setHTML(e),this},setNameDisplay:function(){var t=e.Object.values(this.get(r.USERFULLNAMES));e.one(s.SELECTEDNAMES).set("innerHTML",t.join(", ")),e.one(s.USERFULLNAMES).set("value",t.join())},userKeyboardNavigation:function(e){var t=this.get("boundingBox"),n=t.all(s.USER),r=1,i,o=e.target.ancestor(s.USER,!0);e.keyCode===38&&(r=-1),i=this.findFocusableUser(n,o,r),i&&(e.preventDefault(),i.one(s.USERSELECT).focus(),this.setUserTabFocus(i))},findFocusableUser:function(e,t,n){var r=e.indexOf(t);return e.size()<1?null:r<0?e.item(0):(r+=n,r<0?r=e.size()-1:r>=e.size()&&(r=0),e.item(r))},setUserTabFocus:function(e){this._userTabFocus&&this._userTabFocus.setAttribute("tabindex","-1"),this._userTabFocus=e.one(s.USERSELECT),this._userTabFocus.setAttribute("tabindex","0"),this.get("boundingBox").one(s.RESULTSUSERS).setAttribute("aria-activedescendant",this._userTabFocus.generateID())}},{NAME:r.NAME,CSS_PREFIX:r.CSS_PREFIX,ATTRS:{title:{validator:e.Lang.isString,valueFn:function(){return M.util.get_string("selectusers",n)}},url:{validator:e.Lang.isString,value:null},ajaxurl:{validator:e.Lang.isString,value:null},selectedusers:{validator:e.Lang.isArray,value:null},userfullnames:{validator:e.Lang.isObject,value:null},courseid:{value:null},params:{validator:e.Lang.isArray,value:[]},page:{validator:e.Lang.isNumber,value:0},userCount:{value:0,validator:e.Lang.isNumber},perPage:{value:25,Validator:e.Lang.isNumber}}}),e.Base.modifyAttrs(e.namespace("M.gradereport_history.UserSelector"),{extraClasses:{value:["gradereport_history_usp"]},focusOnPreviousTargetAfterHide:{value:!0},width:{value:"500px"},visible:{value:!1},modal:{value:!0},draggable:{value:!0}}),e.namespace("M.gradereport_history.UserSelector").init=function(e){return new u(e)}},"@VERSION@",{requires:["escape","event-delegate","event-key","handlebars","io-base","json-parse","moodle-core-notification-dialogue"]});
diff --git a/grade/report/history/yui/build/moodle-gradereport_history-userselector/moodle-gradereport_history-userselector.js b/grade/report/history/yui/build/moodle-gradereport_history-userselector/moodle-gradereport_history-userselector.js
index 75b0e8b48e0..3e84bc47545 100644
--- a/grade/report/history/yui/build/moodle-gradereport_history-userselector/moodle-gradereport_history-userselector.js
+++ b/grade/report/history/yui/build/moodle-gradereport_history-userselector/moodle-gradereport_history-userselector.js
@@ -31,49 +31,49 @@ YUI.add('moodle-gradereport_history-userselector', function (Y, NAME) {
 
 var COMPONENT = 'gradereport_history';
 var USP = {
-    AJAXURL : 'ajaxurl',
-    BASE : 'base',
-    CHECKBOX_NAME_PREFIX : 'usp-u',
-    COURSEID : 'courseid',
-    DIALOGUE_PREFIX : 'moodle-dialogue',
-    NAME : 'gradereport_history_usp',
-    PAGE : 'page',
-    PARAMS : 'params',
-    PERPAGE : 'perPage',
-    SEARCH : 'search',
-    SEARCHBTN : 'searchbtn',
-    SELECTEDUSERS : 'selectedusers',
-    URL : 'url',
-    USERCOUNT : 'userCount',
-    USERFULLNAMES : 'userfullnames'
+    AJAXURL: 'ajaxurl',
+    BASE: 'base',
+    CHECKBOX_NAME_PREFIX: 'usp-u',
+    COURSEID: 'courseid',
+    DIALOGUE_PREFIX: 'moodle-dialogue',
+    NAME: 'gradereport_history_usp',
+    PAGE: 'page',
+    PARAMS: 'params',
+    PERPAGE: 'perPage',
+    SEARCH: 'search',
+    SEARCHBTN: 'searchbtn',
+    SELECTEDUSERS: 'selectedusers',
+    URL: 'url',
+    USERCOUNT: 'userCount',
+    USERFULLNAMES: 'userfullnames'
 };
 var CSS = {
-    ACCESSHIDE : 'accesshide',
-    AJAXCONTENT : 'usp-ajax-content',
-    CHECKBOX : 'usp-checkbox',
-    CLOSE : 'close',
-    CLOSEBTN : 'usp-finish',
-    CONTENT : 'usp-content',
-    DETAILS : 'details',
-    EXTRAFIELDS : 'extrafields',
-    FIRSTADDED : 'usp-first-added',
-    FULLNAME : 'fullname',
-    HEADER : 'usp-header',
-    HIDDEN : 'hidden',
-    LIGHTBOX : 'usp-loading-lightbox',
-    LOADINGICON : 'loading-icon',
-    MORERESULTS : 'usp-more-results',
-    OPTIONS : 'options',
-    PICTURE : 'usp-picture',
-    RESULTSCOUNT : 'usp-results-count',
-    SEARCH : 'usp-search',
-    SEARCHBTN : 'usp-search-btn',
-    SEARCHFIELD : 'usp-search-field',
-    SEARCHRESULTS : 'usp-search-results',
-    SELECTED : 'selected',
-    USER : 'usp-user',
-    USERS : 'usp-users',
-    WRAP : 'usp-wrap'
+    ACCESSHIDE: 'accesshide',
+    AJAXCONTENT: 'usp-ajax-content',
+    CHECKBOX: 'usp-checkbox',
+    CLOSE: 'close',
+    CLOSEBTN: 'usp-finish',
+    CONTENT: 'usp-content',
+    DETAILS: 'details',
+    EXTRAFIELDS: 'extrafields',
+    FIRSTADDED: 'usp-first-added',
+    FULLNAME: 'fullname',
+    HEADER: 'usp-header',
+    HIDDEN: 'hidden',
+    LIGHTBOX: 'usp-loading-lightbox',
+    LOADINGICON: 'loading-icon',
+    MORERESULTS: 'usp-more-results',
+    OPTIONS: 'options',
+    PICTURE: 'usp-picture',
+    RESULTSCOUNT: 'usp-results-count',
+    SEARCH: 'usp-search',
+    SEARCHBTN: 'usp-search-btn',
+    SEARCHFIELD: 'usp-search-field',
+    SEARCHRESULTS: 'usp-search-results',
+    SELECTED: 'selected',
+    USER: 'usp-user',
+    USERS: 'usp-users',
+    WRAP: 'usp-wrap'
 };
 var SELECTORS = {
     AJAXCONTENT: '.' + CSS.AJAXCONTENT,
@@ -114,7 +114,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      * Whether or not this is the first time the user displays the dialogue within that request.
      *
      * @property _firstDisplay
-     * @type {Boolean}
+     * @type Boolean
      * @private
      */
     _firstDisplay: true,
@@ -122,7 +122,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
     /**
      * The list of all the users selected while the dialogue is open.
      *
-     * @type {Object}
+     * @type Object
      * @property _usersBufferList
      * @private
      */
@@ -144,9 +144,9 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      * @type Function
      * @private
      */
-    _userTemplate : null,
+    _userTemplate: null,
 
-    initializer : function() {
+    initializer: function() {
         var bb = this.get('boundingBox'),
             content,
             params,
@@ -222,7 +222,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      *
      * @method show
      */
-    show : function(e) {
+    show: function(e) {
         var bb;
         this._usersBufferList = {};
         if (this._firstDisplay) {
@@ -250,17 +250,18 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
             // Reset the tab focus.
             this.setUserTabFocus(bb.one(SELECTORS.USER));
         }
-        Y.namespace('M.gradereport_history.UserSelector').superclass.show.call(this);
+        return Y.namespace('M.gradereport_history.UserSelector').superclass.show.call(this);
     },
 
     /**
      * Search for users.
      *
      * @method search
+     * @param {EventFacade} e The event.
+     * @param {Boolean} append Whether we want to append the results to the current results or not.
      */
-    search : function(e, append) {
+    search: function(e, append) {
         if (e) {
-            e.halt();
             e.preventDefault();
         }
         var params;
@@ -277,13 +278,13 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
         params.page = this.get(USP.PAGE);
         params.perpage = this.get(USP.PERPAGE);
 
-        Y.io(M.cfg.wwwroot+this.get(USP.AJAXURL), {
+        Y.io(M.cfg.wwwroot + this.get(USP.AJAXURL), {
             method:'POST',
             data:build_querystring(params),
-            on : {
-                start : this.preSearch,
+            on: {
+                start: this.preSearch,
                 complete: this.processSearchResults,
-                end : this.postSearch
+                end: this.postSearch
             },
             context:this,
             "arguments": {      // Quoted because this is a reserved keyword.
@@ -296,7 +297,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      * Pre search callback.
      *
      * @method preSearch
-     * @param {Mixed} unused Not sure what that is.
+     * @param {String} transactionId The transaction ID.
      * @param {Object} args The arguments passed from YUI.io()
      */
     preSearch: function(unused, args) {
@@ -307,7 +308,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
 
         // Set the number of results to 'loading...'.
         if (!args.append) {
-            bb.one(SELECTORS.RESULTSCOUNT).setContent(M.util.get_string('loading', 'admin'));
+            bb.one(SELECTORS.RESULTSCOUNT).setHTML(M.util.get_string('loading', 'admin'));
         }
     },
 
@@ -315,10 +316,10 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      * Post search callback.
      *
      * @method postSearch
-     * @param {Mixed} unused Not sure what that is.
+     * @param {String} transactionId The transaction ID.
      * @param {Object} args The arguments passed from YUI.io()
      */
-    postSearch: function(unused, args) {
+    postSearch: function(transactionId, args) {
         var bb = this.get('boundingBox'),
             firstAdded = bb.one(SELECTORS.FIRSTADDED),
             firstUser;
@@ -326,11 +327,12 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
         // Hide the lightbox.
         bb.one(SELECTORS.LIGHTBOX).addClass(CSS.HIDDEN);
 
-        // Sets the focus on the newly added user if we are appending results.
         if (args.append && firstAdded) {
+            // Sets the focus on the newly added user if we are appending results.
             this.setUserTabFocus(firstAdded);
             firstAdded.one(SELECTORS.USERSELECT).focus();
         } else {
+            // New search result, set the tab focus on the first user returned.
             firstUser = bb.one(SELECTORS.USER);
             if (firstUser) {
                 this.setUserTabFocus(firstUser);
@@ -342,8 +344,11 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      * Process and display the search results.
      *
      * @method processSearchResults
+     * @param {String} tid The transaction ID.
+     * @param {Object} outcome The response object.
+     * @param {Object} args The arguments passed from YUI.io().
      */
-    processSearchResults : function(tid, outcome, args) {
+    processSearchResults: function(tid, outcome, args) {
         var result = false,
             error = false,
             bb = this.get('boundingBox'),
@@ -371,7 +376,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
         // There was an error.
         if (error) {
             this.setContent('');
-            bb.one(SELECTORS.RESULTSCOUNT).setContent(M.util.get_string('errajaxsearch', COMPONENT));
+            bb.one(SELECTORS.RESULTSCOUNT).setHTML(M.util.get_string('errajaxsearch', COMPONENT));
             return;
         }
 
@@ -446,13 +451,13 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
         totalUsers = parseInt(result.response.totalusers, 10);
         if (!args.append) {
             if (totalUsers === 0) {
-                bb.one(SELECTORS.RESULTSCOUNT).setContent(M.util.get_string('noresults', 'moodle'));
+                bb.one(SELECTORS.RESULTSCOUNT).setHTML(M.util.get_string('noresults', 'moodle'));
                 content = '';
             } else {
                 if (totalUsers === 1) {
-                    bb.one(SELECTORS.RESULTSCOUNT).setContent(M.util.get_string('foundoneuser', COMPONENT));
+                    bb.one(SELECTORS.RESULTSCOUNT).setHTML(M.util.get_string('foundoneuser', COMPONENT));
                 } else {
-                    bb.one(SELECTORS.RESULTSCOUNT).setContent(M.util.get_string('foundnusers', COMPONENT, totalUsers));
+                    bb.one(SELECTORS.RESULTSCOUNT).setHTML(M.util.get_string('foundnusers', COMPONENT, totalUsers));
                 }
 
                 content = create('<div class="'+CSS.SEARCHRESULTS+'"></div>')
@@ -473,15 +478,6 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
         }
     },
 
-    /**
-     * Fetch more results.
-     *
-     * @param {EventFacade} e The event.
-     */
-    fetchMore: function(e) {
-        this.search(e, true);
-    },
-
     /**
      * When the user has finished selecting users.
      *
@@ -498,13 +494,13 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      * Apply the selection made.
      *
      * @method applySelection
-     * @return Void
+     * @param {EventFacade} e The event.
      */
     applySelection: function(e) {
         var userIds = Y.Object.values(this._usersBufferList);
-        this.set(USP.SELECTEDUSERS, userIds);
-        this.set(USP.USERFULLNAMES, this._usersBufferList);
-        this.setnamedisplay();
+        this.set(USP.SELECTEDUSERS, userIds)
+            .set(USP.USERFULLNAMES, this._usersBufferList)
+            .setNameDisplay();
         Y.one(SELECTORS.USERIDS).set('value', userIds.join());
     },
 
@@ -528,7 +524,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      * @method SelectUser
      * @param {EventFacade} e The event.
      */
-    selectUser : function(e) {
+    selectUser: function(e) {
         var user = e.currentTarget.ancestor(SELECTORS.USER),
             checkbox = user.one(SELECTORS.USERSELECT),
             fullname = user.one(SELECTORS.FULLNAME).get('innerHTML'),
@@ -546,7 +542,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
         } else {
             // De-selecting the user.
             delete this._usersBufferList[userId];
-            delete this._usersBufferList[parseInt(userId, 10)]; // Also remove number'd keys.
+            delete this._usersBufferList[parseInt(userId, 10)]; // Also remove numbered keys.
         }
 
         this.markUserNode(user, checked);
@@ -560,17 +556,21 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      *
      * @param {Node} node The user node.
      * @param {Boolean} selected True to mark as selected.
+     * @chainable
      */
     markUserNode: function(node, selected) {
         if (selected) {
-            node.addClass(CSS.SELECTED);
-            node.set('aria-selected', 'true');
-            node.one(SELECTORS.USERSELECT).set('checked', true);
+            node.addClass(CSS.SELECTED)
+                .set('aria-selected', true)
+                .one(SELECTORS.USERSELECT)
+                    .set('checked', true);
         } else {
-            node.removeClass(CSS.SELECTED);
-            node.set('aria-selected', 'false');
-            node.one(SELECTORS.USERSELECT).set('checked', false);
+            node.removeClass(CSS.SELECTED)
+                .set('aria-selected', false)
+                .one(SELECTORS.USERSELECT)
+                    .set('checked', false);
         }
+        return this;
     },
 
     /**
@@ -578,17 +578,19 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      *
      * @method setContent
      * @param {String} content The content.
+     * @chainable
      */
     setContent: function(content) {
-        this.get('boundingBox').one(SELECTORS.AJAXCONTENT).setContent(content);
+        this.get('boundingBox').one(SELECTORS.AJAXCONTENT).setHTML(content);
+        return this;
     },
 
     /**
      * Display the names of the selected users in the form.
      *
-     * @method setnamedisplay
+     * @method setNameDisplay
      */
-    setnamedisplay: function() {
+    setNameDisplay: function() {
         var namelist = Y.Object.values(this.get(USP.USERFULLNAMES));
         Y.one(SELECTORS.SELECTEDNAMES).set('innerHTML', namelist.join(', '));
         Y.one(SELECTORS.USERFULLNAMES).set('value', namelist.join());
@@ -600,8 +602,6 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      * @method userKeyboardNavigation
      */
     userKeyboardNavigation: function(e) {
-        e.preventDefault();
-
         var bb = this.get('boundingBox'),
             users = bb.all(SELECTORS.USER),
             direction = 1,
@@ -614,6 +614,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
 
         user = this.findFocusableUser(users, current, direction);
         if (user) {
+            e.preventDefault();
             user.one(SELECTORS.USERSELECT).focus();
             this.setUserTabFocus(user);
         }
@@ -625,8 +626,8 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      * @param {NodeList} users The list of users.
      * @param {Node} user The user to start with.
      * @param {Number} direction The direction in which to go.
-     * @return {Node} A user node.
-     * @method findNextFocusableUser
+     * @return {Node|null} A user node, or null if not found.
+     * @method findFocusableUser
      */
     findFocusableUser: function(users, user, direction) {
         var index = users.indexOf(user);
@@ -669,146 +670,127 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
     }
 
 }, {
-    NAME : USP.NAME,
-    CSS_PREFIX : USP.CSS_PREFIX,
-    ATTRS : {
-
-        /**
-         * List of extra classes.
-         *
-         * @attribute extraClasses
-         * @type Array
-         */
-        extraClasses: {
-            value: [
-                'gradereport_history_usp'
-            ]
-        },
+    NAME: USP.NAME,
+    CSS_PREFIX: USP.CSS_PREFIX,
+    ATTRS: {
 
         /**
          * The header.
          *
          * @attribute title
+         * @default selectusers language string.
          * @type String
          */
         title: {
             validator: Y.Lang.isString,
-            value: M.util.get_string('selectusers', COMPONENT)
-        },
-
-        /**
-         * Whether to focus on the target that caused the Widget to be shown.
-         *
-         * @attribute focusOnPreviousTargetAfterHide
-         * @type Node
-         */
-        focusOnPreviousTargetAfterHide: {
-            value: true
-        },
-
-        /**
-         *
-         * Width.
-         *
-         * @attribute width
-         * @type {String|Number}
-         */
-        width: {
-            value: '500px'
+            valueFn: function() {
+                return M.util.get_string('selectusers', COMPONENT);
+            }
         },
 
         /**
          * The current page URL.
          *
          * @attribute url
+         * @default null
          * @type String
          */
-        url : {
-            validator : Y.Lang.isString
+        url: {
+            validator: Y.Lang.isString,
+            value: null
         },
 
         /**
          * The URL to the Ajax file.
          *
          * @attribute ajaxurl
+         * @default null
          * @type String
          */
-        ajaxurl : {
-            validator : Y.Lang.isString
+        ajaxurl: {
+            validator: Y.Lang.isString,
+            value: null
         },
 
         /**
          * IDs of the selected users.
          *
          * @attribute selectedusers
+         * @default null
          * @type Array
          */
-        selectedusers : {
-            validator : Y.Lang.isArray,
-            value : null
+        selectedusers: {
+            validator: Y.Lang.isArray,
+            value: null
         },
 
         /**
          * The names of the selected users.
          *
          * @attribute userfullnames
+         * @default null
          * @type Object
          */
-        userfullnames : {
-            validator : Y.Lang.isObject,
-            value : null
+        userfullnames: {
+            validator: Y.Lang.isObject,
+            value: null
         },
 
         /**
          * The course ID.
          *
          * @attribute courseid
+         * @default null
          * @type Number
          */
-        courseid : {
-            value : null
+        courseid: {
+            value: null
         },
 
         /**
          * Array of parameters.
          *
          * @attribute params
+         * @default []
          * @type Array
          */
-        params : {
-            validator : Y.Lang.isArray,
-            value : []
+        params: {
+            validator: Y.Lang.isArray,
+            value: []
         },
 
         /**
          * The page we are on.
          *
          * @attribute page
+         * @default 0
          * @type Number
          */
-        page : {
-            validator : Y.Lang.isNumber,
-            value : 0
+        page: {
+            validator: Y.Lang.isNumber,
+            value: 0
         },
 
         /**
          * The number of users displayed.
          *
          * @attribute userCount
+         * @default 0
          * @type Number
          */
-        userCount : {
-            value : 0,
-            validator : Y.Lang.isNumber
+        userCount: {
+            value: 0,
+            validator: Y.Lang.isNumber
         },
 
         /**
          * The number of results per page.
          *
          * @attribute perPage
+         * @default 25
          * @type Number
          */
-        perPage : {
+        perPage: {
             value: 25,
             Validator: Y.Lang.isNumber
         }
@@ -818,11 +800,47 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
 
 Y.Base.modifyAttrs(Y.namespace('M.gradereport_history.UserSelector'), {
 
+    /**
+     * List of extra classes.
+     *
+     * @attribute extraClasses
+     * @default ['gradereport_history_usp']
+     * @type Array
+     */
+    extraClasses: {
+        value: [
+            'gradereport_history_usp'
+        ]
+    },
+
+    /**
+     * Whether to focus on the target that caused the Widget to be shown.
+     *
+     * @attribute focusOnPreviousTargetAfterHide
+     * @default true
+     * @type Node
+     */
+    focusOnPreviousTargetAfterHide: {
+        value: true
+    },
+
+    /**
+     *
+     * Width.
+     *
+     * @attribute width
+     * @default '500px'
+     * @type String|Number
+     */
+    width: {
+        value: '500px'
+    },
+
     /**
      * Boolean indicating whether or not the Widget is visible.
      *
      * @attribute visible
-     * @default true
+     * @default false
      * @type Boolean
      */
     visible: {
diff --git a/grade/report/history/yui/src/userselector/build.json b/grade/report/history/yui/src/userselector/build.json
index 7bd9db8c2ba..a03222c901d 100644
--- a/grade/report/history/yui/src/userselector/build.json
+++ b/grade/report/history/yui/src/userselector/build.json
@@ -1,10 +1,10 @@
 {
-  "name": "moodle-gradereport_history-userselector",
-  "builds": {
-    "moodle-gradereport_history-userselector": {
-      "jsfiles": [
-        "userselector.js"
-      ]
+    "name": "moodle-gradereport_history-userselector",
+    "builds": {
+        "moodle-gradereport_history-userselector": {
+            "jsfiles": [
+                "userselector.js"
+            ]
+        }
     }
-  }
 }
diff --git a/grade/report/history/yui/src/userselector/js/userselector.js b/grade/report/history/yui/src/userselector/js/userselector.js
index d4edba271ab..2990f7a8abf 100644
--- a/grade/report/history/yui/src/userselector/js/userselector.js
+++ b/grade/report/history/yui/src/userselector/js/userselector.js
@@ -29,49 +29,49 @@
 
 var COMPONENT = 'gradereport_history';
 var USP = {
-    AJAXURL : 'ajaxurl',
-    BASE : 'base',
-    CHECKBOX_NAME_PREFIX : 'usp-u',
-    COURSEID : 'courseid',
-    DIALOGUE_PREFIX : 'moodle-dialogue',
-    NAME : 'gradereport_history_usp',
-    PAGE : 'page',
-    PARAMS : 'params',
-    PERPAGE : 'perPage',
-    SEARCH : 'search',
-    SEARCHBTN : 'searchbtn',
-    SELECTEDUSERS : 'selectedusers',
-    URL : 'url',
-    USERCOUNT : 'userCount',
-    USERFULLNAMES : 'userfullnames'
+    AJAXURL: 'ajaxurl',
+    BASE: 'base',
+    CHECKBOX_NAME_PREFIX: 'usp-u',
+    COURSEID: 'courseid',
+    DIALOGUE_PREFIX: 'moodle-dialogue',
+    NAME: 'gradereport_history_usp',
+    PAGE: 'page',
+    PARAMS: 'params',
+    PERPAGE: 'perPage',
+    SEARCH: 'search',
+    SEARCHBTN: 'searchbtn',
+    SELECTEDUSERS: 'selectedusers',
+    URL: 'url',
+    USERCOUNT: 'userCount',
+    USERFULLNAMES: 'userfullnames'
 };
 var CSS = {
-    ACCESSHIDE : 'accesshide',
-    AJAXCONTENT : 'usp-ajax-content',
-    CHECKBOX : 'usp-checkbox',
-    CLOSE : 'close',
-    CLOSEBTN : 'usp-finish',
-    CONTENT : 'usp-content',
-    DETAILS : 'details',
-    EXTRAFIELDS : 'extrafields',
-    FIRSTADDED : 'usp-first-added',
-    FULLNAME : 'fullname',
-    HEADER : 'usp-header',
-    HIDDEN : 'hidden',
-    LIGHTBOX : 'usp-loading-lightbox',
-    LOADINGICON : 'loading-icon',
-    MORERESULTS : 'usp-more-results',
-    OPTIONS : 'options',
-    PICTURE : 'usp-picture',
-    RESULTSCOUNT : 'usp-results-count',
-    SEARCH : 'usp-search',
-    SEARCHBTN : 'usp-search-btn',
-    SEARCHFIELD : 'usp-search-field',
-    SEARCHRESULTS : 'usp-search-results',
-    SELECTED : 'selected',
-    USER : 'usp-user',
-    USERS : 'usp-users',
-    WRAP : 'usp-wrap'
+    ACCESSHIDE: 'accesshide',
+    AJAXCONTENT: 'usp-ajax-content',
+    CHECKBOX: 'usp-checkbox',
+    CLOSE: 'close',
+    CLOSEBTN: 'usp-finish',
+    CONTENT: 'usp-content',
+    DETAILS: 'details',
+    EXTRAFIELDS: 'extrafields',
+    FIRSTADDED: 'usp-first-added',
+    FULLNAME: 'fullname',
+    HEADER: 'usp-header',
+    HIDDEN: 'hidden',
+    LIGHTBOX: 'usp-loading-lightbox',
+    LOADINGICON: 'loading-icon',
+    MORERESULTS: 'usp-more-results',
+    OPTIONS: 'options',
+    PICTURE: 'usp-picture',
+    RESULTSCOUNT: 'usp-results-count',
+    SEARCH: 'usp-search',
+    SEARCHBTN: 'usp-search-btn',
+    SEARCHFIELD: 'usp-search-field',
+    SEARCHRESULTS: 'usp-search-results',
+    SELECTED: 'selected',
+    USER: 'usp-user',
+    USERS: 'usp-users',
+    WRAP: 'usp-wrap'
 };
 var SELECTORS = {
     AJAXCONTENT: '.' + CSS.AJAXCONTENT,
@@ -112,7 +112,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      * Whether or not this is the first time the user displays the dialogue within that request.
      *
      * @property _firstDisplay
-     * @type {Boolean}
+     * @type Boolean
      * @private
      */
     _firstDisplay: true,
@@ -120,7 +120,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
     /**
      * The list of all the users selected while the dialogue is open.
      *
-     * @type {Object}
+     * @type Object
      * @property _usersBufferList
      * @private
      */
@@ -142,9 +142,9 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      * @type Function
      * @private
      */
-    _userTemplate : null,
+    _userTemplate: null,
 
-    initializer : function() {
+    initializer: function() {
         var bb = this.get('boundingBox'),
             content,
             params,
@@ -220,7 +220,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      *
      * @method show
      */
-    show : function(e) {
+    show: function(e) {
         var bb;
         this._usersBufferList = {};
         if (this._firstDisplay) {
@@ -248,17 +248,18 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
             // Reset the tab focus.
             this.setUserTabFocus(bb.one(SELECTORS.USER));
         }
-        Y.namespace('M.gradereport_history.UserSelector').superclass.show.call(this);
+        return Y.namespace('M.gradereport_history.UserSelector').superclass.show.call(this);
     },
 
     /**
      * Search for users.
      *
      * @method search
+     * @param {EventFacade} e The event.
+     * @param {Boolean} append Whether we want to append the results to the current results or not.
      */
-    search : function(e, append) {
+    search: function(e, append) {
         if (e) {
-            e.halt();
             e.preventDefault();
         }
         var params;
@@ -275,13 +276,13 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
         params.page = this.get(USP.PAGE);
         params.perpage = this.get(USP.PERPAGE);
 
-        Y.io(M.cfg.wwwroot+this.get(USP.AJAXURL), {
+        Y.io(M.cfg.wwwroot + this.get(USP.AJAXURL), {
             method:'POST',
             data:build_querystring(params),
-            on : {
-                start : this.preSearch,
+            on: {
+                start: this.preSearch,
                 complete: this.processSearchResults,
-                end : this.postSearch
+                end: this.postSearch
             },
             context:this,
             "arguments": {      // Quoted because this is a reserved keyword.
@@ -294,7 +295,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      * Pre search callback.
      *
      * @method preSearch
-     * @param {Mixed} unused Not sure what that is.
+     * @param {String} transactionId The transaction ID.
      * @param {Object} args The arguments passed from YUI.io()
      */
     preSearch: function(unused, args) {
@@ -305,7 +306,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
 
         // Set the number of results to 'loading...'.
         if (!args.append) {
-            bb.one(SELECTORS.RESULTSCOUNT).setContent(M.util.get_string('loading', 'admin'));
+            bb.one(SELECTORS.RESULTSCOUNT).setHTML(M.util.get_string('loading', 'admin'));
         }
     },
 
@@ -313,10 +314,10 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      * Post search callback.
      *
      * @method postSearch
-     * @param {Mixed} unused Not sure what that is.
+     * @param {String} transactionId The transaction ID.
      * @param {Object} args The arguments passed from YUI.io()
      */
-    postSearch: function(unused, args) {
+    postSearch: function(transactionId, args) {
         var bb = this.get('boundingBox'),
             firstAdded = bb.one(SELECTORS.FIRSTADDED),
             firstUser;
@@ -324,11 +325,12 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
         // Hide the lightbox.
         bb.one(SELECTORS.LIGHTBOX).addClass(CSS.HIDDEN);
 
-        // Sets the focus on the newly added user if we are appending results.
         if (args.append && firstAdded) {
+            // Sets the focus on the newly added user if we are appending results.
             this.setUserTabFocus(firstAdded);
             firstAdded.one(SELECTORS.USERSELECT).focus();
         } else {
+            // New search result, set the tab focus on the first user returned.
             firstUser = bb.one(SELECTORS.USER);
             if (firstUser) {
                 this.setUserTabFocus(firstUser);
@@ -340,8 +342,11 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      * Process and display the search results.
      *
      * @method processSearchResults
+     * @param {String} tid The transaction ID.
+     * @param {Object} outcome The response object.
+     * @param {Object} args The arguments passed from YUI.io().
      */
-    processSearchResults : function(tid, outcome, args) {
+    processSearchResults: function(tid, outcome, args) {
         var result = false,
             error = false,
             bb = this.get('boundingBox'),
@@ -369,7 +374,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
         // There was an error.
         if (error) {
             this.setContent('');
-            bb.one(SELECTORS.RESULTSCOUNT).setContent(M.util.get_string('errajaxsearch', COMPONENT));
+            bb.one(SELECTORS.RESULTSCOUNT).setHTML(M.util.get_string('errajaxsearch', COMPONENT));
             return;
         }
 
@@ -444,13 +449,13 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
         totalUsers = parseInt(result.response.totalusers, 10);
         if (!args.append) {
             if (totalUsers === 0) {
-                bb.one(SELECTORS.RESULTSCOUNT).setContent(M.util.get_string('noresults', 'moodle'));
+                bb.one(SELECTORS.RESULTSCOUNT).setHTML(M.util.get_string('noresults', 'moodle'));
                 content = '';
             } else {
                 if (totalUsers === 1) {
-                    bb.one(SELECTORS.RESULTSCOUNT).setContent(M.util.get_string('foundoneuser', COMPONENT));
+                    bb.one(SELECTORS.RESULTSCOUNT).setHTML(M.util.get_string('foundoneuser', COMPONENT));
                 } else {
-                    bb.one(SELECTORS.RESULTSCOUNT).setContent(M.util.get_string('foundnusers', COMPONENT, totalUsers));
+                    bb.one(SELECTORS.RESULTSCOUNT).setHTML(M.util.get_string('foundnusers', COMPONENT, totalUsers));
                 }
 
                 content = create('<div class="'+CSS.SEARCHRESULTS+'"></div>')
@@ -471,15 +476,6 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
         }
     },
 
-    /**
-     * Fetch more results.
-     *
-     * @param {EventFacade} e The event.
-     */
-    fetchMore: function(e) {
-        this.search(e, true);
-    },
-
     /**
      * When the user has finished selecting users.
      *
@@ -496,13 +492,13 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      * Apply the selection made.
      *
      * @method applySelection
-     * @return Void
+     * @param {EventFacade} e The event.
      */
     applySelection: function(e) {
         var userIds = Y.Object.values(this._usersBufferList);
-        this.set(USP.SELECTEDUSERS, userIds);
-        this.set(USP.USERFULLNAMES, this._usersBufferList);
-        this.setnamedisplay();
+        this.set(USP.SELECTEDUSERS, userIds)
+            .set(USP.USERFULLNAMES, this._usersBufferList)
+            .setNameDisplay();
         Y.one(SELECTORS.USERIDS).set('value', userIds.join());
     },
 
@@ -526,7 +522,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      * @method SelectUser
      * @param {EventFacade} e The event.
      */
-    selectUser : function(e) {
+    selectUser: function(e) {
         var user = e.currentTarget.ancestor(SELECTORS.USER),
             checkbox = user.one(SELECTORS.USERSELECT),
             fullname = user.one(SELECTORS.FULLNAME).get('innerHTML'),
@@ -544,7 +540,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
         } else {
             // De-selecting the user.
             delete this._usersBufferList[userId];
-            delete this._usersBufferList[parseInt(userId, 10)]; // Also remove number'd keys.
+            delete this._usersBufferList[parseInt(userId, 10)]; // Also remove numbered keys.
         }
 
         this.markUserNode(user, checked);
@@ -558,17 +554,21 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      *
      * @param {Node} node The user node.
      * @param {Boolean} selected True to mark as selected.
+     * @chainable
      */
     markUserNode: function(node, selected) {
         if (selected) {
-            node.addClass(CSS.SELECTED);
-            node.set('aria-selected', 'true');
-            node.one(SELECTORS.USERSELECT).set('checked', true);
+            node.addClass(CSS.SELECTED)
+                .set('aria-selected', true)
+                .one(SELECTORS.USERSELECT)
+                    .set('checked', true);
         } else {
-            node.removeClass(CSS.SELECTED);
-            node.set('aria-selected', 'false');
-            node.one(SELECTORS.USERSELECT).set('checked', false);
+            node.removeClass(CSS.SELECTED)
+                .set('aria-selected', false)
+                .one(SELECTORS.USERSELECT)
+                    .set('checked', false);
         }
+        return this;
     },
 
     /**
@@ -576,17 +576,19 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      *
      * @method setContent
      * @param {String} content The content.
+     * @chainable
      */
     setContent: function(content) {
-        this.get('boundingBox').one(SELECTORS.AJAXCONTENT).setContent(content);
+        this.get('boundingBox').one(SELECTORS.AJAXCONTENT).setHTML(content);
+        return this;
     },
 
     /**
      * Display the names of the selected users in the form.
      *
-     * @method setnamedisplay
+     * @method setNameDisplay
      */
-    setnamedisplay: function() {
+    setNameDisplay: function() {
         var namelist = Y.Object.values(this.get(USP.USERFULLNAMES));
         Y.one(SELECTORS.SELECTEDNAMES).set('innerHTML', namelist.join(', '));
         Y.one(SELECTORS.USERFULLNAMES).set('value', namelist.join());
@@ -598,8 +600,6 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      * @method userKeyboardNavigation
      */
     userKeyboardNavigation: function(e) {
-        e.preventDefault();
-
         var bb = this.get('boundingBox'),
             users = bb.all(SELECTORS.USER),
             direction = 1,
@@ -612,6 +612,7 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
 
         user = this.findFocusableUser(users, current, direction);
         if (user) {
+            e.preventDefault();
             user.one(SELECTORS.USERSELECT).focus();
             this.setUserTabFocus(user);
         }
@@ -623,8 +624,8 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
      * @param {NodeList} users The list of users.
      * @param {Node} user The user to start with.
      * @param {Number} direction The direction in which to go.
-     * @return {Node} A user node.
-     * @method findNextFocusableUser
+     * @return {Node|null} A user node, or null if not found.
+     * @method findFocusableUser
      */
     findFocusableUser: function(users, user, direction) {
         var index = users.indexOf(user);
@@ -669,146 +670,127 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
     }
 
 }, {
-    NAME : USP.NAME,
-    CSS_PREFIX : USP.CSS_PREFIX,
-    ATTRS : {
-
-        /**
-         * List of extra classes.
-         *
-         * @attribute extraClasses
-         * @type Array
-         */
-        extraClasses: {
-            value: [
-                'gradereport_history_usp'
-            ]
-        },
+    NAME: USP.NAME,
+    CSS_PREFIX: USP.CSS_PREFIX,
+    ATTRS: {
 
         /**
          * The header.
          *
          * @attribute title
+         * @default selectusers language string.
          * @type String
          */
         title: {
             validator: Y.Lang.isString,
-            value: M.util.get_string('selectusers', COMPONENT)
-        },
-
-        /**
-         * Whether to focus on the target that caused the Widget to be shown.
-         *
-         * @attribute focusOnPreviousTargetAfterHide
-         * @type Node
-         */
-        focusOnPreviousTargetAfterHide: {
-            value: true
-        },
-
-        /**
-         *
-         * Width.
-         *
-         * @attribute width
-         * @type {String|Number}
-         */
-        width: {
-            value: '500px'
+            valueFn: function() {
+                return M.util.get_string('selectusers', COMPONENT);
+            }
         },
 
         /**
          * The current page URL.
          *
          * @attribute url
+         * @default null
          * @type String
          */
-        url : {
-            validator : Y.Lang.isString
+        url: {
+            validator: Y.Lang.isString,
+            value: null
         },
 
         /**
          * The URL to the Ajax file.
          *
          * @attribute ajaxurl
+         * @default null
          * @type String
          */
-        ajaxurl : {
-            validator : Y.Lang.isString
+        ajaxurl: {
+            validator: Y.Lang.isString,
+            value: null
         },
 
         /**
          * IDs of the selected users.
          *
          * @attribute selectedusers
+         * @default null
          * @type Array
          */
-        selectedusers : {
-            validator : Y.Lang.isArray,
-            value : null
+        selectedusers: {
+            validator: Y.Lang.isArray,
+            value: null
         },
 
         /**
          * The names of the selected users.
          *
          * @attribute userfullnames
+         * @default null
          * @type Object
          */
-        userfullnames : {
-            validator : Y.Lang.isObject,
-            value : null
+        userfullnames: {
+            validator: Y.Lang.isObject,
+            value: null
         },
 
         /**
          * The course ID.
          *
          * @attribute courseid
+         * @default null
          * @type Number
          */
-        courseid : {
-            value : null
+        courseid: {
+            value: null
         },
 
         /**
          * Array of parameters.
          *
          * @attribute params
+         * @default []
          * @type Array
          */
-        params : {
-            validator : Y.Lang.isArray,
-            value : []
+        params: {
+            validator: Y.Lang.isArray,
+            value: []
         },
 
         /**
          * The page we are on.
          *
          * @attribute page
+         * @default 0
          * @type Number
          */
-        page : {
-            validator : Y.Lang.isNumber,
-            value : 0
+        page: {
+            validator: Y.Lang.isNumber,
+            value: 0
         },
 
         /**
          * The number of users displayed.
          *
          * @attribute userCount
+         * @default 0
          * @type Number
          */
-        userCount : {
-            value : 0,
-            validator : Y.Lang.isNumber
+        userCount: {
+            value: 0,
+            validator: Y.Lang.isNumber
         },
 
         /**
          * The number of results per page.
          *
          * @attribute perPage
+         * @default 25
          * @type Number
          */
-        perPage : {
+        perPage: {
             value: 25,
             Validator: Y.Lang.isNumber
         }
@@ -818,11 +800,47 @@ Y.namespace('M.gradereport_history').UserSelector = Y.extend(USERSELECTOR, M.cor
 
 Y.Base.modifyAttrs(Y.namespace('M.gradereport_history.UserSelector'), {
 
+    /**
+     * List of extra classes.
+     *
+     * @attribute extraClasses
+     * @default ['gradereport_history_usp']
+     * @type Array
+     */
+    extraClasses: {
+        value: [
+            'gradereport_history_usp'
+        ]
+    },
+
+    /**
+     * Whether to focus on the target that caused the Widget to be shown.
+     *
+     * @attribute focusOnPreviousTargetAfterHide
+     * @default true
+     * @type Node
+     */
+    focusOnPreviousTargetAfterHide: {
+        value: true
+    },
+
+    /**
+     *
+     * Width.
+     *
+     * @attribute width
+     * @default '500px'
+     * @type String|Number
+     */
+    width: {
+        value: '500px'
+    },
+
     /**
      * Boolean indicating whether or not the Widget is visible.
      *
      * @attribute visible
-     * @default true
+     * @default false
      * @type Boolean
      */
     visible: {