From 695dcc16b1b1245ac12d14b36c4e0b3ead170161 Mon Sep 17 00:00:00 2001 From: Vladimir L Date: Thu, 11 Jun 2015 21:14:15 +0200 Subject: [PATCH] fixed issue with OAuth hint --- lib/swagger-oauth.js | 6 +-- src/main/html/css/screen.css | 30 +++++++----- src/main/javascript/view/OperationView.js | 6 +-- src/main/less/screen.less | 58 +++++++++++++---------- src/main/template/operation.handlebars | 6 +-- 5 files changed, 60 insertions(+), 46 deletions(-) diff --git a/lib/swagger-oauth.js b/lib/swagger-oauth.js index fed588c6..1d4e4899 100644 --- a/lib/swagger-oauth.js +++ b/lib/swagger-oauth.js @@ -240,7 +240,7 @@ window.onOAuthComplete = function onOAuthComplete(token) { if(b){ // if all roles are satisfied var o = null; - $.each($('.auth #api_information_panel'), function(k, v) { + $.each($('.auth .api-ic .api_information_panel'), function(k, v) { var children = v; if(children && children.childNodes) { var requiredScopes = []; @@ -257,7 +257,7 @@ window.onOAuthComplete = function onOAuthComplete(token) { } } if(diff.length > 0){ - o = v.parentNode; + o = v.parentNode.parentNode; $(o.parentNode).find('.api-ic.ic-on').addClass('ic-off'); $(o.parentNode).find('.api-ic.ic-on').removeClass('ic-on'); @@ -266,7 +266,7 @@ window.onOAuthComplete = function onOAuthComplete(token) { $(o).find('.api-ic').removeClass('ic-error'); } else { - o = v.parentNode; + o = v.parentNode.parentNode; $(o.parentNode).find('.api-ic.ic-off').addClass('ic-on'); $(o.parentNode).find('.api-ic.ic-off').removeClass('ic-off'); diff --git a/src/main/html/css/screen.css b/src/main/html/css/screen.css index d6ed90bb..436cc28e 100644 --- a/src/main/html/css/screen.css +++ b/src/main/html/css/screen.css @@ -1155,8 +1155,16 @@ .swagger-section .auth { float: right; } -.swagger-section #api_information_panel { - position: absolute; +.swagger-section .api-ic { + height: 18px; + vertical-align: middle; + display: inline-block; + background: url(../images/explorer_icons.png) no-repeat; +} +.swagger-section .api-ic .api_information_panel { + position: relative; + margin-top: 20px; + margin-left: -5px; background: #FFF; border: 1px solid #ccc; border-radius: 5px; @@ -1167,34 +1175,32 @@ color: black; padding: 5px; } -.swagger-section #api_information_panel p .api-msg-enabled { +.swagger-section .api-ic .api_information_panel p .api-msg-enabled { color: green; } -.swagger-section #api_information_panel p .api-msg-disabled { +.swagger-section .api-ic .api_information_panel p .api-msg-disabled { color: red; } -.swagger-section .api-ic { - height: 18px; - vertical-align: middle; - display: inline-block; - background: url(../images/explorer_icons.png) no-repeat; +.swagger-section .api-ic:hover .api_information_panel { + position: absolute; + display: block; } .swagger-section .ic-info { background-position: 0 0; width: 18px; - margin-top: -7px; + margin-top: -6px; margin-left: 4px; } .swagger-section .ic-warning { background-position: -60px 0; width: 18px; - margin-top: -7px; + margin-top: -6px; margin-left: 4px; } .swagger-section .ic-error { background-position: -30px 0; width: 18px; - margin-top: -7px; + margin-top: -6px; margin-left: 4px; } .swagger-section .ic-off { diff --git a/src/main/javascript/view/OperationView.js b/src/main/javascript/view/OperationView.js index d58e87e8..196228ab 100644 --- a/src/main/javascript/view/OperationView.js +++ b/src/main/javascript/view/OperationView.js @@ -33,7 +33,7 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({ range.moveToElementText(text); range.select(); } else if (window.getSelection) { - selection = window.getSelection(); + selection = window.getSelection(); range = document.createRange(); range.selectNodeContents(text); selection.removeAllRanges(); @@ -72,11 +72,11 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({ pos.top = y; pos.left = x; elem.css(pos); - $(e.currentTarget.parentNode).find('#api_information_panel').show(); + // $(e.currentTarget.parentNode).find('#api_information_panel').show(); }, mouseExit: function(e) { - $(e.currentTarget.parentNode).find('#api_information_panel').hide(); + // $(e.currentTarget.parentNode).find('#api_information_panel').hide(); }, // Note: copied from CoffeeScript compiled file diff --git a/src/main/less/screen.less b/src/main/less/screen.less index 4867dcc7..356fbb9a 100644 --- a/src/main/less/screen.less +++ b/src/main/less/screen.less @@ -12,50 +12,58 @@ float: right; } -#api_information_panel { - position: absolute; - background: #FFF; - border: 1px solid #ccc; - border-radius: 5px; - display: none; - font-size: 13px; - max-width: 300px; - line-height: 30px; - color: black; - padding: 5px; - p { - .api-msg-enabled { - color: green; - } - .api-msg-disabled { - color: red; - } - } -} - .api-ic { height: 18px; vertical-align: middle; display: inline-block; background: url(../images/explorer_icons.png) no-repeat; + .api_information_panel { + position: relative; + margin-top: 20px; + margin-left: -5px; + background: #FFF; + border: 1px solid #ccc; + border-radius: 5px; + display: none; + font-size: 13px; + max-width: 300px; + line-height: 30px; + color: black; + padding: 5px; + p { + .api-msg-enabled { + color: green; + } + .api-msg-disabled { + color: red; + } + } + } +} + +.api-ic:hover { + .api_information_panel { + position: absolute; + display: block; + } } .ic-info { background-position: 0 0; width: 18px; - margin-top: -7px; + margin-top: -6px; margin-left: 4px; } .ic-warning { background-position: -60px 0; width: 18px; - margin-top: -7px; + margin-top: -6px; margin-left: 4px; } .ic-error { background-position: -30px 0; width: 18px; - margin-top: -7px; + margin-top: -6px; margin-left: 4px; } .ic-off { @@ -136,4 +144,4 @@ padding-top: 10px; } -} \ No newline at end of file +} diff --git a/src/main/template/operation.handlebars b/src/main/template/operation.handlebars index 832e1359..4d50312b 100644 --- a/src/main/template/operation.handlebars +++ b/src/main/template/operation.handlebars @@ -26,15 +26,15 @@ {{/if}} {{#oauth}}
- {{/oauth}} + {{/oauth}} {{#each oauth}} - {{/oauth}} + {{#oauth}}
{{/oauth}} {{#oauth}}