diff --git a/examples/standalone/server.js b/examples/standalone/server.js index 6ef8dfe..a4983c0 100644 --- a/examples/standalone/server.js +++ b/examples/standalone/server.js @@ -1,5 +1,5 @@ -var webservice = require('../lib/webservice'), - demoModule = require('./modules/demoModule'), +var webservice = require('../../lib/webservice'), + demoModule = require('../sample_modules/demoModule'), colors = require('colors'); webservice.createServer(demoModule).listen(8080); diff --git a/lib/createRouter.js b/lib/createRouter.js index f798a11..dcfa81c 100644 --- a/lib/createRouter.js +++ b/lib/createRouter.js @@ -276,6 +276,12 @@ var createMetaRoutes = exports.createMetaRoutes = function (module, routes){ } var JSONPWRAP = exports.JSONPWRAP = function(namespace, data) { + + // only do JSONPWRAP if callback don't have any special character + if (!namespace.match(/^[\w-]+$/)) + return data; + + return 'function ' + namespace + '() {\ return "' + data + '"\ }'; diff --git a/package.json b/package.json index e271ae1..11f40ba 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,8 @@ "main": "./lib/webservice", "dependencies": { "journey": "= 0.4.0-pre", - "colors": ">= 0.5.0" + "colors": ">= 0.5.0", + "eyes": "0.1.x" }, "devDependencies" : { "vows": "0.5.x",