[02/10] fauxton commit: updated refs/heads/2158-changes-filter to b1121db

[ro...@apache.org]

we can add tooltips to a filter


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/65a4a3fb
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/65a4a3fb
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/65a4a3fb

Branch: refs/heads/2158-changes-filter
Commit: 65a4a3fbd9090344a50bc2898367586e3fcd459e
Parents: b254d84
Author: Robert Kowalski <ro...@kowalski.gd>
Authored: Thu May 29 15:44:38 2014 +0200
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Thu Jul 17 19:13:37 2014 +0200

----------------------------------------------------------------------
 app/addons/fauxton/components.js           | 13 +++++++++++++
 app/addons/fauxton/templates/filter.html   |  4 ++++
 app/addons/fauxton/tests/filterViewSpec.js | 13 +++++++++++++
 3 files changed, 30 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/65a4a3fb/app/addons/fauxton/components.js
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/components.js b/app/addons/fauxton/components.js
index 2ff90b6..7f81144 100644
--- a/app/addons/fauxton/components.js
+++ b/app/addons/fauxton/components.js
@@ -368,12 +368,19 @@ function(app, FauxtonAPI, ace, spin) {
 
     initialize: function (options) {
       this.eventNamespace = options.eventNamespace;
+      this.tooltipText = options.tooltipText;
     },
 
     events: {
       "submit .js-filter-form": "filterItems"
     },
 
+    serialize: function () {
+      return {
+        tooltipText: this.tooltipText
+      };
+    },
+
     filterItems: function (event) {
       event.preventDefault();
       var $filter = this.$('input[name="filter"]'),
@@ -391,6 +398,12 @@ function(app, FauxtonAPI, ace, spin) {
       })).render();
 
       $filter.val('');
+    },
+
+    afterRender: function () {
+      if (this.tooltipText) {
+        this.$el.find(".js-filter-tooltip").tooltip();
+      }
     }
   });
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/65a4a3fb/app/addons/fauxton/templates/filter.html
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/templates/filter.html b/app/addons/fauxton/templates/filter.html
index 8e2a37e..f7bc7c7 100644
--- a/app/addons/fauxton/templates/filter.html
+++ b/app/addons/fauxton/templates/filter.html
@@ -18,6 +18,10 @@ the License.
     <button type="submit" class="btn btn-primary">Filter</button>
     <div class="help-block">
       <strong> Eg. debug or <1.4.1> or any regex </strong>
+      <% if (tooltipText) { %>
+        <i class="js-filter-tooltip icon icon-question-sign" data-toggle="tooltip"
+          title="" data-original-title="<%- tooltipText %>"></i>
+      <% } %>
     </div>
   </fieldset>
 </form>

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/65a4a3fb/app/addons/fauxton/tests/filterViewSpec.js
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/tests/filterViewSpec.js b/app/addons/fauxton/tests/filterViewSpec.js
index df75ca7..1eefa05 100644
--- a/app/addons/fauxton/tests/filterViewSpec.js
+++ b/app/addons/fauxton/tests/filterViewSpec.js
@@ -65,5 +65,18 @@ define([
       filterView.$('.js-filter-form').submit();
       assert.equal(0, filterView.$('.js-remove-filter').length);
     });
+
+    it('should not add tooltips by default', function () {
+      assert.equal(0, filterView.$('.js-filter-tooltip').length);
+    });
+
+    it('should add tooltips when a text for it is defined', function () {
+      filterView = new Components.FilterView({
+        eventNamespace: 'mynamespace',
+        tooltipText: 'ente ente'
+      });
+      viewSandbox.renderView(filterView);
+      assert.equal(1, filterView.$('.js-filter-tooltip').length);
+    });
   });
 });