change to use director instead of jquery.dispatch.js and improve live…

… search handling
caolan · Jun 15, 2012 · bc9036a · bc9036a
1 parent 674578c
commit bc9036a
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 39 deletions.
diff --git a/js/director.min.js b/js/director.min.js
diff --git a/js/jquery.dispatch.min.js b/js/jquery.dispatch.min.js
diff --git a/ui/app.js b/ui/app.js
@@ -1,11 +1,15 @@
 exports.init = function (url) {
-    $.dispatch({
-        '':         require('./views/home'),
-        '/':        require('./views/home'),
-        '/signup':  require('./views/signup'),
-        '/login':   require('./views/login'),
-        '/login/:next':   require('./views/login'),
-        '/profile/:id':   require('./views/profile')
+    var router = Router({
+        '/':          require('./views/home'),
+        '/search/*':  require('./views/home'),
+        '/signup':    require('./views/signup'),
+        '/login':     require('./views/login'),
+        '/login/*':   require('./views/login'),
+        '/profile/*': require('./views/profile')
     });
-    $(window).trigger('hashchange');
+    router.init();
+    if (!window.location.hash || window.location.hash === '#') {
+        window.location = '#/';
+        $(window).trigger('hashchange');
+    }
 };
diff --git a/ui/views/home.js b/ui/views/home.js
@@ -4,32 +4,58 @@ var templates = require('handlebars').templates,
     cfg = require('settings/root');
 
 
-// max number of profiles to list on page
-var PAGE_LENGTH = 5;
+var PAGE_LENGTH = 5,     // max number of profiles to list on page
+    prev_search = null;  // to stop queries for the same results
 
-module.exports = function () {
-    $('#content').html(
-        templates['home.html']({})
-    );
-    if (cfg.profiles && cfg.profiles.lucene) {
-        $('#user-search-form').show();
-        $('#user-search-form').submit(function (ev) {
-            ev.preventDefault();
-            var q = $('#user-search-q', this).val();
-            searchProfiles(q);
-            return false;
-        });$
-        $('#user-search-q').keyup($.debounce(500, function () {
-            var q = $(this).val();
+// set to true when updating the page inline but changing the url
+// for back button / bookmarking support
+var ignore_next_hashchange = false;
+
+
+module.exports = function (q) {
+    if (ignore_next_hashchange) {
+        // already showing home page, it will have updated inline
+        // without redrawing. do nothing on hash change.
+        ignore_next_hashchange = false;
+    }
+    else {
+        $('#content').html(
+            templates['home.html']({})
+        );
+        if (cfg.profiles && cfg.profiles.lucene) {
+            $('#user-search-form').show();
+            $('#user-search-form').submit(function (ev) {
+                ev.preventDefault();
+                var q = $('#user-search-q', this).val();
+                searchProfiles(q);
+                return false;
+            });$
+            $('#user-search-q').keyup($.debounce(500, function () {
+                var q = $(this).val();
+                if (q !== prev_search) {
+                    searchProfiles(q);
+                }
+                prev_search = q;
+            }));
+            $('#user-search-q').focus();
+        }
+        if (q) {
+            var q = decodeURIComponent(q);
+            $('#user-search-q').val(q);
             searchProfiles(q);
-        }));
-        $('#user-search-q').focus();
+        }
+        else {
+            getProfiles();
+        }
     }
-    getProfiles();
 };
 
 
 function getProfiles(start_key, descending) {
+    if (window.location.hash !== '#/') {
+        ignore_next_hashchange = true;
+        window.location = '#/';
+    }
     $('#user-search-form .control-group').removeClass('error');
     $('#user-search-form .help-inline').text('');
     $('#user-search-submit').button('loading');
@@ -60,6 +86,11 @@ function searchProfiles(q, skip) {
     if (!q) {
         return getProfiles();
     }
+    var newurl = '#/search/' + encodeURIComponent(q);
+    if (window.location.hash !== newurl) {
+        ignore_next_hashchange = true;
+        window.location = newurl;
+    }
     $('#user-search-form .control-group').removeClass('error');
     $('#user-search-form .help-inline').text('');
     $('#user-search-submit').button('loading');