oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix reset file server port with config web interface

Browse source
This commit is contained in:
shortcutme 2020-06-30 17:04:09 +02:00
parent 635c3b27cd
commit ddbd5c7b19
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
5 changed files with 33 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
plugins/UiConfig/media/js/all.js
View file

@ -1336,6 +1336,14 @@
}
if (type === "boolean" && !value) {
return false;
} else if (type === "number") {
if (typeof value === "number") {
return value.toString();
} else if (!value) {
return "0";
} else {
return value;
}
} else {
return value;
}
@ -1379,7 +1387,7 @@
title: "File server port",
type: "text",
valid_pattern: /[0-9]*/,
description: "Other peers will use this port to reach your served sites. (default: 15441)"
description: "Other peers will use this port to reach your served sites. (default: randomize)"
});
section.items.push({
key: "ip_external",
@ -1616,7 +1624,6 @@
}).call(this);
/* ---- ConfigView.coffee ---- */
@ -1934,17 +1941,16 @@
};
UiConfig.prototype.saveValues = function(cb) {
var base, changed_values, i, item, j, last, len, match, message, results, value, value_same_as_default;
var base, changed_values, default_value, i, item, j, last, len, match, message, results, value, value_same_as_default;
changed_values = this.getValuesChanged();
results = [];
for (i = j = 0, len = changed_values.length; j < len; i = ++j) {
item = changed_values[i];
last = i === changed_values.length - 1;
value = this.config_storage.deformatValue(item.value, typeof this.config[item.key]["default"]);
value_same_as_default = JSON.stringify(this.config[item.key]["default"]) === JSON.stringify(value);
if (value_same_as_default) {
value = null;
}
default_value = this.config_storage.deformatValue(this.config[item.key]["default"], typeof this.config[item.key]["default"]);
this.log("default check:", JSON.stringify(default_value), "==", JSON.stringify(value));
value_same_as_default = JSON.stringify(default_value) === JSON.stringify(value);
if (this.config[item.key].item.valid_pattern && !(typeof (base = this.config[item.key].item).isHidden === "function" ? base.isHidden() : void 0)) {
match = value.match(this.config[item.key].item.valid_pattern);
if (!match || match[0] !== value) {
@ -1954,6 +1960,9 @@
break;
}
}
if (value_same_as_default) {
value = null;
}
results.push(this.saveValue(item.key, value, last ? cb : null));
}
return results;
@ -2054,4 +2063,4 @@
window.Page.createProjector();
}).call(this);
}).call(this);