Update code style

version.php

@@ -27,7 +27,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = 'availability_ipaddress';
-$plugin->version = 2019051500;
+$plugin->version = 2019051501;
-$plugin->release = 'v3.5.0';
+$plugin->release = 'v3.5.1';
 $plugin->requires = 2016120500;
 $plugin->maturity = MATURITY_BETA;

yui/build/moodle-availability_ipaddress-form/moodle-availability_ipaddress-form-debug.js

@@ -55,6 +55,8 @@ M.availability_ipaddress.form.initInner = function() {
  * dot or comma).
  *
  * @method getValue
+ * @param {string} field
+ * @param {object} node
  * @return {Number|String} Value of field as number or string if not valid
  */
 M.availability_ipaddress.form.getValue = function(field, node) {
@@ -64,7 +66,7 @@ M.availability_ipaddress.form.getValue = function(field, node) {
     Y.log('ip_address:', value);
 
     // If it is not a valid positive number, return false.
-    if (M.availability_ipaddress.validate_ipaddress(value)) {
+    if (M.availability_ipaddress.validateIpaddress(value)) {
         Y.log('Valid ip-address');
         return value;
     }
@@ -74,8 +76,9 @@ M.availability_ipaddress.form.getValue = function(field, node) {
 };
 
 /**
- * getNode
+ * Get node
- * @param json
+ *
+ * @param {object} json
  * @returns {*}
  */
 M.availability_ipaddress.form.getNode = function(json) {
@@ -112,12 +115,12 @@ M.availability_ipaddress.form.getNode = function(json) {
 };
 
 /**
- * validate_ipaddress
+ * Validate ipaddresses
  *
  * @param {string[]} ipaddresses
  * @returns {boolean}
  */
-M.availability_ipaddress.validate_ipaddress = function(ipaddresses) {
+M.availability_ipaddress.validateIpaddress = function(ipaddresses) {
     'use strict';
 
     ipaddresses = ipaddresses.split(',');
@@ -159,7 +162,7 @@ M.availability_ipaddress.form.fillErrors = function(errors, node) {
     this.fillValue(value, node);
 
     // Basic ipaddresses checks.
-    if (M.availability_ipaddress.validate_ipaddress(value.ipaddresses) === false) {
+    if (M.availability_ipaddress.validateIpaddress(value.ipaddresses) === false) {
         errors.push('availability_ipaddress:error_ipaddress');
     }
 };

yui/build/moodle-availability_ipaddress-form/moodle-availability_ipaddress-form-min.js

@@ -1 +1 @@
-YUI.add("moodle-availability_ipaddress-form",function(e,t){M.availability_ipaddress=M.availability_ipaddress||{},M.availability_ipaddress.v4="(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(?:\\.(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])){3}",M.availability_ipaddress.v6="((?:[0-9a-fA-F]{1,4}:){7}(?:[0-9a-fA-F]{1,4}|:)|(?:[0-9a-fA-F]{1,4}:){6}(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(?:\\.(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])){3}|:[0-9a-fA-F]{1,4}|:)|(?:[0-9a-fA-F]{1,4}:){5}(?::(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(?:\\.(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])){3}|(:[0-9a-fA-F]{1,4}){1,2}|:)|(?:[0-9a-fA-F]{1,4}:){4}(?:(:[0-9a-fA-F]{1,4}){0,1}:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(?:\\.(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])){3}|(:[0-9a-fA-F]{1,4}){1,3}|:)|(?:[0-9a-fA-F]{1,4}:){3}(?:(:[0-9a-fA-F]{1,4}){0,2}:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(?:\\.(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])){3}|(:[0-9a-fA-F]{1,4}){1,4}|:)|(?:[0-9a-fA-F]{1,4}:){2}(?:(:[0-9a-fA-F]{1,4}){0,3}:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(?:\\.(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])){3}|(:[0-9a-fA-F]{1,4}){1,5}|:)|(?:[0-9a-fA-F]{1,4}:){1}(?:(:[0-9a-fA-F]{1,4}){0,4}:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(?:\\.(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])){3}|(:[0-9a-fA-F]{1,4}){1,6}|:)|(?::((?::[0-9a-fA-F]{1,4}){0,5}:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(?:\\.(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])){3}|(?::[0-9a-fA-F]{1,4}){1,7}|:)))(%[0-9a-zA-Z]{1,})?",M.availability_ipaddress.form=e.Object(M.core_availability.plugin),M.availability_ipaddress.form.initInner=function(){"use strict";},M.availability_ipaddress.form.getValue=function(e,t){"use strict";var n=t.one("input[name="+e+"]").get("value");return M.availability_ipaddress.validate_ipaddress(n)?n:n},M.availability_ipaddress.form.getNode=function(t){"use strict";var n,r,i,s;return s="ipaddresses"+M.availability_ipaddress.form.instId,M.availability_ipaddress.form.instId+=1,n="",n+='<span class="availability-group"><label for="'+s+'"><span class="p-r-1">'+M.util.get_string("title","availability_ipaddress")+" </span></label>",n+='<input type="text" placeholder="192.168.178.1,231.54.211.0/20,231.3.56.211" name="ipaddresses" id="'+s+'">',r=e.Node.create('<span class="form-inline">'+n+"</span>"),t.ipaddresses!==undefined&&r.one("input[name=ipaddresses]").set("value",t.ipaddresses),M.availability_ipaddress.form.addedEvents||(M.availability_ipaddress.form.addedEvents=!0,i=e.one(".availability-field"),i.delegate("valuechange",function(){M.core_availability.form.update()},".availability_ipaddress input[name=ipaddresses]")),r},M.availability_ipaddress.validate_ipaddress=function(e){"use strict";e=e.split(",");for(var t in e){if((new RegExp("(?:".concat(M.availability_ipaddress.v4,")|(?:").concat(M.availability_ipaddress.v6,")"),"g")).test(e[t]))continue;if((new RegExp("(?:".concat(M.availability_ipaddress.v4+"\\/(3[0-2]|[12]?[0-9])",")|(?:").concat(M.availability_ipaddress.v6+"\\/(12[0-8]|1[01][0-9]|[1-9]?[0-9])",")"),"g")).test(e[t]))continue;return!1}return!0},M.availability_ipaddress.form.fillValue=function(e,t){e.ipaddresses=this.getValue("ipaddresses",t)},M.availability_ipaddress.form.fillErrors=function(e,t){"use strict";var n={};this.fillValue(n,t),M.availability_ipaddress.validate_ipaddress(n.ipaddresses)===!1&&e.push("availability_ipaddress:error_ipaddress")}},"@VERSION@",{requires:["base","node","event","moodle-core_availability-form"]});
+YUI.add("moodle-availability_ipaddress-form",function(e,t){M.availability_ipaddress=M.availability_ipaddress||{},M.availability_ipaddress.v4="(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(?:\\.(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])){3}",M.availability_ipaddress.v6="((?:[0-9a-fA-F]{1,4}:){7}(?:[0-9a-fA-F]{1,4}|:)|(?:[0-9a-fA-F]{1,4}:){6}(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(?:\\.(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])){3}|:[0-9a-fA-F]{1,4}|:)|(?:[0-9a-fA-F]{1,4}:){5}(?::(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(?:\\.(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])){3}|(:[0-9a-fA-F]{1,4}){1,2}|:)|(?:[0-9a-fA-F]{1,4}:){4}(?:(:[0-9a-fA-F]{1,4}){0,1}:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(?:\\.(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])){3}|(:[0-9a-fA-F]{1,4}){1,3}|:)|(?:[0-9a-fA-F]{1,4}:){3}(?:(:[0-9a-fA-F]{1,4}){0,2}:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(?:\\.(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])){3}|(:[0-9a-fA-F]{1,4}){1,4}|:)|(?:[0-9a-fA-F]{1,4}:){2}(?:(:[0-9a-fA-F]{1,4}){0,3}:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(?:\\.(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])){3}|(:[0-9a-fA-F]{1,4}){1,5}|:)|(?:[0-9a-fA-F]{1,4}:){1}(?:(:[0-9a-fA-F]{1,4}){0,4}:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(?:\\.(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])){3}|(:[0-9a-fA-F]{1,4}){1,6}|:)|(?::((?::[0-9a-fA-F]{1,4}){0,5}:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(?:\\.(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])){3}|(?::[0-9a-fA-F]{1,4}){1,7}|:)))(%[0-9a-zA-Z]{1,})?",M.availability_ipaddress.form=e.Object(M.core_availability.plugin),M.availability_ipaddress.form.initInner=function(){"use strict";},M.availability_ipaddress.form.getValue=function(e,t){"use strict";var n=t.one("input[name="+e+"]").get("value");return M.availability_ipaddress.validateIpaddress(n)?n:n},M.availability_ipaddress.form.getNode=function(t){"use strict";var n,r,i,s;return s="ipaddresses"+M.availability_ipaddress.form.instId,M.availability_ipaddress.form.instId+=1,n="",n+='<span class="availability-group"><label for="'+s+'"><span class="p-r-1">'+M.util.get_string("title","availability_ipaddress")+" </span></label>",n+='<input type="text" placeholder="192.168.178.1,231.54.211.0/20,231.3.56.211" name="ipaddresses" id="'+s+'">',r=e.Node.create('<span class="form-inline">'+n+"</span>"),t.ipaddresses!==undefined&&r.one("input[name=ipaddresses]").set("value",t.ipaddresses),M.availability_ipaddress.form.addedEvents||(M.availability_ipaddress.form.addedEvents=!0,i=e.one(".availability-field"),i.delegate("valuechange",function(){M.core_availability.form.update()},".availability_ipaddress input[name=ipaddresses]")),r},M.availability_ipaddress.validateIpaddress=function(e){"use strict";e=e.split(",");for(var t in e){if((new RegExp("(?:".concat(M.availability_ipaddress.v4,")|(?:").concat(M.availability_ipaddress.v6,")"),"g")).test(e[t]))continue;if((new RegExp("(?:".concat(M.availability_ipaddress.v4+"\\/(3[0-2]|[12]?[0-9])",")|(?:").concat(M.availability_ipaddress.v6+"\\/(12[0-8]|1[01][0-9]|[1-9]?[0-9])",")"),"g")).test(e[t]))continue;return!1}return!0},M.availability_ipaddress.form.fillValue=function(e,t){e.ipaddresses=this.getValue("ipaddresses",t)},M.availability_ipaddress.form.fillErrors=function(e,t){"use strict";var n={};this.fillValue(n,t),M.availability_ipaddress.validateIpaddress(n.ipaddresses)===!1&&e.push("availability_ipaddress:error_ipaddress")}},"@VERSION@",{requires:["base","node","event","moodle-core_availability-form"]});

yui/build/moodle-availability_ipaddress-form/moodle-availability_ipaddress-form.js

@@ -54,6 +54,8 @@ M.availability_ipaddress.form.initInner = function() {
  * dot or comma).
  *
  * @method getValue
+ * @param {string} field
+ * @param {object} node
  * @return {Number|String} Value of field as number or string if not valid
  */
 M.availability_ipaddress.form.getValue = function(field, node) {
@@ -62,7 +64,7 @@ M.availability_ipaddress.form.getValue = function(field, node) {
     var value = node.one('input[name=' + field + ']').get('value');
 
     // If it is not a valid positive number, return false.
-    if (M.availability_ipaddress.validate_ipaddress(value)) {
+    if (M.availability_ipaddress.validateIpaddress(value)) {
         return value;
     }
 
@@ -70,8 +72,9 @@ M.availability_ipaddress.form.getValue = function(field, node) {
 };
 
 /**
- * getNode
+ * Get node
- * @param json
+ *
+ * @param {object} json
  * @returns {*}
  */
 M.availability_ipaddress.form.getNode = function(json) {
@@ -108,12 +111,12 @@ M.availability_ipaddress.form.getNode = function(json) {
 };
 
 /**
- * validate_ipaddress
+ * Validate ipaddresses
  *
  * @param {string[]} ipaddresses
  * @returns {boolean}
  */
-M.availability_ipaddress.validate_ipaddress = function(ipaddresses) {
+M.availability_ipaddress.validateIpaddress = function(ipaddresses) {
     'use strict';
 
     ipaddresses = ipaddresses.split(',');
@@ -153,7 +156,7 @@ M.availability_ipaddress.form.fillErrors = function(errors, node) {
     this.fillValue(value, node);
 
     // Basic ipaddresses checks.
-    if (M.availability_ipaddress.validate_ipaddress(value.ipaddresses) === false) {
+    if (M.availability_ipaddress.validateIpaddress(value.ipaddresses) === false) {
         errors.push('availability_ipaddress:error_ipaddress');
     }
 };

yui/src/form/js/form.js

@@ -53,6 +53,8 @@ M.availability_ipaddress.form.initInner = function() {
  * dot or comma).
  *
  * @method getValue
+ * @param {string} field
+ * @param {object} node
  * @return {Number|String} Value of field as number or string if not valid
  */
 M.availability_ipaddress.form.getValue = function(field, node) {
@@ -62,7 +64,7 @@ M.availability_ipaddress.form.getValue = function(field, node) {
     Y.log('ip_address:', value);
 
     // If it is not a valid positive number, return false.
-    if (M.availability_ipaddress.validate_ipaddress(value)) {
+    if (M.availability_ipaddress.validateIpaddress(value)) {
         Y.log('Valid ip-address');
         return value;
     }
@@ -72,8 +74,9 @@ M.availability_ipaddress.form.getValue = function(field, node) {
 };
 
 /**
- * getNode
+ * Get node
- * @param json
+ *
+ * @param {object} json
  * @returns {*}
  */
 M.availability_ipaddress.form.getNode = function(json) {
@@ -110,12 +113,12 @@ M.availability_ipaddress.form.getNode = function(json) {
 };
 
 /**
- * validate_ipaddress
+ * Validate ipaddresses
  *
  * @param {string[]} ipaddresses
  * @returns {boolean}
  */
-M.availability_ipaddress.validate_ipaddress = function(ipaddresses) {
+M.availability_ipaddress.validateIpaddress = function(ipaddresses) {
     'use strict';
 
     ipaddresses = ipaddresses.split(',');
@@ -157,7 +160,7 @@ M.availability_ipaddress.form.fillErrors = function(errors, node) {
     this.fillValue(value, node);
 
     // Basic ipaddresses checks.
-    if (M.availability_ipaddress.validate_ipaddress(value.ipaddresses) === false) {
+    if (M.availability_ipaddress.validateIpaddress(value.ipaddresses) === false) {
         errors.push('availability_ipaddress:error_ipaddress');
     }
 };