kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13 from ayush/master

Browse Source 
now using basePath returned by the apis
This commit is contained in:
fehguy
2012-02-19 20:52:17 -08:00
parent 9d12605517 04dad6d23d
commit eb9e31eb89
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/javascripts/swagger-service.js
View File

@@ -72,9 +72,12 @@ function SwaggerService(discoveryUrl, _apiKey, statusCallback) {
this.modelList = ApiModel.sub();
},
addApis: function(apiObjects) {
addApis: function(apiObjects, basePath) {
// log("apiObjects: %o", apiObjects);
this.apiList.createAll(apiObjects);
this.apiList.each(function(api) {
api.setBaseUrl(basePath);
});
},
addModel: function(modelObject) {
@@ -92,8 +95,6 @@ function SwaggerService(discoveryUrl, _apiKey, statusCallback) {
init: function(atts) {
if (atts) this.load(atts);
this.baseUrl = globalBasePath;
var secondPathSeperatorIndex = this.path.indexOf("/", 1);
if (secondPathSeperatorIndex > 0) {
var prefix = this.path.substr(0, secondPathSeperatorIndex);
@@ -138,6 +139,13 @@ function SwaggerService(discoveryUrl, _apiKey, statusCallback) {
},
setBaseUrl: function(u) {
this.baseUrl = u;
this.operations.each(function(o) {
o.baseUrl = u;
});
},
toString: function() {
var opsString = "";
for (var i = 0; i < this.operations.all().length; i++) {
@@ -159,7 +167,6 @@ function SwaggerService(discoveryUrl, _apiKey, statusCallback) {
init: function(atts) {
if (atts) this.load(atts);
this.baseUrl = globalBasePath;
this.httpMethodLowercase = this.httpMethod.toLowerCase();
var value = this.parameters;
@@ -396,8 +403,8 @@ function SwaggerService(discoveryUrl, _apiKey, statusCallback) {
$.getJSON(url + apiKeySuffix, function(response) {
})
.success(function(response) {
globalBasePath = url.substr(0, url.lastIndexOf("/"));
log("Setting globalBasePath to " + globalBasePath);
log("Setting globalBasePath to " + response.basePath);
globalBasePath = response.basePath;
ApiResource.createAll(response.apis);
controller.fetchResources(response.basePath);
})
@@ -429,7 +436,7 @@ function SwaggerService(discoveryUrl, _apiKey, statusCallback) {
var controller = this;
updateStatus("Fetching " + apiResource.name + "...");
var resourceUrl = globalBasePath + apiResource.path_json + apiKeySuffix;
// log("resourceUrl: %o", resourceUrl);
log("resourceUrl: %o", resourceUrl);
$.getJSON(resourceUrl,
function(response) {
controller.loadResources(response, apiResource);
@@ -440,9 +447,9 @@ function SwaggerService(discoveryUrl, _apiKey, statusCallback) {
try {
this.countLoaded++;
// log(response);
// if (response.apis) {
apiResource.addApis(response.apis);
// }
if (response.apis) {
apiResource.addApis(response.apis, response.basePath);
}
// updateStatus("Parsed Apis");
//log(response.models);
if (response.models) {