public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-31 21:41:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing #1436: preferences should show All Site Stories title.

Browse source
This commit is contained in:
Samuel Clay 2021-03-26 18:13:28 -04:00
parent 597a075c1c
commit 03ddd83e08
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
media/js/newsblur/models/folders.js
View file

@ -418,4 +418,4 @@ NEWSBLUR.Collections.Folders = Backbone.Collection.extend({
}
}
});
});

5
media/js/newsblur/reader/reader_preferences.js
View file

@ -943,10 +943,7 @@ _.extend(NEWSBLUR.ReaderPreferences.prototype, {
make_autoopen_folders: function() {
var autoopen_folder = NEWSBLUR.Preferences.autoopen_folder;
var $folders = NEWSBLUR.utils.make_folders(autoopen_folder, {
name: 'default_folder',
toplevel: "All Site Stories"
});
var $folders = NEWSBLUR.utils.make_folders(autoopen_folder, "All Site Stories", 'default_folder');
return $folders;
},

6
media/js/newsblur/views/feed_list_view.js
View file

@ -300,13 +300,15 @@ NEWSBLUR.Views.FeedList = Backbone.View.extend({
load_url_next_param: function(route_found) {
var next = $.getQueryString('next') || $.getQueryString('test');
// console.log(['load_url_next_param', next, route_found]);
if (next) console.log(['load_url_next_param', next, route_found]);
if (next == 'optout') {
NEWSBLUR.reader.open_account_modal({'animate_email': true});
} else if (next == 'goodies') {
NEWSBLUR.reader.open_goodies_modal();
} else if (next == 'newsletters') {
NEWSBLUR.reader.open_newsletters_modal();
} else if (next == 'preferences') {
NEWSBLUR.reader.open_preferences_modal();
} else if (next == 'friends') {
NEWSBLUR.reader.open_friends_modal();
} else if (next == 'account') {
@ -351,7 +353,7 @@ NEWSBLUR.Views.FeedList = Backbone.View.extend({
load_default_folder: function() {
var default_folder = NEWSBLUR.assets.preference('default_folder');
if (!default_folder || default_folder == "") {
if (!default_folder || default_folder == "" || default_folder == "river:") {
NEWSBLUR.reader.open_river_stories();
} else {
var folder = NEWSBLUR.assets.get_folder(default_folder);