Fixing documentcloud#27: Broken filter matches when typing a colon. F…

…allout from turning VS into an instance-based script. Needed correct options callback.
johncongdon · Nov 24, 2011 · c2ab97d · c2ab97d
1 parent ad86cce
commit c2ab97d
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 7 deletions.
diff --git a/build-min/dependencies.js.gz b/build-min/dependencies.js.gz
diff --git a/build-min/visualsearch.js b/build-min/visualsearch.js
diff --git a/build-min/visualsearch.js.gz b/build-min/visualsearch.js.gz
diff --git a/build-min/visualsearch_templates.js.gz b/build-min/visualsearch_templates.js.gz
diff --git a/build/visualsearch.js b/build/visualsearch.js
@@ -1178,7 +1178,12 @@ VS.ui.SearchInput = Backbone.View.extend({
     } else if (VS.app.hotkeys.colon(e)) {
       this.box.trigger('resize.autogrow', e);
       var query    = this.box.val();
-      var prefixes = this.options.callbacks.facetMatches() || [];
+      var prefixes = [];
+      if (this.app.options.callbacks.facetMatches) {
+          this.app.options.callbacks.facetMatches(function(p) {
+              prefixes = p;
+          });
+      }
       var labels   = _.map(prefixes, function(prefix) {
         if (prefix.label) return prefix.label;
         else              return prefix;

diff --git a/demo.html b/demo.html
@@ -184,7 +184,7 @@ <h2 id="demo">Demo <span class="demo-hint"><i>Try searching for: <b>account</b>,
 
     <script type="text/javascript" charset="utf-8">
       $(document).ready(function() {
-        var visualSearch = VS.init({
+        window.visualSearch = VS.init({
           container  : $('#search_box_container'),
           query      : 'country: "South Africa" account: 5-samuel title: "Pentagon Papers"',
           // query      : '',

diff --git a/lib/js/views/search_input.js b/lib/js/views/search_input.js
@@ -296,7 +296,12 @@ VS.ui.SearchInput = Backbone.View.extend({
     } else if (VS.app.hotkeys.colon(e)) {
       this.box.trigger('resize.autogrow', e);
       var query    = this.box.val();
-      var prefixes = this.options.callbacks.facetMatches() || [];
+      var prefixes = [];
+      if (this.app.options.callbacks.facetMatches) {
+          this.app.options.callbacks.facetMatches(function(p) {
+              prefixes = p;
+          });
+      }
       var labels   = _.map(prefixes, function(prefix) {
         if (prefix.label) return prefix.label;
         else              return prefix;