You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ro...@apache.org on 2014/07/17 19:14:19 UTC
[07/10] fauxton commit: updated refs/heads/2158-changes-filter to
b1121db
rename js-log-filter-form to js-filter-form
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/cf9114d3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/cf9114d3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/cf9114d3
Branch: refs/heads/2158-changes-filter
Commit: cf9114d3035173f930e1a39ecae3ef68e5acab42
Parents: 263d328
Author: Robert Kowalski <ro...@kowalski.gd>
Authored: Thu May 29 15:31:07 2014 +0200
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Thu Jul 17 19:13:37 2014 +0200
----------------------------------------------------------------------
app/addons/fauxton/components.js | 4 ++--
app/addons/fauxton/templates/filter.html | 2 +-
app/addons/fauxton/tests/filterViewSpec.js | 10 +++++-----
assets/less/fauxton.less | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/cf9114d3/app/addons/fauxton/components.js
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/components.js b/app/addons/fauxton/components.js
index de633f3..1853ece 100644
--- a/app/addons/fauxton/components.js
+++ b/app/addons/fauxton/components.js
@@ -371,10 +371,10 @@ function(app, FauxtonAPI, ace, spin) {
},
events: {
- "submit .js-log-filter-form": "filterLogs"
+ "submit .js-filter-form": "filterItems"
},
- filterLogs: function (event) {
+ filterItems: function (event) {
event.preventDefault();
var $filter = this.$('input[name="filter"]'),
filter = $.trim($filter.val());
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/cf9114d3/app/addons/fauxton/templates/filter.html
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/templates/filter.html b/app/addons/fauxton/templates/filter.html
index 7c3a33c..00d7fe1 100644
--- a/app/addons/fauxton/templates/filter.html
+++ b/app/addons/fauxton/templates/filter.html
@@ -12,7 +12,7 @@ License for the specific language governing permissions and limitations under
the License.
-->
-<form class="form-inline js-log-filter-form">
+<form class="form-inline js-filter-form">
<fieldset>
<input type="text" name="filter" placeholder="Type a filter">
<button type="submit" class="btn">Filter</button>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/cf9114d3/app/addons/fauxton/tests/filterViewSpec.js
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/tests/filterViewSpec.js b/app/addons/fauxton/tests/filterViewSpec.js
index 7bfd0a6..df75ca7 100644
--- a/app/addons/fauxton/tests/filterViewSpec.js
+++ b/app/addons/fauxton/tests/filterViewSpec.js
@@ -42,18 +42,18 @@ define([
it('should add filter markup', function () {
filterView.$('[name="filter"]').val('i was a lonely filter');
- filterView.$('.js-log-filter-form').submit();
+ filterView.$('.js-filter-form').submit();
filterView.$('[name="filter"]').val('i am a filter');
- filterView.$('.js-log-filter-form').submit();
+ filterView.$('.js-filter-form').submit();
assert.equal(2, filterView.$('.js-remove-filter').length);
});
it('should remove filter markup', function () {
filterView.$('[name="filter"]').val('i was a lonely filter');
- filterView.$('.js-log-filter-form').submit();
+ filterView.$('.js-filter-form').submit();
filterView.$('[name="filter"]').val('i am a filter');
- filterView.$('.js-log-filter-form').submit();
+ filterView.$('.js-filter-form').submit();
filterView.$('.js-remove-filter').click();
@@ -62,7 +62,7 @@ define([
it('should not add empty filters', function () {
filterView.$('[name="filter"]').val('');
- filterView.$('.js-log-filter-form').submit();
+ filterView.$('.js-filter-form').submit();
assert.equal(0, filterView.$('.js-remove-filter').length);
});
});
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/cf9114d3/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/assets/less/fauxton.less b/assets/less/fauxton.less
index be517e6..68499ad 100644
--- a/assets/less/fauxton.less
+++ b/assets/less/fauxton.less
@@ -906,7 +906,7 @@ div.spinner {
}
}
-.js-log-filter-form {
+.js-filter-form {
ul {
margin-left: 0px;
}