Merge branch 'MDL-48620-master' of git://github.com/andrewnicols/moodle

Conflicts: lib/editor/atto/plugins/undo/yui/build/moodle-atto_undo-button/moodle-atto_undo-button-min.js
iFixit · Jan 28, 2015 · 8181ab5 · 8181ab5
2 parents 215c370 + 557f44d
commit 8181ab5
Show file tree

Hide file tree

Showing 221 changed files with 919 additions and 603 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -1,48 +1,53 @@
 {
-    "browser":      true,
-    "yui":          true,
-    "bitwise":      true,
-    "curly":        true,
-    "eqeqeq":       true,
-    "forin":        false,
-    "immed":        true,
-    "newcap":       true,
-    "noarg":        true,
-    "noempty":      true,
-    "nomen":        false,
-    "onevar":       false,
-    "plusplus":     false,
-    "regexp":       false,
-    "strict":       false,
-    "trailing":     true,
-    "unused":       true,
-    "white":        false,
     "asi":          false,
+    "bitwise":      true,
     "boss":         false,
+    "browser":      true,
+    "curly":        true,
     "debug":        false,
+    "eqeqeq":       false,
     "eqnull":       false,
     "es5":          false,
     "esnext":       false,
     "evil":         false,
     "expr":         false,
+    "forin":        false,
     "funcscope":    false,
     "globalstrict": false,
+    "immed":        true,
+    "indent":       4,
     "iterator":     false,
     "lastsemic":    false,
+    "latedef":      true,
     "laxbreak":     true,
     "laxcomma":     false,
     "loopfunc":     false,
+    "maxerr":       500,
+    "maxlen":       132,
     "multistr":     false,
+    "newcap":       true,
+    "noarg":        true,
+    "noempty":      true,
+    "nomen":        false,
     "onecase":      false,
+    "onevar":       false,
+    "passfail":     false,
+    "plusplus":     false,
+    "predef": [
+        "M"
+    ],
     "proto":        false,
     "regexdash":    false,
+    "regexp":       false,
     "scripturl":    false,
     "shadow":       false,
     "smarttabs":    false,
+    "strict":       false,
     "sub":          false,
     "supernew":     false,
-    "maxerr":       500,
-    "maxlen":       180,
-    "passfail":     false,
-    "latedef":      true
+    "trailing":     true,
+    "unused":       true,
+    "undef":        true,
+    "white":        false,
+    "yui":          true
 }
diff --git a/...ui/build/moodle-availability_completion-form/moodle-availability_completion-form-debug.js b/...ui/build/moodle-availability_completion-form/moodle-availability_completion-form-debug.js
@@ -34,7 +34,8 @@ M.availability_completion.form.getNode = function(json) {
         // String has already been escaped using format_string.
         html += '<option value="' + cm.id + '">' + cm.name + '</option>';
     }
-    html += '</select></label> <label><span class="accesshide">' + M.util.get_string('label_completion', 'availability_completion') +
+    html += '</select></label> <label><span class="accesshide">' +
+                M.util.get_string('label_completion', 'availability_completion') +
             ' </span><select name="e" title="' + M.util.get_string('label_completion', 'availability_completion') + '">' +
             '<option value="1">' + M.util.get_string('option_complete', 'availability_completion') + '</option>' +
             '<option value="0">' + M.util.get_string('option_incomplete', 'availability_completion') + '</option>' +

diff --git a/...tion/yui/build/moodle-availability_completion-form/moodle-availability_completion-form.js b/...tion/yui/build/moodle-availability_completion-form/moodle-availability_completion-form.js
@@ -34,7 +34,8 @@ M.availability_completion.form.getNode = function(json) {
         // String has already been escaped using format_string.
         html += '<option value="' + cm.id + '">' + cm.name + '</option>';
     }
-    html += '</select></label> <label><span class="accesshide">' + M.util.get_string('label_completion', 'availability_completion') +
+    html += '</select></label> <label><span class="accesshide">' +
+                M.util.get_string('label_completion', 'availability_completion') +
             ' </span><select name="e" title="' + M.util.get_string('label_completion', 'availability_completion') + '">' +
             '<option value="1">' + M.util.get_string('option_complete', 'availability_completion') + '</option>' +
             '<option value="0">' + M.util.get_string('option_incomplete', 'availability_completion') + '</option>' +

diff --git a/availability/condition/completion/yui/src/form/js/form.js b/availability/condition/completion/yui/src/form/js/form.js
@@ -32,7 +32,8 @@ M.availability_completion.form.getNode = function(json) {
         // String has already been escaped using format_string.
         html += '<option value="' + cm.id + '">' + cm.name + '</option>';
     }
