Commit 363830cf authored by Boris Kocherov's avatar Boris Kocherov

remove callback trees

parent 5c7e7eaf
......@@ -111,14 +111,16 @@
full_schema,
base_url
);
}).push(function (referencedx) {
})
.push(function (referencedx) {
extend(expanded_json_schema, referencedx);
delete expanded_json_schema.$ref;
return true;
});
}
return true;
}).push(function () {
})
.push(function () {
var property, queue = RSVP.Queue();
......@@ -222,11 +224,11 @@
})
.declareMethod("validateJSONForSoftwareType", function (schema_url, software_type, generated_json) {
var base_url = getBaseUrl(schema_url);
return getJSON(schema_url)
.push(function (json_object) {
var parameter_schema_url,
st,
base_url = getBaseUrl(schema_url);
st;
for (st in json_object["software-type"]) {
if (json_object["software-type"].hasOwnProperty(st)) {
......@@ -236,14 +238,14 @@
}
}
return getJSON(parameter_schema_url, base_url)
return getJSON(parameter_schema_url, base_url);
})
.push(function (schema) {
return expandSchema(schema, schema, base_url)
return expandSchema(schema, schema, base_url);
})
.push(function (loaded_json) {
return tv4.validateMultiple(generated_json, loaded_json);
});
});
});
})
.declareMethod("validateJSON", function (schema_url, generated_json) {
......@@ -251,10 +253,10 @@
.push(function (schema) {
var base_url = getBaseUrl(schema_url);
return expandSchema(schema, schema, base_url)
})
.push(function (loaded_schema) {
return tv4.validateMultiple(generated_json, loaded_schema);
});
});
});
}(window, rJS, RSVP, URI, jIO, tv4));
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment