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

closed #375 - now asking socket.io to connect to "current page" instead of hardcoded url, removed api_url and "socket" section from public config

Browse Source
This commit is contained in:
Julian Lam
2013-10-03 11:34:15 -04:00
parent f173a79a0d
commit 948949c571
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/app.js
View File

@@ -17,7 +17,7 @@ var socket,
socket.socket.connect(); socket.socket.connect();
}, 200); }, 200);
} else { } else {
socket = io.connect(config.socket.address); socket = io.connect(RELATIVE_PATH);
var reconnecting = false, var reconnecting = false,
reconnectEl, reconnectTimer; reconnectEl, reconnectTimer;

10
public/templates/admin/testing/categories.tpl
View File

@@ -9,25 +9,25 @@ jQuery(document).ready(function () {
QUnit.init(); QUnit.init();
asyncTest( "Loading Categories", function() { asyncTest( "Loading Categories", function() {
jQuery.get(RELATIVE_PATH + '/api/home', function(data) { jQuery.get(RELATIVE_PATH + '/api/home', function(data) {
ok( data.categories.length > 0, JSON.stringify(data.categories) ); ok( data.categories.length > 0, JSON.stringify(data.categories) );
start(); start();
for (var i = 0, ii = data.categories.length; i < ii; i++) { for (var i = 0, ii = data.categories.length; i < ii; i++) {
var category = data.categories[i], var category = data.categories[i],
slug = 'category/' + category.slug; slug = 'category/' + category.slug;
asyncTest( "Loading Category '" + category.name + "' located at " + slug, function() { asyncTest( "Loading Category '" + category.name + "' located at " + slug, function() {
jQuery.get(config.api_url + slug, function(data) { jQuery.get(RELATIVE_PATH + '/api/' + slug, function(data) {
ok( data.category_name, JSON.stringify(data) ); //todo: check this against data.categories ok( data.category_name, JSON.stringify(data) ); //todo: check this against data.categories
start(); start();
}); });
}); });
} }
}); });
}); });
QUnit.start(); QUnit.start();
}); });

4
src/install.js
View File

@@ -81,10 +81,6 @@ var async = require('async'),
protocol = urlObject.protocol, protocol = urlObject.protocol,
server_conf = config, server_conf = config,
client_conf = { client_conf = {
socket: {
address: protocol + '//' + host + (config.use_port ? ':' + config.port : '')
},
api_url: protocol + '//' + host + (config.use_port ? ':' + config.port : '') + relative_path + '/api/',
relative_path: relative_path relative_path: relative_path
}; };