bubblev
/
swagger-ui
4
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

merged pr for https://github.com/wordnik/swagger-js/pull/54

bubble
Tony Tam 11 years ago
parent
929f8b61f2
commit
3347d7e9fd
4 changed files with 97 additions and 119 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +17
    -28
      dist/lib/swagger.js
  2. +62
    -62
      dist/swagger-ui.js
  3. +1
    -1
      dist/swagger-ui.min.js
  4. +17
    -28
      lib/swagger.js

+ 17
- 28
dist/lib/swagger.js View File

@@ -1,10 +1,9 @@
// Generated by CoffeeScript 1.4.0
// Generated by CoffeeScript 1.6.3
(function() {
var ApiKeyAuthorization, PasswordAuthorization, SwaggerApi, SwaggerAuthorizations, SwaggerHttp, SwaggerModel, SwaggerModelProperty, SwaggerOperation, SwaggerRequest, SwaggerResource,
__bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };

SwaggerApi = (function() {

SwaggerApi.prototype.url = "http://api.wordnik.com/v4/resources.json";

SwaggerApi.prototype.debug = false;
@@ -110,6 +109,13 @@
}
}
}
if (response.basePath) {
this.basePath = response.basePath;
} else if (this.url.indexOf('?') > 0) {
this.basePath = this.url.substring(0, this.url.lastIndexOf('?'));
} else {
this.basePath = this.url;
}
if (isApi) {
newName = response.resourcePath.replace(/\//g, '');
this.resourcePath = response.resourcePath;
@@ -117,13 +123,6 @@
this.apis[newName] = res;
this.apisArray.push(res);
} else {
if (response.basePath) {
this.basePath = response.basePath;
} else if (this.url.indexOf('?') > 0) {
this.basePath = this.url.substring(0, this.url.lastIndexOf('?'));
} else {
this.basePath = this.url;
}
_ref2 = response.apis;
for (_k = 0, _len2 = _ref2.length; _k < _len2; _k++) {
resource = _ref2[_k];
@@ -162,6 +161,13 @@
}
}
}
if (response.basePath) {
this.basePath = response.basePath;
} else if (this.url.indexOf('?') > 0) {
this.basePath = this.url.substring(0, this.url.lastIndexOf('?'));
} else {
this.basePath = this.url;
}
if (isApi) {
newName = response.resourcePath.replace(/\//g, '');
this.resourcePath = response.resourcePath;
@@ -169,13 +175,6 @@
this.apis[newName] = res;
this.apisArray.push(res);
} else {
if (response.basePath) {
this.basePath = response.basePath;
} else if (this.url.indexOf('?') > 0) {
this.basePath = this.url.substring(0, this.url.lastIndexOf('?'));
} else {
this.basePath = this.url;
}
_ref2 = response.apis;
for (_k = 0, _len2 = _ref2.length; _k < _len2; _k++) {
resource = _ref2[_k];
@@ -222,7 +221,7 @@
for (resource_name in _ref) {
resource = _ref[resource_name];
for (modelName in resource.models) {
if (!(this.models[modelName] != null)) {
if (this.models[modelName] == null) {
this.models[modelName] = resource.models[modelName];
this.modelsArray.push(resource.models[modelName]);
}
@@ -262,7 +261,6 @@
})();

SwaggerResource = (function() {

SwaggerResource.prototype.api = null;

SwaggerResource.prototype.produces = null;
@@ -351,7 +349,7 @@
var model, modelName, swaggerModel, _i, _len, _ref, _results;
if (models != null) {
for (modelName in models) {
if (!(this.models[modelName] != null)) {
if (this.models[modelName] == null) {
swaggerModel = new SwaggerModel(modelName, models[modelName]);
this.modelsArray.push(swaggerModel);
this.models[modelName] = swaggerModel;
@@ -444,7 +442,6 @@
})();

SwaggerModel = (function() {

function SwaggerModel(modelName, obj) {
var prop, propertyName, value;
this.name = obj.id != null ? obj.id : modelName;
@@ -527,7 +524,6 @@
})();

SwaggerModelProperty = (function() {

function SwaggerModelProperty(name, obj) {
this.name = name;
this.dataType = obj.type || obj.dataType || obj["$ref"];
@@ -599,7 +595,6 @@
})();

SwaggerOperation = (function() {

function SwaggerOperation(nickname, path, method, parameters, summary, notes, type, responseMessages, resource, consumes, produces) {
var parameter, v, _i, _j, _k, _len, _len1, _len2, _ref, _ref1, _ref2, _ref3,
_this = this;
@@ -615,7 +610,6 @@
this.consumes = consumes;
this.produces = produces;
this["do"] = __bind(this["do"], this);

if (this.nickname == null) {
this.resource.api.fail("SwaggerOperations must have a nickname.");
}
@@ -915,7 +909,6 @@
})();

SwaggerRequest = (function() {

function SwaggerRequest(type, url, params, opts, successCallback, errorCallback, operation, execution) {
var body, e, fields, headers, key, myHeaders, name, obj, param, parent, possibleParams, requestContentType, responseContentType, urlEncoded, value, values,
_this = this;
@@ -1106,7 +1099,6 @@
})();

SwaggerHttp = (function() {

SwaggerHttp.prototype.Shred = null;

SwaggerHttp.prototype.shred = null;
@@ -1151,7 +1143,6 @@
})();

SwaggerAuthorizations = (function() {

SwaggerAuthorizations.prototype.authz = null;

function SwaggerAuthorizations() {
@@ -1179,7 +1170,6 @@
})();

ApiKeyAuthorization = (function() {

ApiKeyAuthorization.prototype.type = null;

ApiKeyAuthorization.prototype.name = null;
@@ -1210,7 +1200,6 @@
})();

PasswordAuthorization = (function() {

PasswordAuthorization.prototype.name = null;

PasswordAuthorization.prototype.username = null;


+ 62
- 62
dist/swagger-ui.js View File

@@ -1182,18 +1182,18 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};



// Generated by CoffeeScript 1.4.0
// Generated by CoffeeScript 1.6.3
(function() {
var ContentTypeView, HeaderView, MainView, OperationView, ParameterContentTypeView, ParameterView, ResourceView, ResponseContentTypeView, SignatureView, StatusCodeView, SwaggerUi,
var ContentTypeView, HeaderView, MainView, OperationView, ParameterContentTypeView, ParameterView, ResourceView, ResponseContentTypeView, SignatureView, StatusCodeView, SwaggerUi, _ref, _ref1, _ref10, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8, _ref9,
__hasProp = {}.hasOwnProperty,
__extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };

SwaggerUi = (function(_super) {

__extends(SwaggerUi, _super);

function SwaggerUi() {
return SwaggerUi.__super__.constructor.apply(this, arguments);
_ref = SwaggerUi.__super__.constructor.apply(this, arguments);
return _ref;
}

SwaggerUi.prototype.dom_id = "swagger_ui";
@@ -1215,7 +1215,7 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
this.dom_id = options.dom_id;
delete options.dom_id;
}
if (!($('#' + this.dom_id) != null)) {
if ($('#' + this.dom_id) == null) {
$('body').append('<div id="' + this.dom_id + '"></div>');
}
this.options = options;
@@ -1242,9 +1242,9 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
};

SwaggerUi.prototype.load = function() {
var url, _ref;
if ((_ref = this.mainView) != null) {
_ref.clear();
var url, _ref1;
if ((_ref1 = this.mainView) != null) {
_ref1.clear();
}
url = this.options.url;
if (url.indexOf("http") !== 0) {
@@ -1322,11 +1322,11 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
window.SwaggerUi = SwaggerUi;

HeaderView = (function(_super) {

__extends(HeaderView, _super);

function HeaderView() {
return HeaderView.__super__.constructor.apply(this, arguments);
_ref1 = HeaderView.__super__.constructor.apply(this, arguments);
return _ref1;
}

HeaderView.prototype.events = {
@@ -1384,21 +1384,21 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
})(Backbone.View);

MainView = (function(_super) {

__extends(MainView, _super);

function MainView() {
return MainView.__super__.constructor.apply(this, arguments);
_ref2 = MainView.__super__.constructor.apply(this, arguments);
return _ref2;
}

MainView.prototype.initialize = function() {};

MainView.prototype.render = function() {
var resource, _i, _len, _ref;
var resource, _i, _len, _ref3;
$(this.el).html(Handlebars.templates.main(this.model));
_ref = this.model.apisArray;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
resource = _ref[_i];
_ref3 = this.model.apisArray;
for (_i = 0, _len = _ref3.length; _i < _len; _i++) {
resource = _ref3[_i];
this.addResource(resource);
}
return this;
@@ -1424,23 +1424,23 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
})(Backbone.View);

ResourceView = (function(_super) {

__extends(ResourceView, _super);

function ResourceView() {
return ResourceView.__super__.constructor.apply(this, arguments);
_ref3 = ResourceView.__super__.constructor.apply(this, arguments);
return _ref3;
}

ResourceView.prototype.initialize = function() {};

ResourceView.prototype.render = function() {
var operation, _i, _len, _ref;
var operation, _i, _len, _ref4;
console.log(this.model.description);
$(this.el).html(Handlebars.templates.resource(this.model));
this.number = 0;
_ref = this.model.operationsArray;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
operation = _ref[_i];
_ref4 = this.model.operationsArray;
for (_i = 0, _len = _ref4.length; _i < _len; _i++) {
operation = _ref4[_i];
this.addOperation(operation);
}
return this;
@@ -1463,11 +1463,11 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
})(Backbone.View);

OperationView = (function(_super) {

__extends(OperationView, _super);

function OperationView() {
return OperationView.__super__.constructor.apply(this, arguments);
_ref4 = OperationView.__super__.constructor.apply(this, arguments);
return _ref4;
}

OperationView.prototype.events = {
@@ -1480,7 +1480,7 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
OperationView.prototype.initialize = function() {};

OperationView.prototype.render = function() {
var contentTypeModel, isMethodSubmissionSupported, param, responseContentTypeView, responseSignatureView, signatureModel, statusCode, type, _i, _j, _k, _len, _len1, _len2, _ref, _ref1, _ref2;
var contentTypeModel, isMethodSubmissionSupported, param, responseContentTypeView, responseSignatureView, signatureModel, statusCode, type, _i, _j, _k, _len, _len1, _len2, _ref5, _ref6, _ref7;
isMethodSubmissionSupported = true;
if (!isMethodSubmissionSupported) {
this.model.isReadOnly = true;
@@ -1505,9 +1505,9 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
};
contentTypeModel.consumes = this.model.consumes;
contentTypeModel.produces = this.model.produces;
_ref = this.model.parameters;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
param = _ref[_i];
_ref5 = this.model.parameters;
for (_i = 0, _len = _ref5.length; _i < _len; _i++) {
param = _ref5[_i];
type = param.type || param.dataType;
if (type.toLowerCase() === 'file') {
if (!contentTypeModel.consumes) {
@@ -1520,14 +1520,14 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
model: contentTypeModel
});
$('.response-content-type', $(this.el)).append(responseContentTypeView.render().el);
_ref1 = this.model.parameters;
for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
param = _ref1[_j];
_ref6 = this.model.parameters;
for (_j = 0, _len1 = _ref6.length; _j < _len1; _j++) {
param = _ref6[_j];
this.addParameter(param, contentTypeModel.consumes);
}
_ref2 = this.model.responseMessages;
for (_k = 0, _len2 = _ref2.length; _k < _len2; _k++) {
statusCode = _ref2[_k];
_ref7 = this.model.responseMessages;
for (_k = 0, _len2 = _ref7.length; _k < _len2; _k++) {
statusCode = _ref7[_k];
this.addStatusCode(statusCode);
}
return this;
@@ -1554,7 +1554,7 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
};

OperationView.prototype.submitOperation = function(e) {
var error_free, form, map, o, opts, val, _i, _j, _k, _len, _len1, _len2, _ref, _ref1, _ref2;
var error_free, form, map, o, opts, val, _i, _j, _k, _len, _len1, _len2, _ref5, _ref6, _ref7;
if (e != null) {
e.preventDefault();
}
@@ -1578,23 +1578,23 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
opts = {
parent: this
};
_ref = form.find("input");
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
o = _ref[_i];
_ref5 = form.find("input");
for (_i = 0, _len = _ref5.length; _i < _len; _i++) {
o = _ref5[_i];
if ((o.value != null) && jQuery.trim(o.value).length > 0) {
map[o.name] = o.value;
}
}
_ref1 = form.find("textarea");
for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
o = _ref1[_j];
_ref6 = form.find("textarea");
for (_j = 0, _len1 = _ref6.length; _j < _len1; _j++) {
o = _ref6[_j];
if ((o.value != null) && jQuery.trim(o.value).length > 0) {
map["body"] = o.value;
}
}
_ref2 = form.find("select");
for (_k = 0, _len2 = _ref2.length; _k < _len2; _k++) {
o = _ref2[_k];
_ref7 = form.find("select");
for (_k = 0, _len2 = _ref7.length; _k < _len2; _k++) {
o = _ref7[_k];
val = this.getSelectedValue(o);
if ((val != null) && jQuery.trim(val).length > 0) {
map[o.name] = val;
@@ -1612,14 +1612,14 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
};

OperationView.prototype.getSelectedValue = function(select) {
var opt, options, _i, _len, _ref;
var opt, options, _i, _len, _ref5;
if (!select.multiple) {
return select.value;
} else {
options = [];
_ref = select.options;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
opt = _ref[_i];
_ref5 = select.options;
for (_i = 0, _len = _ref5.length; _i < _len; _i++) {
opt = _ref5[_i];
if (opt.selected) {
options.push(opt.value);
}
@@ -1707,9 +1707,9 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
padding = '';
indent += transitions[fromTo];
padding = ((function() {
var _j, _ref, _results;
var _j, _ref5, _results;
_results = [];
for (j = _j = 0, _ref = indent; 0 <= _ref ? _j < _ref : _j > _ref; j = 0 <= _ref ? ++_j : --_j) {
for (j = _j = 0, _ref5 = indent; 0 <= _ref5 ? _j < _ref5 : _j > _ref5; j = 0 <= _ref5 ? ++_j : --_j) {
_results.push(' ');
}
return _results;
@@ -1774,11 +1774,11 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
})(Backbone.View);

StatusCodeView = (function(_super) {

__extends(StatusCodeView, _super);

function StatusCodeView() {
return StatusCodeView.__super__.constructor.apply(this, arguments);
_ref5 = StatusCodeView.__super__.constructor.apply(this, arguments);
return _ref5;
}

StatusCodeView.prototype.initialize = function() {};
@@ -1799,11 +1799,11 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
})(Backbone.View);

ParameterView = (function(_super) {

__extends(ParameterView, _super);

function ParameterView() {
return ParameterView.__super__.constructor.apply(this, arguments);
_ref6 = ParameterView.__super__.constructor.apply(this, arguments);
return _ref6;
}

ParameterView.prototype.initialize = function() {};
@@ -1880,11 +1880,11 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
})(Backbone.View);

SignatureView = (function(_super) {

__extends(SignatureView, _super);

function SignatureView() {
return SignatureView.__super__.constructor.apply(this, arguments);
_ref7 = SignatureView.__super__.constructor.apply(this, arguments);
return _ref7;
}

SignatureView.prototype.events = {
@@ -1949,11 +1949,11 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
})(Backbone.View);

ContentTypeView = (function(_super) {

__extends(ContentTypeView, _super);

function ContentTypeView() {
return ContentTypeView.__super__.constructor.apply(this, arguments);
_ref8 = ContentTypeView.__super__.constructor.apply(this, arguments);
return _ref8;
}

ContentTypeView.prototype.initialize = function() {};
@@ -1975,11 +1975,11 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
})(Backbone.View);

ResponseContentTypeView = (function(_super) {

__extends(ResponseContentTypeView, _super);

function ResponseContentTypeView() {
return ResponseContentTypeView.__super__.constructor.apply(this, arguments);
_ref9 = ResponseContentTypeView.__super__.constructor.apply(this, arguments);
return _ref9;
}

ResponseContentTypeView.prototype.initialize = function() {};
@@ -2001,11 +2001,11 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
})(Backbone.View);

ParameterContentTypeView = (function(_super) {

__extends(ParameterContentTypeView, _super);

function ParameterContentTypeView() {
return ParameterContentTypeView.__super__.constructor.apply(this, arguments);
_ref10 = ParameterContentTypeView.__super__.constructor.apply(this, arguments);
return _ref10;
}

ParameterContentTypeView.prototype.initialize = function() {};


+ 1
- 1
dist/swagger-ui.min.js
File diff suppressed because it is too large
View File


+ 17
- 28
lib/swagger.js View File

@@ -1,10 +1,9 @@
// Generated by CoffeeScript 1.4.0
// Generated by CoffeeScript 1.6.3
(function() {
var ApiKeyAuthorization, PasswordAuthorization, SwaggerApi, SwaggerAuthorizations, SwaggerHttp, SwaggerModel, SwaggerModelProperty, SwaggerOperation, SwaggerRequest, SwaggerResource,
__bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };

SwaggerApi = (function() {

SwaggerApi.prototype.url = "http://api.wordnik.com/v4/resources.json";

SwaggerApi.prototype.debug = false;
@@ -110,6 +109,13 @@
}
}
}
if (response.basePath) {
this.basePath = response.basePath;
} else if (this.url.indexOf('?') > 0) {
this.basePath = this.url.substring(0, this.url.lastIndexOf('?'));
} else {
this.basePath = this.url;
}
if (isApi) {
newName = response.resourcePath.replace(/\//g, '');
this.resourcePath = response.resourcePath;
@@ -117,13 +123,6 @@
this.apis[newName] = res;
this.apisArray.push(res);
} else {
if (response.basePath) {
this.basePath = response.basePath;
} else if (this.url.indexOf('?') > 0) {
this.basePath = this.url.substring(0, this.url.lastIndexOf('?'));
} else {
this.basePath = this.url;
}
_ref2 = response.apis;
for (_k = 0, _len2 = _ref2.length; _k < _len2; _k++) {
resource = _ref2[_k];
@@ -162,6 +161,13 @@
}
}
}
if (response.basePath) {
this.basePath = response.basePath;
} else if (this.url.indexOf('?') > 0) {
this.basePath = this.url.substring(0, this.url.lastIndexOf('?'));
} else {
this.basePath = this.url;
}
if (isApi) {
newName = response.resourcePath.replace(/\//g, '');
this.resourcePath = response.resourcePath;
@@ -169,13 +175,6 @@
this.apis[newName] = res;
this.apisArray.push(res);
} else {
if (response.basePath) {
this.basePath = response.basePath;
} else if (this.url.indexOf('?') > 0) {
this.basePath = this.url.substring(0, this.url.lastIndexOf('?'));
} else {
this.basePath = this.url;
}
_ref2 = response.apis;
for (_k = 0, _len2 = _ref2.length; _k < _len2; _k++) {
resource = _ref2[_k];
@@ -222,7 +221,7 @@
for (resource_name in _ref) {
resource = _ref[resource_name];
for (modelName in resource.models) {
if (!(this.models[modelName] != null)) {
if (this.models[modelName] == null) {
this.models[modelName] = resource.models[modelName];
this.modelsArray.push(resource.models[modelName]);
}
@@ -262,7 +261,6 @@
})();

SwaggerResource = (function() {

SwaggerResource.prototype.api = null;

SwaggerResource.prototype.produces = null;
@@ -351,7 +349,7 @@
var model, modelName, swaggerModel, _i, _len, _ref, _results;
if (models != null) {
for (modelName in models) {
if (!(this.models[modelName] != null)) {
if (this.models[modelName] == null) {
swaggerModel = new SwaggerModel(modelName, models[modelName]);
this.modelsArray.push(swaggerModel);
this.models[modelName] = swaggerModel;
@@ -444,7 +442,6 @@
})();

SwaggerModel = (function() {

function SwaggerModel(modelName, obj) {
var prop, propertyName, value;
this.name = obj.id != null ? obj.id : modelName;
@@ -527,7 +524,6 @@
})();

SwaggerModelProperty = (function() {

function SwaggerModelProperty(name, obj) {
this.name = name;
this.dataType = obj.type || obj.dataType || obj["$ref"];
@@ -599,7 +595,6 @@
})();

SwaggerOperation = (function() {

function SwaggerOperation(nickname, path, method, parameters, summary, notes, type, responseMessages, resource, consumes, produces) {
var parameter, v, _i, _j, _k, _len, _len1, _len2, _ref, _ref1, _ref2, _ref3,
_this = this;
@@ -615,7 +610,6 @@
this.consumes = consumes;
this.produces = produces;
this["do"] = __bind(this["do"], this);

if (this.nickname == null) {
this.resource.api.fail("SwaggerOperations must have a nickname.");
}
@@ -915,7 +909,6 @@
})();

SwaggerRequest = (function() {

function SwaggerRequest(type, url, params, opts, successCallback, errorCallback, operation, execution) {
var body, e, fields, headers, key, myHeaders, name, obj, param, parent, possibleParams, requestContentType, responseContentType, urlEncoded, value, values,
_this = this;
@@ -1106,7 +1099,6 @@
})();

SwaggerHttp = (function() {

SwaggerHttp.prototype.Shred = null;

SwaggerHttp.prototype.shred = null;
@@ -1151,7 +1143,6 @@
})();

SwaggerAuthorizations = (function() {

SwaggerAuthorizations.prototype.authz = null;

function SwaggerAuthorizations() {
@@ -1179,7 +1170,6 @@
})();

ApiKeyAuthorization = (function() {

ApiKeyAuthorization.prototype.type = null;

ApiKeyAuthorization.prototype.name = null;
@@ -1210,7 +1200,6 @@
})();

PasswordAuthorization = (function() {

PasswordAuthorization.prototype.name = null;

PasswordAuthorization.prototype.username = null;


Write Preview
Loading…
Cancel
Save