diff --git a/.gitignore b/.gitignore index f7e3e31..0cad18c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ test/dummy/log/*.log test/dummy/tmp/ test/dummy/.sass-cache swagger_engine-*.gem +.idea/ diff --git a/app/assets/images/swagger_engine/.keep b/app/assets/images/swagger_engine/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/app/assets/javascripts/swagger_engine/application.js b/app/assets/javascripts/swagger_engine/application.js index 3995a3d..c9dd82c 100644 --- a/app/assets/javascripts/swagger_engine/application.js +++ b/app/assets/javascripts/swagger_engine/application.js @@ -1,11 +1,11 @@ -//= require 'swagger_engine/lib/jquery-1.8.0.min.js' -//= require 'swagger_engine/lib/jquery.slideto.min.js' -//= require 'swagger_engine/lib/jquery.wiggle.min.js' -//= require 'swagger_engine/lib/jquery.ba-bbq.min.js' -//= require 'swagger_engine/lib/handlebars-2.0.0.js' -//= require 'swagger_engine/lib/underscore-min.js' -//= require 'swagger_engine/lib/backbone-min.js' -//= require 'swagger_engine/swagger-ui.js' -//= require 'swagger_engine/lib/highlight.7.3.pack.js' -//= require 'swagger_engine/lib/marked.js' -//= require 'swagger_engine/lib/swagger-oauth.js' +//= require ./lib/jquery-1.8.0.min.js +//= require ./lib/jquery.slideto.min.js +//= require ./lib/jquery.wiggle.min.js +//= require ./lib/jquery.ba-bbq.min.js +//= require ./lib/handlebars-2.0.0.js +//= require ./lib/underscore-min.js +//= require ./lib/backbone-min.js +//= require ./lib/highlight.7.3.pack.js +//= require ./lib/marked.js +//= require ./lib/swagger-oauth.js +//= require ./swagger-ui.js diff --git a/app/assets/javascripts/swagger_engine/lib/swagger-oauth.js b/app/assets/javascripts/swagger_engine/lib/swagger-oauth.js index fed588c..50603be 100644 --- a/app/assets/javascripts/swagger_engine/lib/swagger-oauth.js +++ b/app/assets/javascripts/swagger_engine/lib/swagger-oauth.js @@ -5,6 +5,8 @@ var clientId; var realm; var oauth2KeyName; var redirect_uri; +var clientSecret; +var scopeSeparator; function handleLogin() { var scopes = []; @@ -40,6 +42,7 @@ function handleLogin() { appName = window.swaggerUi.api.info.title; } + $('.api-popup-dialog').remove(); popupDialog = $( [ '