From 67b684d58f3192835c906f47f29159323dd3084a Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Wed, 6 Feb 2013 16:37:59 +0100
Subject: [PATCH] Hide filters and fields by default

---
 css/multiview.css          |  5 +++++
 src/view.multiview.js      |  2 +-
 src/widget.fields.js       | 23 ++---------------------
 src/widget.filtereditor.js |  4 +---
 4 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/css/multiview.css b/css/multiview.css
index 4e7fbf20..bb18abec 100644
--- a/css/multiview.css
+++ b/css/multiview.css
@@ -98,6 +98,7 @@
 
 .recline-filter-editor {
   padding: 8px;
+  display: none;
 }
 
 .recline-filter-editor .filter-term a {
@@ -115,6 +116,10 @@
   * Fields Widget
   *********************************************************/
 
+.recline-fields-view {
+  display: none;
+}
+
 .recline-fields-view .fields-list {
   padding: 0;
 }
diff --git a/src/view.multiview.js b/src/view.multiview.js
index 28eb67e7..83897c82 100644
--- a/src/view.multiview.js
+++ b/src/view.multiview.js
@@ -112,7 +112,7 @@ my.MultiView = Backbone.View.extend({
       <div class="menu-right"> \
         <div class="btn-group" data-toggle="buttons-checkbox"> \
           {{#sidebarViews}} \
-          <a href="#" data-action="{{id}}" class="btn active">{{label}}</a> \
+          <a href="#" data-action="{{id}}" class="btn">{{label}}</a> \
           {{/sidebarViews}} \
         </div> \
       </div> \
diff --git a/src/widget.fields.js b/src/widget.fields.js
index 645ba055..30155dc6 100644
--- a/src/widget.fields.js
+++ b/src/widget.fields.js
@@ -38,7 +38,7 @@ my.Fields = Backbone.View.extend({
             </small> \
           </h4> \
         </div> \
-        <div id="collapse{{id}}" class="accordion-body collapse in"> \
+        <div id="collapse{{id}}" class="accordion-body collapse"> \
           <div class="accordion-inner"> \
             {{#facets}} \
             <div class="facet-summary" data-facet="{{id}}"> \
@@ -57,9 +57,6 @@ my.Fields = Backbone.View.extend({
     </div> \
   ',
 
-  events: {
-    'click .js-show-hide': 'onShowHide'
-  },
   initialize: function(model) {
     var self = this;
     this.el = $(this.el);
@@ -77,6 +74,7 @@ my.Fields = Backbone.View.extend({
       self.model.getFieldsSummary();
       self.render();
     });
+    this.el.find('.collapse').collapse();
     this.render();
   },
   render: function() {
@@ -91,23 +89,6 @@ my.Fields = Backbone.View.extend({
     });
     var templated = Mustache.render(this.template, tmplData);
     this.el.html(templated);
-    this.el.find('.collapse').collapse('hide');
-  },
-  onShowHide: function(e) {
-    e.preventDefault();
-    var $target  = $(e.target);
-    // weird collapse class seems to have been removed (can watch this happen
-    // if you watch dom) but could not work why. Absence of collapse then meant
-    // we could not toggle.
-    // This seems to fix the problem.
-    this.el.find('.accordion-body').addClass('collapse');;
-    if ($target.text() === '+') {
-      this.el.find('.collapse').collapse('show');
-      $target.text('-');
-    } else {
-      this.el.find('.collapse').collapse('hide');
-      $target.text('+');
-    }
   }
 });
 
diff --git a/src/widget.filtereditor.js b/src/widget.filtereditor.js
index 28c80bb3..09864963 100644
--- a/src/widget.filtereditor.js
+++ b/src/widget.filtereditor.js
@@ -123,8 +123,6 @@ my.FilterEditor = Backbone.View.extend({
     var filterType = $target.find('select.filterType').val();
     var field      = $target.find('select.fields').val();
     this.model.queryState.addFilter({type: filterType, field: field});
-    // trigger render explicitly as queryState change will not be triggered (as blank value for filter)
-    this.render();
   },
   onRemoveFilter: function(e) {
     e.preventDefault();
@@ -141,7 +139,7 @@ my.FilterEditor = Backbone.View.extend({
       var $input = $(input);
       var filterType  = $input.attr('data-filter-type');
       var fieldId     = $input.attr('data-filter-field');
-      var filterIndex = parseInt($input.attr('data-filter-id'));
+      var filterIndex = parseInt($input.attr('data-filter-id'), 10);
       var name        = $input.attr('name');
       var value       = $input.val();