fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #459 from cweider/fix-common-code 

Account for more spaces and Windows paths. This fixes #456.
This commit is contained in:
Chad Weider 2012-02-16 14:21:51 -08:00
parent 9ca914f8cd 1063a3d036
commit 2bc07204f8
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
node/utils/common_code.js
View File

@ -15,8 +15,10 @@
*/ */
var RequireKernel = require('require-kernel/'); var RequireKernel = require('require-kernel/');
var path = require('path');
var CLIENT_JS_SRC = __dirname + '/../../static/js/'; var CLIENT_JS_SRC = path.normalize(__dirname + '/../../static/js/');
var client_require = RequireKernel.requireForPaths('file://' + CLIENT_JS_SRC); var client_require = RequireKernel.requireForPaths(
'file://' + (CLIENT_JS_SRC.charAt(0) == '/' ? '' : '/') + encodeURI(CLIENT_JS_SRC));
exports.require = client_require; exports.require = client_require;

2
package.json
View File

@ -10,7 +10,7 @@
"name": "Robin Buse" } "name": "Robin Buse" }
], ],
"dependencies" : { "dependencies" : {
"require-kernel" : "1.0.2", "require-kernel" : "1.0.3",
"socket.io" : "0.8.7", "socket.io" : "0.8.7",
"ueberDB" : "0.1.7", "ueberDB" : "0.1.7",
"async" : "0.1.15", "async" : "0.1.15",