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

Fixing inconsisstencies in DOM. Fixing feeds. Needs stories to open in correct feed. Also needs to test non-feeds/folders.

Browse source
This commit is contained in:
Samuel Clay 2021-01-13 19:59:22 -05:00
parent bccafbb6b9
commit 51a13fcb61
4 changed files with 28 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -802,7 +802,7 @@ NEWSBLUR.AssetModel = Backbone.Router.extend({
'ajax_group': 'dashboard',
'request_type': 'GET'
});
} else if (_.string.startsWith(feed_id, 'river:')) {
} else if (_.string.startsWith(feed_id, 'river:') || _.string.startsWith(feed_id, 'feed:')) {
this.make_request('/reader/river_stories', options, pre_callback, error_callback, {
'ajax_group': 'dashboard',
'request_type': 'GET'

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

@ -2,9 +2,7 @@ NEWSBLUR.Models.DashboardRiver = Backbone.Model.extend({
initialize: function() {
var feed_title = NEWSBLUR.reader.feed_title(this.get('river_id'));
var favicon_url = this.favicon_url();
this.set('feed_title', "\"<b>" + this.get('query') + "</b>\" in <b>" + feed_title + "</b>");
this.set('favicon_url', favicon_url);
this.list_view;
},

50
media/js/newsblur/views/dashboard_river_view.js
View file

@ -1,7 +1,5 @@
NEWSBLUR.Views.DashboardRiver = Backbone.View.extend({
className: "NB-module-river",
events: {
"click .NB-module-search-add-url" : "add_url",
"click .NB-feedbar-options" : "open_options_popover"
@ -10,11 +8,23 @@ NEWSBLUR.Views.DashboardRiver = Backbone.View.extend({
initialize: function () {
var $river_on_dashboard = $(".NB-dashboard-rivers-" + this.model.get('river_side') + " .NB-dashboard-river-order-" + this.model.get('river_order'));
console.log(['Initialize dashboard river', this.model, this.$el, this.el, $river_on_dashboard])
if ($river_on_dashboard.length) {
this.setElement($river_on_dashboard);
} else {
// if ($river_on_dashboard.length) {
// this.setElement($river_on_dashboard);
// }
if (this.model.get('river_id') == "river:infrequent") {
this.options.infrequent = NEWSBLUR.assets.preference('infrequent_stories_per_month');
} else if (this.model.get('river_id') == "river:global") {
this.options.global_feed = true;
}
NEWSBLUR.assets.feeds.unbind(null, null, this);
NEWSBLUR.assets.feeds.bind('reset', _.bind(this.load_stories, this));
NEWSBLUR.assets.stories.unbind(null, null, this);
NEWSBLUR.assets.stories.bind('change:read_status', this.check_read_stories, this);
// NEWSBLUR.assets.stories.bind('change:selected', this.check_read_stories, this);
this.model.bind('change:river_id', _.bind(this.initialize, this));
this.render();
this.$stories = this.$(".NB-module-item .NB-story-titles");
@ -32,20 +42,6 @@ NEWSBLUR.Views.DashboardRiver = Backbone.View.extend({
this.cache = {
story_hashes: []
};
if (this.model.get('river_id') == "river:infrequent") {
this.options.infrequent = NEWSBLUR.assets.preference('infrequent_stories_per_month');
} else if (this.model.get('river_id') == "river:global") {
this.options.global_feed = true;
}
NEWSBLUR.assets.feeds.unbind(null, null, this);
NEWSBLUR.assets.feeds.bind('reset', _.bind(this.load_stories, this));
NEWSBLUR.assets.stories.unbind(null, null, this);
NEWSBLUR.assets.stories.bind('change:read_status', this.check_read_stories, this);
// NEWSBLUR.assets.stories.bind('change:selected', this.check_read_stories, this);
this.model.bind('change:river_id', _.bind(this.initialize, this));
this.setup_dashboard_refresh();
this.load_stories();
this.options_template();
@ -68,7 +64,7 @@ NEWSBLUR.Views.DashboardRiver = Backbone.View.extend({
</div>\
</div>\
', {
favicon_url: this.model.get('favicon_url'),
favicon_url: this.model.favicon_url(),
river_title: NEWSBLUR.reader.feed_title(this.model.get('river_id')),
river_order: this.model.get('river_order')
}));
@ -93,14 +89,20 @@ NEWSBLUR.Views.DashboardRiver = Backbone.View.extend({
this.$(".NB-module-river-settings").html($options);
},
feeds: function() {
var active_folder = NEWSBLUR.assets.get_folder(this.model.get('river_id'));
feeds: function () {
var river_id = this.model.get('river_id');
if (_.string.startsWith(river_id, 'feed:')) {
return [parseInt(river_id.replace('feed:', ''), 10)];
}
var active_folder = NEWSBLUR.assets.get_folder(river_id);
if (!active_folder) {
active_folder = NEWSBLUR.assets.folders;
}
var feeds;
var visible_only = NEWSBLUR.assets.view_setting(this.model.get('river_id'), 'read_filter') == 'unread';
var visible_only = NEWSBLUR.assets.view_setting(river_id, 'read_filter') == 'unread';
if (visible_only) {
feeds = _.pluck(active_folder.feeds_with_unreads(), 'id');
}

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

@ -9,12 +9,10 @@ NEWSBLUR.Views.DashboardRivers = Backbone.View.extend({
initialize: function () {
var side = this.options.side;
this.setElement($(".NB-dashboard-rivers-" + side));
this.$el.empty();
this.rivers = NEWSBLUR.assets.dashboard_rivers.side(side).map(_.bind(function (river, r) {
var river_view = new NEWSBLUR.Views.DashboardRiver({
className: '.NB-module-' + river.get('river_side') + '-river-' + river.get('river_order'),
dashboard_stories: new NEWSBLUR.Collections.Stories(),
side: river.get('river_side'),
model: river
});
console.log(['Adding river', side, river.get('river_id'), river_view, river_view.$el, this.$el])