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 dashboard

Browse source 
* master:
  Fixing typo on highlights check in starred stories.
  Ignoring right-click when highlighting.
This commit is contained in:
Samuel Clay 2020-07-14 18:42:11 -04:00
commit 0ae1b465c1
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/reader/views.py
View file

@ -1060,7 +1060,7 @@ def starred_stories_rss_feed(request, user_id, secret_token, tag_slug):
starred_stories = MStarredStory.objects(
user_id=user.pk
).order_by('-starred_date').limit(25)
elif tag_counts.highlights:
elif tag_counts.is_highlights:
starred_stories = MStarredStory.objects(
user_id=user.pk,
highlights__exists=True,

1
apps/social/views.py
View file

@ -1305,6 +1305,7 @@ def shared_stories_rss_feed_noid(request):
return index
@ratelimit(minutes=1, requests=5)
def shared_stories_rss_feed(request, user_id, username):
try:
user = User.objects.get(pk=user_id)

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

@ -719,7 +719,11 @@ NEWSBLUR.Views.StoryDetailView = Backbone.View.extend({
mouseup_check_selection: function(e) {
var $doc = this.$(".NB-feed-story-content");
// console.log(['mouseup_check_selection', e, $(e.target)]);
// console.log(['mouseup_check_selection', e, e.which, $(e.target)]);
if (e.which == 3) {
// Right click
return;
}
if ($(e.target).hasClass("NB-highlight")) {
this.show_unhighlight_tooltip($(e.target));
return;