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

Merge branch 'master' into river

Browse source
This commit is contained in:
Samuel Clay 2011-01-10 22:26:56 -05:00
commit 2a6568375d
2 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/reader/views.py
View file

@ -676,6 +676,8 @@ def add_url(request):
user_sub_folders_object.folders = json.encode(user_sub_folders)
user_sub_folders_object.save()
feed.setup_feed_for_premium_subscribers()
if feed.last_update < datetime.datetime.utcnow() - datetime.timedelta(days=1):
feed.update()

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

@ -1994,8 +1994,16 @@
send_story_to_instapaper: function(story_id) {
var story = this.model.get_story(story_id);
var url = 'https://www.instapaper.com/api/add';
window.open(url + '?url=' + story.story_permalink + '&title=' + story.story_title, '_blank');
var url = 'http://www.instapaper.com/edit';
var instapaper_url = [
url,
'?url=',
encodeURIComponent(story.story_permalink),
'&title=',
encodeURIComponent(story.story_title)
].join('');
window.open(instapaper_url, '_blank');
this.mark_story_as_read(story_id);
},
// =====================
@ -3000,7 +3008,9 @@
(tab_unread_count && $.make('li', { className: 'NB-menu-manage-feed NB-menu-manage-feed-unreadtabs' }, [
$.make('div', { className: 'NB-menu-manage-image' }),
$.make('div', { className: 'NB-menu-manage-title' }, 'Open unreads in '+tab_unread_count+Inflector.pluralize(' tab', tab_unread_count))
])),
]).bind('click', _.bind(function(e) {
this.open_unread_stories_in_tabs(feed_id);
}, this))),
$.make('li', { className: 'NB-menu-separator' }),
$.make('li', { className: 'NB-menu-manage-feed NB-menu-manage-rename NB-menu-manage-feed-rename' }, [
$.make('div', { className: 'NB-menu-manage-image' }),
@ -3067,10 +3077,14 @@
$.make('div', { className: 'NB-menu-manage-image' }),
$.make('div', { className: 'NB-menu-manage-title' }, starred_title)
]),
// $.make('li', { className: 'NB-menu-manage-story-instapaper' }, [
// $.make('div', { className: 'NB-menu-manage-image' }),
// $.make('div', { className: 'NB-menu-manage-title' }, 'Send to Instapaper')
// ]),
$.make('li', { className: 'NB-menu-manage-story-instapaper' }, [
$.make('div', { className: 'NB-menu-manage-image' }),
$.make('div', { className: 'NB-menu-manage-title' }, 'Send to Instapaper')
]).bind('click', _.bind(function(e) {
e.preventDefault();
e.stopPropagation();
this.send_story_to_instapaper(story.id);
}, this)),
$.make('li', { className: 'NB-menu-separator' }),
$.make('li', { className: 'NB-menu-manage-story-train' }, [
$.make('div', { className: 'NB-menu-manage-image' }),
@ -4428,11 +4442,6 @@
var feed_id = $t.parents('.NB-menu-manage').data('feed_id');
self.mark_feed_as_read(feed_id);
});
$.targetIs(e, { tagSelector: '.NB-menu-manage-feed-unreadtabs' }, function($t, $p){
e.preventDefault();
var feed_id = $t.parents('.NB-menu-manage').data('feed_id');
self.open_unread_stories_in_tabs(feed_id);
});
$.targetIs(e, { tagSelector: '.NB-menu-manage-folder-mark-read' }, function($t, $p){
e.preventDefault();
var folder_name = $t.parents('.NB-menu-manage').data('folder_name');
@ -4488,12 +4497,6 @@
self.mark_story_as_unread(story_id, feed_id);
});
$.targetIs(e, { tagSelector: '.NB-menu-manage-story-instapaper' }, function($t, $p){
e.preventDefault();
var story_id = $t.closest('.NB-menu-manage').data('story_id');
self.send_story_to_instapaper(story_id);
});
$.targetIs(e, { tagSelector: '.task_button_view' }, function($t, $p){
e.preventDefault();
var view;