diff --git a/plugins/UiConfig/media/js/ConfigStorage.coffee b/plugins/UiConfig/media/js/ConfigStorage.coffee index fda06864..bb0297fe 100644 --- a/plugins/UiConfig/media/js/ConfigStorage.coffee +++ b/plugins/UiConfig/media/js/ConfigStorage.coffee @@ -71,6 +71,8 @@ class ConfigStorage extends Class key: "tor_use_bridges" type: "checkbox" description: "Use obfuscated bridge relays to avoid network level Tor block (even slower)" + isHidden: -> + return not Page.server_info.tor_has_meek_bridges section.items.push title: "Trackers" diff --git a/plugins/UiConfig/media/js/UiConfig.coffee b/plugins/UiConfig/media/js/UiConfig.coffee index 1bdd6756..4ee3a1c6 100644 --- a/plugins/UiConfig/media/js/UiConfig.coffee +++ b/plugins/UiConfig/media/js/UiConfig.coffee @@ -14,6 +14,8 @@ class UiConfig extends ZeroFrame onOpenWebsocket: => @cmd("wrapperSetTitle", "Config - ZeroNet") + @cmd "serverInfo", {}, (server_info) => + @server_info = server_info @restart_loading = false @updateConfig() diff --git a/plugins/UiConfig/media/js/all.js b/plugins/UiConfig/media/js/all.js index 50b69c2a..2baeb7c8 100644 --- a/plugins/UiConfig/media/js/all.js +++ b/plugins/UiConfig/media/js/all.js @@ -1383,7 +1383,10 @@ title: "Use Tor bridges", key: "tor_use_bridges", type: "checkbox", - description: "Use obfuscated bridge relays to avoid network level Tor block (even slower)" + description: "Use obfuscated bridge relays to avoid network level Tor block (even slower)", + isHidden: function() { + return !Page.server_info.tor_has_meek_bridges; + } }); section.items.push({ title: "Trackers", @@ -1450,6 +1453,7 @@ }).call(this); + /* ---- plugins/UiConfig/media/js/ConfigView.coffee ---- */ @@ -1701,6 +1705,11 @@ UiConfig.prototype.onOpenWebsocket = function() { this.cmd("wrapperSetTitle", "Config - ZeroNet"); + this.cmd("serverInfo", {}, (function(_this) { + return function(server_info) { + return _this.server_info = server_info; + }; + })(this)); this.restart_loading = false; return this.updateConfig(); }; @@ -1882,4 +1891,4 @@ window.Page.createProjector(); -}).call(this); +}).call(this); \ No newline at end of file diff --git a/src/Config.py b/src/Config.py index b91638c5..7b728cb8 100644 --- a/src/Config.py +++ b/src/Config.py @@ -13,7 +13,7 @@ class Config(object): def __init__(self, argv): self.version = "0.6.4" - self.rev = 3746 + self.rev = 3747 self.argv = argv self.action = None self.pending_changes = {}