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

Merge branch 'develop_2.0' into JSONEditor

Browse Source 
Conflicts:
	dist/index.html
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	src/main/coffeescript/view/MainView.coffee
	src/main/coffeescript/view/OperationView.coffee
	src/main/coffeescript/view/ParameterView.coffee
	src/main/coffeescript/view/ResourceView.coffee
	src/main/coffeescript/view/SignatureView.coffee
	src/main/html/index.html
This commit is contained in:
laurent lepinay
2015-03-24 07:06:07 -07:00
parent 447b905132 0a6f913b1a
commit e7b7465335
76 changed files with 34309 additions and 8132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/lib/jquery-1.8.0.min.js vendored
View File

File diff suppressed because one or more lines are too long

18359
dist/lib/swagger-client.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/lib/swagger-oauth.js vendored
View File

@@ -202,7 +202,7 @@ function initOAuth(opts) {
});
}
function processOAuthCode(data) {
window.processOAuthCode = function processOAuthCode(data) {
var params = {
'client_id': clientId,
'code': data.code,
@@ -225,7 +225,7 @@ function processOAuthCode(data) {
});
}
function onOAuthComplete(token) {
window.onOAuthComplete = function onOAuthComplete(token) {
if(token) {
if(token.error) {
var checkbox = $('input[type=checkbox],.secured')