MDL-53451 competency: Removing sneaky whitespaces
authorFrederic Massart <fred@moodle.com>
Tue, 19 Apr 2016 04:15:38 +0000 (12:15 +0800)
committerFrederic Massart <fred@moodle.com>
Tue, 19 Apr 2016 04:21:36 +0000 (12:21 +0800)
admin/tool/lp/amd/build/course_competency_settings.min.js
admin/tool/lp/amd/src/actionselector.js
admin/tool/lp/amd/src/competencies.js
admin/tool/lp/amd/src/course_competency_settings.js
admin/tool/lp/amd/src/templateactions.js
admin/tool/lp/tests/behat/framework_crud.feature
report/competency/amd/src/grading_popup.js

index 1b1b540..5fe246e 100644 (file)
Binary files a/admin/tool/lp/amd/build/course_competency_settings.min.js and b/admin/tool/lp/amd/build/course_competency_settings.min.js differ
index fa65700..d36f06f 100644 (file)
@@ -18,7 +18,7 @@
  *
  * To handle 'save' events use: actionselector.on('save')
  * This will receive the information to display in popup.
- * The actions have the format [{'text': sometext, 'value' : somevalue}] 
+ * The actions have the format [{'text': sometext, 'value' : somevalue}].
  *
  * @package    tool_lp
  * @copyright  2016 Serge Gauthier - <serge.gauthier.2@umontreal.ca>
@@ -43,7 +43,7 @@ define(['jquery',
      */
     var ActionSelector = function(title, message, actions, confirm, cancel) {
         var self = this;
-        
+
         EventBase.prototype.constructor.apply(this, []);
         self._title = title;
         self._message = message;
@@ -55,7 +55,7 @@ define(['jquery',
     };
 
     ActionSelector.prototype = Object.create(EventBase.prototype);
-    
+
     /** @type {String} The value that was selected. */
     ActionSelector.prototype._selectedValue = null;
     /** @type {Dialogue} The reference to the dialogue. */
@@ -170,9 +170,9 @@ define(['jquery',
         for (var i in self._actions) {
             choices.push(self._actions[i]);
         }
-        var content = {'message': self._message, 'choices' : choices, 
+        var content = {'message': self._message, 'choices' : choices,
             'confirm' : self._confirm, 'cancel' : self._cancel};
+
         return Templates.render('tool_lp/action_selector', content);
     };
 
@@ -183,7 +183,7 @@ define(['jquery',
      *
      * @method _reset
      */
-    ActionSelector.prototype._reset = function() {   
+    ActionSelector.prototype._reset = function() {
         this._popup = null;
         this._selectedValue = '';
     };
index bf02997..6e1973c 100644 (file)
@@ -246,7 +246,7 @@ define(['jquery',
 
     /**
      * Show a confirm dialogue before deleting a competency.
-     * 
+     *
      * @method deleteHandler
      * @param {int} deleteid The id of record to delete.
      */
index 5ec02f5..bff7349 100644 (file)
@@ -100,7 +100,7 @@ define(['jquery',
     settingsMod.prototype._find = function(selector) {
         return $('[data-region="coursecompetencysettings"]').find(selector);
     };
-    
+
     /**
      * Save the settings.
      *
index 4309ce6..0966cc2 100644 (file)
@@ -21,7 +21,7 @@
  * @copyright  2015 Damyon Wiese <damyon@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-define(['jquery', 'core/templates', 'core/ajax', 'core/notification', 'core/str','tool_lp/actionselector'], 
+define(['jquery', 'core/templates', 'core/ajax', 'core/notification', 'core/str','tool_lp/actionselector'],
        function($, templates, ajax, notification, str, Actionselector) {
     // Private variables and functions.
 
@@ -30,7 +30,7 @@ define(['jquery', 'core/templates', 'core/ajax', 'core/notification', 'core/str'
 
     /** @var {Number} templateid The id of the template */
     var templateid = 0;
-    
+
     /** @var {Boolean} Action to apply to plans when deleting a template */
     var deleteplans = true;
 
@@ -136,14 +136,14 @@ define(['jquery', 'core/templates', 'core/ajax', 'core/notification', 'core/str'
                         { key: 'confirm', component: 'moodle' },
                         { key: 'cancel', component: 'moodle' }
                     ]).done(function (strings) {
-                        var actions = [{'text': strings[2], 'value' : 'delete'}, 
+                        var actions = [{'text': strings[2], 'value' : 'delete'},
                                        {'text': strings[3], 'value' : 'unlink'}];
                         var actionselector = new Actionselector(
                                 strings[0], // Title.
                                 strings[1], // Message
                                 actions, // Radio button options.
                                 strings[4], // Confirm.
-                                strings[5]); // Cancel.                             
+                                strings[5]); // Cancel.
                         actionselector.display();
                         actionselector.on('save', function(e, data) {
                             if (data.action != 'delete') {
@@ -168,7 +168,7 @@ define(['jquery', 'core/templates', 'core/ajax', 'core/notification', 'core/str'
                         doDelete
                         );
                     }).fail(notification.exception);
-                }                
+                }
             }).fail(notification.exception);
         }).fail(notification.exception);
 
index d984b7d..a77dcd0 100644 (file)
@@ -73,7 +73,7 @@ Feature: Manage competency frameworks
 
 Scenario: Edit a framework with competencies in user competency
     Given the following lp "frameworks" exist:
-      | shortname | idnumber | 
+      | shortname | idnumber |
       | Science Year-5 | sc-y-5 |
     And the following lp "competencies" exist:
       | shortname | framework |
@@ -87,7 +87,7 @@ Scenario: Edit a framework with competencies in user competency
       | Plan Science-5 | Comp1 |
       | Plan Science-5 | Comp2 |
     And the following lp "usercompetencies" exist:
-      | user | competency | 
+      | user | competency |
       | admin | Comp1 |
       | admin | Comp2 |
     And I follow "Competency Frameworks"
@@ -103,7 +103,7 @@ Scenario: Edit a framework with competencies in user competency
 
 Scenario: Edit a framework with competencies in user competency plan
     Given the following lp "frameworks" exist:
-      | shortname | idnumber | 
+      | shortname | idnumber |
       | Science Year-6 | sc-y-6 |
     And the following lp "competencies" exist:
       | shortname | framework |
index 305f708..38fcce8 100644 (file)
@@ -57,7 +57,7 @@ define(['jquery', 'core/notification', 'core/str', 'core/ajax', 'core/log', 'cor
             done: this._contextLoaded.bind(this),
             fail: notification.exception
         }]);
-    
+
         // Log the user competency viewed in course event.
         requests[0].then(function(){
             ajax.call([{