fixed code cleanup that was removing empty "if" leaving "else"
parent
4bc538933d
commit
db3ec5d51e
|
@ -85,7 +85,11 @@
|
|||
|
||||
|
||||
{{## def.cleanUp:
|
||||
{{ out = out.replace(/if\s*\([^)]+\)\s*\{\s*\}/g, ''); }}
|
||||
{{
|
||||
out = out.replace(/if\s*\([^)]+\)\s*\{\s*\}\s*else\s*{\s*}/g, '')
|
||||
.replace(/if\s*\([^)]+\)\s*\{\s*\}(?!\s*else)/g, '')
|
||||
.replace(/if\s*\(([^)]+)\)\s*\{\s*\}\s*else(?!\s*if)/g, 'if (!($1))');
|
||||
}}
|
||||
#}}
|
||||
|
||||
|
||||
|
|
|
@ -17,16 +17,16 @@
|
|||
var {{=$errs}} = validate.errors.length;
|
||||
|
||||
{{## def.checkPropertyDeps:
|
||||
({{~ $deps:$dep:$i }}
|
||||
{{?$i}} && {{?}}
|
||||
{{=$data}}{{= it.util.getProperty($dep) }} !== undefined
|
||||
{{~}})
|
||||
{{~ $deps:$dep:$i }}
|
||||
{{?$i}} || {{?}}
|
||||
{{=$data}}{{= it.util.getProperty($dep) }} === undefined
|
||||
{{~}}
|
||||
#}}
|
||||
|
||||
{{ for ($property in $propertyDeps) { }}
|
||||
if ({{=$data}}{{= it.util.getProperty($property) }} !== undefined) {
|
||||
{{ $deps = $propertyDeps[$property]; }}
|
||||
if (! {{# def.checkPropertyDeps }} )
|
||||
if ({{# def.checkPropertyDeps }})
|
||||
{{# def.error:'dependencies' }}
|
||||
{{# def.elseIfValid }}
|
||||
}
|
||||
|
|
|
@ -2,14 +2,14 @@
|
|||
{{# def.setup:'required' }}
|
||||
|
||||
{{## def.checkRequired:
|
||||
({{~ $schema:$property:$i }}
|
||||
{{? $i}} && {{?}}
|
||||
{{=$data}}{{= it.util.getProperty($property) }} !== undefined
|
||||
{{~}})
|
||||
{{~ $schema:$property:$i }}
|
||||
{{? $i}} || {{?}}
|
||||
{{=$data}}{{= it.util.getProperty($property) }} === undefined
|
||||
{{~}}
|
||||
#}}
|
||||
|
||||
{{? $schema.length <= 100 }}
|
||||
if (! {{# def.checkRequired }})
|
||||
if ({{# def.checkRequired }})
|
||||
{{# def.error:'required' }}
|
||||
{{? $breakOnError }} else { {{?}}
|
||||
{{??}}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "ajv",
|
||||
"version": "0.3.11",
|
||||
"version": "0.3.12",
|
||||
"description": "Another JSON schema Validator",
|
||||
"main": "lib/ajv.js",
|
||||
"scripts": {
|
||||
|
|
Loading…
Reference in New Issue