You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2014/08/26 18:24:12 UTC
[3/7] fauxton commit: updated refs/heads/master to 6c9a5a6
Api bar improvements
If the api bar is visible and a user clicks elsewhere it closes.
Also use correct icons
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/ab8004d1
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/ab8004d1
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/ab8004d1
Branch: refs/heads/master
Commit: ab8004d10ffa35e3e5fa263c8bbcac2b8b34c81d
Parents: a94f56f
Author: Garren Smith <ga...@gmail.com>
Authored: Thu Aug 21 13:18:22 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Tue Aug 26 18:23:44 2014 +0200
----------------------------------------------------------------------
app/addons/fauxton/base.js | 41 +++++++++++++++++++++-----
app/addons/fauxton/templates/api_bar.html | 6 ++--
assets/less/fauxton.less | 1 +
assets/less/variables.less | 1 -
4 files changed, 38 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ab8004d1/app/addons/fauxton/base.js
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/base.js b/app/addons/fauxton/base.js
index 8b88d36..a961b8b 100644
--- a/app/addons/fauxton/base.js
+++ b/app/addons/fauxton/base.js
@@ -264,19 +264,45 @@ function(app, FauxtonAPI, resizeColumns, Components, ZeroClipboard) {
endpoint: '_all_docs',
documentation: 'docs',
+ apiBarVisible: false,
events: {
"click .api-url-btn" : "toggleAPIbar"
},
+
+ initialize: function () {
+ var that = this;
+
+ $('body').on('click.apibar',function(e) {
+ if (!that.apiBarVisible) { return;}
+ if ($(e.target).hasClass('.api-url-btn')) { return;}
+
+ if (!$(e.target).closest('.api-navbar').length){
+ that.hideAPIbar();
+ }
+ });
+ },
- toggleAPIbar: function(e){
- var $currentTarget = $(e.currentTarget).find('span');
- if ($currentTarget.hasClass("fonticon-plus")){
- $currentTarget.removeClass("fonticon-plus").addClass("fonticon-minus");
- }else{
- $currentTarget.removeClass("fonticon-minus").addClass("fonticon-plus");
+ cleanup: function () {
+ $('body').off('click.apibar');
+ },
+
+ hideAPIbar: function () {
+ this.$('.api-navbar').hide();
+ this.apiBarVisible = false;
+ },
+
+ toggleAPIbar: function(event){
+ event.preventDefault();
+ event.stopPropagation();
+
+ if (this.apiBarVisible) {
+ this.apiBarVisible = false;
+ } else {
+ this.apiBarVisible = true;
}
- $('.api-navbar').toggle();
+ this.$('.api-navbar').toggle();
+ console.log('ap', this.apiBarVisible);
},
serialize: function() {
@@ -287,6 +313,7 @@ function(app, FauxtonAPI, resizeColumns, Components, ZeroClipboard) {
},
hide: function(){
+ this.apiBarVisible = false;
this.$el.addClass('hide');
},
show: function(){
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ab8004d1/app/addons/fauxton/templates/api_bar.html
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/templates/api_bar.html b/app/addons/fauxton/templates/api_bar.html
index f56741c..3f29223 100644
--- a/app/addons/fauxton/templates/api_bar.html
+++ b/app/addons/fauxton/templates/api_bar.html
@@ -14,7 +14,7 @@ the License.
<button class="btn btn-primary pull-right api-url-btn">
API URL
- <i class="fonticon-plus icon"></i>
+ <i class="fonticon-link icon"></i>
</button>
<div class="clearfix"></div>
<div class="api-navbar" style="display: none">
@@ -27,12 +27,12 @@ the License.
</span>
<input id="api-url-text" type="text" class="input-xxlarge" value="<%- endpoint %>">
<a class="btn copy-url" data-clipboard-target="api-url-text">
- <i class="fonticon-eye icon"></i>
+ <i class="fonticon-clipboard icon"></i>
Copy
</a>
<div class="add-on">
- <a data-bypass="true" href="<%- endpoint %>" target="_blank" class="btn">
+ <a data-bypass="true" href="<%- endpoint %>" target="_blank" class="btn btn-primary">
<i class="fonticon-eye icon"></i>
View JSON
</a>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ab8004d1/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/assets/less/fauxton.less b/assets/less/fauxton.less
index 93afce6..04eeb22 100644
--- a/assets/less/fauxton.less
+++ b/assets/less/fauxton.less
@@ -930,6 +930,7 @@ div.spinner {
.border-radius(5px 0 0 5px);
border: none;
padding: 9px;
+ font-size: 18px;
-moz-transition: background-color 100ms linear;
-webkit-transition: background-color 100ms linear;
transition: background-color 100ms linear;
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ab8004d1/assets/less/variables.less
----------------------------------------------------------------------
diff --git a/assets/less/variables.less b/assets/less/variables.less
index d3ea957..f66f257 100644
--- a/assets/less/variables.less
+++ b/assets/less/variables.less
@@ -83,4 +83,3 @@
@baseBorderRadius: 0;
@transitionSpeed: .25s;
@transitionEaseType: linear;
-