Comparing version 1.3.16 to 1.3.17
{ | ||
"name": "bones", | ||
"description": "Framework for using backbone.js on the client and server.", | ||
"version": "1.3.16", | ||
"version": "1.3.17", | ||
@@ -6,0 +6,0 @@ "author": { |
@@ -56,3 +56,3 @@ var Backbone = require('./backbone'); | ||
this.server.get(route, function(req, res, next) { | ||
var fragment = (req.query && req.query['_escaped_fragment_']) || req.url; | ||
var fragment = (req.query && req.query['_escaped_fragment_']) || req.url.replace(/[#?].*$/, ''); | ||
var args = controller._extractParameters(route, fragment); | ||
@@ -59,0 +59,0 @@ var context = Object.create(controller, { req: { value: req }, res: { value: res } }); |
@@ -56,3 +56,3 @@ var path = require('path'); | ||
module.exports.register = function(app) { | ||
if (app.assets) { | ||
if (app.assets && !(/\.server\._$/.test(filename))) { | ||
app.assets.templates.push({ | ||
@@ -59,0 +59,0 @@ filename: filename, |
@@ -15,2 +15,20 @@ var Bones = Bones || {}; | ||
// Multifetch. Pass a hash of models and fetch each in parallel. | ||
Bones.utils.fetch = function(models, callback) { | ||
var remaining = _(models).size(); | ||
var error = null; | ||
_(models).each(function(model) { | ||
model.fetch({ | ||
success: function() { | ||
if (--remaining === 0) callback(error, models); | ||
}, | ||
error: function(m, err) { | ||
if (!error) error = err; | ||
model.error = err; | ||
if (--remaining === 0) callback(error, models); | ||
} | ||
}); | ||
}); | ||
}; | ||
// From https://github.com/visionmedia/lingo/blob/master/lib/languages/en.js | ||
@@ -17,0 +35,0 @@ Bones.utils.uncountable = [ 'advice', 'enegery', 'excretion', 'digestion', |
@@ -112,1 +112,19 @@ process.env.NODE_ENV = 'test'; | ||
}; | ||
exports['/assets/bones/templates.js'] = function() { | ||
assert.response(server, { | ||
url: '/assets/bones/templates.js', | ||
method: 'GET' | ||
}, { status: 200 }, function(res) { | ||
assert.ok(res.body.indexOf(require('bones/test/fixture/templates/Error._').toString()) >= 0); | ||
assert.ok(res.body.indexOf(require('bones/test/fixture/node_modules/othermodule/templates/Other._').toString()) >= 0); | ||
// Doesn't include server files. | ||
assert.ok(res.body.indexOf(require('bones/test/fixture/templates/ServerSide.server._').toString()) < 0); | ||
// Correct order. | ||
assert.ok(res.body.indexOf('// ---- start test/fixture/templates/Error._ ----') >= 0); | ||
assert.ok(res.body.indexOf('// ---- start test/fixture/templates/Error._ ----') > | ||
res.body.indexOf('// ---- start test/fixture/node_modules/othermodule/templates/Other._ ----')); | ||
}); | ||
}; |
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Environment variable access
Supply chain riskPackage accesses environment variables, which may be a sign of credential stuffing or data theft.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
173422
92
1858
21