public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Showing text fetching indicator.

Browse source
This commit is contained in:
Samuel Clay 2017-11-02 12:27:20 -07:00
parent 00430b302b
commit 79fb23076b
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
media/js/newsblur/common/assetmodel.js
View file

@ -129,7 +129,7 @@ NEWSBLUR.AssetModel = Backbone.Router.extend({
return;
}
if (errorThrown == "timeout") textStatus = "NewsBlur timed out trying<br />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<br />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'

4
media/js/newsblur/views/text_tab_view.js
View file

@ -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')))) {