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

Adding unmute option to feed menu on web.

Browse source
This commit is contained in:
Samuel Clay 2016-05-09 16:13:40 -07:00
parent 1497412133
commit f719fed2ff
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
media/css/reader.css
View file

@ -7068,7 +7068,8 @@ form.opml_import_form input {
.NB-menu-manage .NB-menu-manage-move.NB-menu-manage-feed-move-cancel .NB-menu-manage-image { .NB-menu-manage .NB-menu-manage-move.NB-menu-manage-feed-move-cancel .NB-menu-manage-image {
background: transparent url('/media/embed/icons/silk/arrow_rotate_clockwise.png') no-repeat 0 1px; background: transparent url('/media/embed/icons/silk/arrow_rotate_clockwise.png') no-repeat 0 1px;
} }
.NB-menu-manage .NB-menu-manage-mute .NB-menu-manage-image { .NB-menu-manage .NB-menu-manage-mute .NB-menu-manage-image,
.NB-menu-manage .NB-menu-manage-unmute .NB-menu-manage-image {
background: transparent url('/media/embed/icons/silk/color_swatch_bw.png') no-repeat 1px 2px; background: transparent url('/media/embed/icons/silk/color_swatch_bw.png') no-repeat 1px 2px;
background-size: 18px; background-size: 18px;
} }

21
media/js/newsblur/reader/reader.js
View file

@ -3190,6 +3190,7 @@
if (!feed) return; if (!feed) return;
var unread_count = this.get_total_unread_count(feed_id); var unread_count = this.get_total_unread_count(feed_id);
var tab_unread_count = Math.min(25, unread_count); var tab_unread_count = Math.min(25, unread_count);
var muted = !feed.get('active');
$manage_menu = $.make('ul', { className: 'NB-menu-manage NB-menu-manage-feed' }, [ $manage_menu = $.make('ul', { className: 'NB-menu-manage NB-menu-manage-feed' }, [
$.make('li', { className: 'NB-menu-separator-inverse' }), $.make('li', { className: 'NB-menu-separator-inverse' }),
(feed.get('has_exception') && $.make('li', { className: 'NB-menu-item NB-menu-manage-feed-exception' }, [ (feed.get('has_exception') && $.make('li', { className: 'NB-menu-item NB-menu-manage-feed-exception' }, [
@ -3235,10 +3236,14 @@
$.make('div', { className: 'NB-change-folders' }) $.make('div', { className: 'NB-change-folders' })
]) ])
]), ]),
$.make('li', { className: 'NB-menu-item NB-menu-manage-mute NB-menu-manage-feed-mute' }, [ (muted && $.make('li', { className: 'NB-menu-item NB-menu-manage-unmute NB-menu-manage-feed-unmute' }, [
$.make('div', { className: 'NB-menu-manage-image' }),
$.make('div', { className: 'NB-menu-manage-title' }, 'Un-mute this site')
])),
(!muted && $.make('li', { className: 'NB-menu-item NB-menu-manage-mute NB-menu-manage-feed-mute' }, [
$.make('div', { className: 'NB-menu-manage-image' }), $.make('div', { className: 'NB-menu-manage-image' }),
$.make('div', { className: 'NB-menu-manage-title' }, 'Mute this site') $.make('div', { className: 'NB-menu-manage-title' }, 'Mute this site')
]), ])),
$.make('li', { className: 'NB-menu-item NB-menu-manage-rename NB-menu-manage-feed-rename' }, [ $.make('li', { className: 'NB-menu-item NB-menu-manage-rename NB-menu-manage-feed-rename' }, [
$.make('div', { className: 'NB-menu-manage-image' }), $.make('div', { className: 'NB-menu-manage-image' }),
$.make('div', { className: 'NB-menu-manage-title' }, 'Rename this site') $.make('div', { className: 'NB-menu-manage-title' }, 'Rename this site')
@ -4151,8 +4156,11 @@
this.flags['showing_confirm_input_on_manage_menu'] = false; this.flags['showing_confirm_input_on_manage_menu'] = false;
}, },
manage_menu_mute_feed: function(feed_id) { manage_menu_mute_feed: function(feed_id, unmute) {
var approve_list = _.pluck(NEWSBLUR.assets.feeds.filter(function(feed) { var approve_list = _.pluck(NEWSBLUR.assets.feeds.filter(function(feed) {
if (unmute) {
return feed.get('active') || feed.get('id') == feed_id;
}
return feed.get('active') && feed.get('id') != feed_id; return feed.get('active') && feed.get('id') != feed_id;
}), 'id'); }), 'id');
@ -5749,7 +5757,12 @@
$.targetIs(e, { tagSelector: '.NB-menu-manage-mute' }, function($t, $p){ $.targetIs(e, { tagSelector: '.NB-menu-manage-mute' }, function($t, $p){
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
self.manage_menu_mute_feed($t.parents('.NB-menu-manage').data('feed_id')); self.manage_menu_mute_feed($t.parents('.NB-menu-manage').data('feed_id'), false);
});
$.targetIs(e, { tagSelector: '.NB-menu-manage-unmute' }, function($t, $p){
e.preventDefault();
e.stopPropagation();
self.manage_menu_mute_feed($t.parents('.NB-menu-manage').data('feed_id'), true);
}); });
$.targetIs(e, { tagSelector: '.NB-menu-manage-rename' }, function($t, $p){ $.targetIs(e, { tagSelector: '.NB-menu-manage-rename' }, function($t, $p){
e.preventDefault(); e.preventDefault();