Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 03:26:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #2529

Browse Source
This commit is contained in:
barisusakli
2014-12-19 18:58:28 -05:00
parent 1424acc88e
commit 14e46a87a6
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/api.js
View File

@@ -14,6 +14,7 @@ apiController.getConfig = function(req, res, next) {
var config = {}; var config = {};
config.relative_path = nconf.get('relative_path'); config.relative_path = nconf.get('relative_path');
config.socketioTransports = nconf.get('socket.io:transports') || ['websocket', 'polling']; config.socketioTransports = nconf.get('socket.io:transports') || ['websocket', 'polling'];
config.websocketAddress = nconf.get('socket.io:address') || '';
config.version = pkg.version; config.version = pkg.version;
config.siteTitle = meta.config.title || meta.config.browserTitle || 'NodeBB'; config.siteTitle = meta.config.title || meta.config.browserTitle || 'NodeBB';
config.showSiteTitle = parseInt(meta.config.showSiteTitle, 10) === 1; config.showSiteTitle = parseInt(meta.config.showSiteTitle, 10) === 1;
@@ -38,7 +39,6 @@ apiController.getConfig = function(req, res, next) {
config.disableChat = parseInt(meta.config.disableChat, 10) === 1; config.disableChat = parseInt(meta.config.disableChat, 10) === 1;
config.maxReconnectionAttempts = meta.config.maxReconnectionAttempts || 5; config.maxReconnectionAttempts = meta.config.maxReconnectionAttempts || 5;
config.reconnectionDelay = meta.config.reconnectionDelay || 200; config.reconnectionDelay = meta.config.reconnectionDelay || 200;
config.websocketAddress = meta.config.websocketAddress || '';
config.tagsPerTopic = meta.config.tagsPerTopic || 5; config.tagsPerTopic = meta.config.tagsPerTopic || 5;
config.topicsPerPage = meta.config.topicsPerPage || 20; config.topicsPerPage = meta.config.topicsPerPage || 20;
config.postsPerPage = meta.config.postsPerPage || 20; config.postsPerPage = meta.config.postsPerPage || 20;

7
src/views/admin/settings/sockets.tpl
View File

@@ -12,13 +12,6 @@
<label for="reconnectionDelay">Reconnection Delay</label> <label for="reconnectionDelay">Reconnection Delay</label>
<input class="form-control" id="reconnectionDelay" type="text" value="200" data-field="reconnectionDelay" /> <input class="form-control" id="reconnectionDelay" type="text" value="200" data-field="reconnectionDelay" />
</div> </div>
<div class="form-group">
<label for="websocketAddress">Websocket Address</label>
<input class="form-control" id="websocketAddress" type="text" data-field="websocketAddress" />
<p class="help-block">
Leave blank if unsure.
</p>
</div>
</form> </form>
</div> </div>
</div> </div>