-    html += '</select></label> <label><span class="accesshide">' + M.util.get_string('label_completion', 'availability_completion') +
+    html += '</select></label> <label><span class="accesshide">' +
+                M.util.get_string('label_completion', 'availability_completion') +
             ' </span><select name="e" title="' + M.util.get_string('label_completion', 'availability_completion') + '">' +
             '<option value="1">' + M.util.get_string('option_complete', 'availability_completion') + '</option>' +
             '<option value="0">' + M.util.get_string('option_incomplete', 'availability_completion') + '</option>' +

diff --git a/availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-debug.js b/availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-debug.js
@@ -731,6 +731,7 @@ M.core_availability.List.prototype.clickAdd = function() {
  */
 M.core_availability.List.prototype.getAddHandler = function(type, dialogRef) {
     return function() {
+        var newItem;
         if (type) {
             // Create an Item object to represent the child.
             newItem = new M.core_availability.Item({ type: type, creating: true }, this.root);
@@ -926,7 +927,7 @@ M.core_availability.Item = function(json, root) {
  * @return {Object} JavaScript object containing value of this item
  */
 M.core_availability.Item.prototype.getValue = function() {
-    value = { 'type' : this.pluginType };
+    var value = { 'type' : this.pluginType };
     if (this.plugin) {
         this.plugin.fillValue(value, this.pluginNode);
     }

diff --git a/availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-min.js b/availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-min.js
diff --git a/availability/yui/build/moodle-core_availability-form/moodle-core_availability-form.js b/availability/yui/build/moodle-core_availability-form/moodle-core_availability-form.js
@@ -731,6 +731,7 @@ M.core_availability.List.prototype.clickAdd = function() {
  */
 M.core_availability.List.prototype.getAddHandler = function(type, dialogRef) {
     return function() {
+        var newItem;
         if (type) {
             // Create an Item object to represent the child.
             newItem = new M.core_availability.Item({ type: type, creating: true }, this.root);
@@ -926,7 +927,7 @@ M.core_availability.Item = function(json, root) {
  * @return {Object} JavaScript object containing value of this item
  */
 M.core_availability.Item.prototype.getValue = function() {
-    value = { 'type' : this.pluginType };
+    var value = { 'type' : this.pluginType };
     if (this.plugin) {
         this.plugin.fillValue(value, this.pluginNode);
     }

diff --git a/availability/yui/src/form/js/form.js b/availability/yui/src/form/js/form.js
@@ -729,6 +729,7 @@ M.core_availability.List.prototype.clickAdd = function() {
  */
 M.core_availability.List.prototype.getAddHandler = function(type, dialogRef) {
     return function() {
+        var newItem;
         if (type) {
             // Create an Item object to represent the child.
             newItem = new M.core_availability.Item({ type: type, creating: true }, this.root);
@@ -924,7 +925,7 @@ M.core_availability.Item = function(json, root) {
  * @return {Object} JavaScript object containing value of this item
  */
 M.core_availability.Item.prototype.getValue = function() {
-    value = { 'type' : this.pluginType };
+    var value = { 'type' : this.pluginType };
     if (this.plugin) {
         this.plugin.fillValue(value, this.pluginNode);
     }

diff --git a/.../yui/build/moodle-block_navigation-navigation/moodle-block_navigation-navigation-debug.js b/.../yui/build/moodle-block_navigation-navigation/moodle-block_navigation-navigation-debug.js
@@ -435,7 +435,7 @@ Y.extend(TREE, Y.Base, TREE.prototype, {
  * @constructor
  * @extends Base
  */
-BRANCH = function() {
+var BRANCH = function() {
     BRANCH.superclass.constructor.apply(this, arguments);
 };
 BRANCH.prototype = {
@@ -634,7 +634,7 @@ BRANCH.prototype = {
 
         Y.io(M.cfg.wwwroot + ajaxfile, {
             method:'POST',
-            data:  build_querystring(params),
+            data:  params,
             on: {
                 complete: this.ajaxProcessResponse
             },
@@ -672,8 +672,10 @@ BRANCH.prototype = {
                         this.addChild(object.children[i]);
                     }
                 }
-                if ((this.get('type') === NODETYPE.CATEGORY || this.get('type') === NODETYPE.ROOTNODE || this.get('type') === NODETYPE.MYCATEGORY)
-                    && coursecount >= M.block_navigation.courselimit) {
+                if ((this.get('type') === NODETYPE.CATEGORY ||
+                     this.get('type') === NODETYPE.ROOTNODE ||
+                     this.get('type') === NODETYPE.MYCATEGORY)
+                     && coursecount >= M.block_navigation.courselimit) {
                     this.addViewAllCoursesChild(this);
                 }
                 Y.log('AJAX loading complete.', 'note', 'moodle-block_navigation');