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

Merge branch 'master' into grid

Browse source 
* master:
  Adding mark read confirmation preference.
This commit is contained in:
Samuel Clay 2015-02-10 18:03:21 -08:00
commit 0b8bfa37c8
4 changed files with 47 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -317,6 +317,10 @@ NEWSBLUR.Collections.Folders = Backbone.Collection.extend({
item.folders.update_all_folder_visibility();
}
});
},
view_setting: function(setting) {
return NEWSBLUR.assets.view_setting('river:' + (this.get('folder_title') || ''), setting);
}
}, {

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

@ -2163,6 +2163,22 @@
}
},
maybe_mark_all_as_read: function() {
if (_.contains(['river:blurblogs', 'river:global'], this.active_feed)) {
return;
} else if (this.flags.social_view) {
this.mark_feed_as_read();
} else if (this.flags.river_view) {
if (this.active_feed == 'river:' && NEWSBLUR.assets.preference('mark_read_river_confirm')) {
this.open_mark_read_modal({days: 0});
} else {
this.mark_folder_as_read();
}
} else if (!this.flags.river_view && !this.flags.social_view) {
this.mark_feed_as_read();
}
},
mark_feed_as_read: function(feed_id, days_back, direction) {
feed_id = feed_id || this.active_feed;
var cutoff_timestamp = NEWSBLUR.utils.days_back_to_timestamp(days_back);
@ -6376,19 +6392,7 @@
});
$document.bind('keydown', 'shift+a', function(e) {
e.preventDefault();
if (_.contains(['river:blurblogs', 'river:global'], self.active_feed)) {
return;
} else if (self.flags.social_view) {
self.mark_feed_as_read();
} else if (self.flags.river_view) {
if (self.active_feed == 'river:') {
self.open_mark_read_modal({days: 0});
} else {
self.mark_folder_as_read();
}
} else if (!self.flags.river_view && !self.flags.social_view) {
self.mark_feed_as_read();
}
self.maybe_mark_all_as_read();
});
$document.bind('keydown', 'shift+e', function(e) {
e.preventDefault();

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

@ -506,6 +506,25 @@ _.extend(NEWSBLUR.ReaderPreferences.prototype, {
'Double-clicking an unread count'
])
]),
$.make('div', { className: 'NB-preference NB-preference-markreadriverconfirm' }, [
$.make('div', { className: 'NB-preference-options' }, [
$.make('div', [
$.make('input', { id: 'NB-preference-markreadriverconfirmation-1', type: 'radio', name: 'mark_read_river_confirm', value: 'true' }),
$.make('label', { 'for': 'NB-preference-markreadriverconfirmation-1' }, [
'Show confirmation when marking everything read'
])
]),
$.make('div', [
$.make('input', { id: 'NB-preference-markreadriverconfirm-0', type: 'radio', name: 'mark_read_river_confirm', value: "false" }),
$.make('label', { 'for': 'NB-preference-markreadriverconfirm-0' }, [
'Mark everything as read without confirmation'
])
])
]),
$.make('div', { className: 'NB-preference-label'}, [
'Marking All Site Stories as read'
])
]),
$.make('div', { className: 'NB-preference NB-preference-readstorydelay' }, [
$.make('div', { className: 'NB-preference-options' }, [
$.make('div', [
@ -939,6 +958,12 @@ _.extend(NEWSBLUR.ReaderPreferences.prototype, {
return false;
}
});
$('input[name=mark_read_river_confirm]', $modal).each(function() {
if ($(this).val() == ""+NEWSBLUR.Preferences.mark_read_river_confirm) {
$(this).attr('checked', true);
return false;
}
});
$('input[name=markread_nextfeed]', $modal).each(function() {
if ($(this).val() == NEWSBLUR.Preferences.markread_nextfeed) {
$(this).attr('checked', true);

1
templates/base.html
View file

@ -80,6 +80,7 @@
'show_content_preview' : true,
'doubleclick_feed' : 'open',
'doubleclick_unread' : 'markread',
'mark_read_river_confirm' : true,
'markread_nextfeed' : 'nextfeed',
'story_share_twitter' : true,
'story_share_facebook' : true,