diff --git a/media/js/newsblur/common/assetmodel.js b/media/js/newsblur/common/assetmodel.js index d3c471381..8d1659d26 100644 --- a/media/js/newsblur/common/assetmodel.js +++ b/media/js/newsblur/common/assetmodel.js @@ -129,7 +129,7 @@ NEWSBLUR.AssetModel = Backbone.Router.extend({ return; } if (errorThrown == "timeout") textStatus = "NewsBlur timed out trying
to connect. Just try again."; - if (error_callback) { + if (error_callback && _.isFunction(error_callback)) { error_callback(e, textStatus, errorThrown); } else if ($.isFunction(callback)) { var message = "Please create an account. Not much
to do without an account."; @@ -714,7 +714,7 @@ NEWSBLUR.AssetModel = Backbone.Router.extend({ }; this.feed_id = feed_id; - + this.make_request('/reader/river_stories', options, pre_callback, error_callback, { 'ajax_group': (page ? 'feed_page' : 'feed'), 'request_type': 'GET' diff --git a/media/js/newsblur/views/text_tab_view.js b/media/js/newsblur/views/text_tab_view.js index 3f1c25b12..4a72e14f0 100644 --- a/media/js/newsblur/views/text_tab_view.js +++ b/media/js/newsblur/views/text_tab_view.js @@ -160,8 +160,8 @@ NEWSBLUR.Views.TextTabView = Backbone.View.extend({ select_story: function(story, selected) { if (!selected) return; - - this.hide_loading(); + + // this.hide_loading(); // Not sure why this is here? if ((NEWSBLUR.reader.story_view == 'text' && _.contains(['split', 'full'], NEWSBLUR.assets.view_setting(NEWSBLUR.reader.active_feed, 'layout')))) {