chaosrouter
Advanced tools
Comparing version 0.2.8 to 0.2.9
@@ -93,15 +93,4 @@ | ||
function getDirectives(data) { | ||
var directives = {}; | ||
for (var k in data) { | ||
if (k.indexOf(ChaosRouter.directivePrefix) === 0) { | ||
directives[k.slice(2)] = data[k]; | ||
delete data[k]; | ||
} | ||
} | ||
return directives; | ||
} | ||
var directives = {}; | ||
var validates = []; | ||
var validateKey = ChaosRouter.directivePrefix+'validate'; | ||
var validates = data[validateKey] || []; | ||
for (var i in segs) { | ||
@@ -145,11 +134,20 @@ var seg = segs[i]; | ||
} | ||
// Attach the parent validations to this layer | ||
if(directives.validate) { | ||
data['#_validate'] = directives.validate.concat( data['#_validate'] || [] ); | ||
} | ||
directives = getDirectives(data); | ||
// Add this level's validates to validations list | ||
if(data[validateKey]) | ||
validates.splice(validates.length-1, 0, data[validateKey]); | ||
} | ||
last_seg = seg; | ||
} | ||
var directives = {}; | ||
for (var k in data) { | ||
if (k.indexOf(ChaosRouter.directivePrefix) === 0) { | ||
var name = k.slice(ChaosRouter.directivePrefix.length); | ||
directives[name] = data[k]; | ||
delete data[k]; | ||
} | ||
} | ||
if (directives['base'] === undefined) | ||
@@ -156,0 +154,0 @@ var config = extend({}, data); |
{ | ||
"name": "chaosrouter", | ||
"version": "0.2.8", | ||
"version": "0.2.9", | ||
"description": "ERROR: No README data found!", | ||
@@ -5,0 +5,0 @@ "main": "chaosrouter.js", |
18639
5
614