Small bugs.

samuelclay · Jul 16, 2012 · a47abcb · a47abcb
1 parent 5adc74c
commit a47abcb
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/media/js/newsblur/views/feed_list_header_view.js b/media/js/newsblur/views/feed_list_header_view.js
@@ -10,13 +10,17 @@ NEWSBLUR.Views.FeedListHeader = Backbone.View.extend({
     },
 
     initialize: function() {
-        _.bindAll(this, 'render');
-        this.collection.bind('reset', this.render);
-        this.collection.bind('add', this.render);
-        this.collection.bind('remove', this.render);
-        this.collection.bind('change:ps', this.render);
-        this.collection.bind('change:nt', this.render);
-        this.collection.bind('change:ng', this.render);
+        _.bindAll(this, 'render', 'defer_render');
+        this.collection.bind('reset', this.defer_render);
+        this.collection.bind('add', this.defer_render);
+        this.collection.bind('remove', this.defer_render);
+        this.collection.bind('change:ps', this.defer_render);
+        this.collection.bind('change:nt', this.defer_render);
+        this.collection.bind('change:ng', this.defer_render);
+    },
+
+    defer_render: function() {
+        _.defer(this.render);
     },
 
     render: function() {

diff --git a/media/js/newsblur/views/original_tab_view.js b/media/js/newsblur/views/original_tab_view.js
@@ -489,7 +489,7 @@ NEWSBLUR.Views.OriginalTabView = Backbone.View.extend({
                     .unbind('click.NB-taskbar')
                     .bind('click.NB-taskbar', _.bind(function(e) {
                     var href = $(this).attr('href');
-                    if (href.indexOf('#') == 0) {
+                    if (href && href.indexOf('#') == 0) {
                         e.preventDefault();
                         var $footnote = $('a[name='+href.substr(1)+'], [id='+href.substr(1)+']',
                                           $iframe_contents);

diff --git a/settings.py b/settings.py
@@ -390,7 +390,8 @@ def custom_show_toolbar(request):
 # =========
 
 REDIS_POOL = redis.ConnectionPool(host=REDIS['host'], port=6379, db=0)
-REDIS_ANALYTICS_POOL = redis.ConnectionPool(host=REDIS['host'], port=6379, db=1)
+REDIS_STORY_POOL = redis.ConnectionPool(host=REDIS['host'], port=6379, db=1)
+REDIS_ANALYTICS_POOL = redis.ConnectionPool(host=REDIS['host'], port=6379, db=2)
 
 JAMMIT = jammit.JammitAssets(NEWSBLUR_DIR)
 

diff --git a/templates/base.html b/templates/base.html
@@ -17,9 +17,7 @@
       'is_staff'                : {{ user.is_staff|yesno:"true,false" }},
       'secret_token'            : "{{ user.profile.secret_token }}",
       'username'                : "{{ user.username|safe }}",
-      {% if user.pk %}
-        'user_id'                 : {{ user.pk }},
-      {% endif %}
+      {% if user.pk %}'user_id'                 : {{ user.pk }},{% endif %}
       'email'                   : "{{ user.email|safe }}",
       'MEDIA_URL'               : "{{ MEDIA_URL }}",
       'debug'                   : {{ debug|yesno:"true,false" }}