Skip to content

Merged from develop_2.0 #1278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 13, 2015
Merged

Merged from develop_2.0 #1278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
082dc47
fixed MainView for ES5 browser.
bloodyowl May 13, 2015
0aa3ff3
Merge pull request #1277 from bloodyowl/fix.es5
fehguy May 13, 2015
96e73d0
updated versions for patch release
fehguy May 13, 2015
28c63cc
merged
fehguy May 13, 2015
666246c
rebuilt
fehguy May 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "swagger-ui",
"main": "dist/index.html",
"version": "2.1.3-M2",
"version": "2.1.4-M2",
"authors": [
"Mohsen Azimi <me@azimi.me>"
],
Expand Down
4 changes: 2 additions & 2 deletions dist/swagger-ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* swagger-ui - Swagger UI is a dependency-free collection of HTML, JavaScript, and CSS assets that dynamically generate beautiful documentation from a Swagger-compliant API
* @version v2.1.3-M2
* @version v2.1.4-M2
* @link http://swagger.io
* @license Apache 2.0
*/
Expand Down Expand Up @@ -20891,7 +20891,7 @@ SwaggerUi.Views.MainView = Backbone.View.extend({
} else {

// Default validator
if(window.location.protocol.startsWith('http')) {
if(window.location.protocol.indexOf('http') === 0) {
this.model.validatorUrl = window.location.protocol + '//online.swagger.io/validator';
}
}
Expand Down
2 changes: 1 addition & 1 deletion dist/swagger-ui.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}
],
"description": "Swagger UI is a dependency-free collection of HTML, JavaScript, and CSS assets that dynamically generate beautiful documentation from a Swagger-compliant API",
"version": "2.1.3-M2",
"version": "2.1.4-M2",
"homepage": "http://swagger.io",
"license": "Apache 2.0",
"main": "dist/swagger-ui.js",
Expand Down
2 changes: 1 addition & 1 deletion src/main/javascript/view/MainView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ SwaggerUi.Views.MainView = Backbone.View.extend({
} else {

// Default validator
if(window.location.protocol.startsWith('http')) {
if(window.location.protocol.indexOf('http') === 0) {
this.model.validatorUrl = window.location.protocol + '//online.swagger.io/validator';
}
}
Expand Down