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 pro

Browse source 
* master:
  Adding Raindrop.io support.
This commit is contained in:
Samuel Clay 2022-06-09 09:48:42 -07:00
commit 1eb71ee524
4 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
media/css/reader/reader.css
View file

@ -8594,6 +8594,10 @@ form.opml_import_form input {
background: transparent url('/media/embed/reader/pinboard.png') no-repeat 0 0;
background-size: 16px;
}
.NB-menu-manage .NB-menu-manage-story-thirdparty .NB-menu-manage-thirdparty-raindrop {
background: transparent url('/media/embed/reader/raindrop.svg') no-repeat 0 0;
background-size: 16px;
}
.NB-menu-manage .NB-menu-manage-story-thirdparty .NB-menu-manage-thirdparty-pinterest {
background: transparent url('/media/embed/reader/pinterest.png') no-repeat 0 0;
background-size: 16px;
@ -8637,6 +8641,7 @@ form.opml_import_form input {
.NB-menu-manage .NB-menu-manage-story-thirdparty.NB-menu-manage-highlight-blogger .NB-menu-manage-thirdparty-email,
.NB-menu-manage .NB-menu-manage-story-thirdparty.NB-menu-manage-highlight-delicious .NB-menu-manage-thirdparty-email,
.NB-menu-manage .NB-menu-manage-story-thirdparty.NB-menu-manage-highlight-pinboard .NB-menu-manage-thirdparty-email,
.NB-menu-manage .NB-menu-manage-story-thirdparty.NB-menu-manage-highlight-raindrop .NB-menu-manage-thirdparty-email,
.NB-menu-manage .NB-menu-manage-story-thirdparty.NB-menu-manage-highlight-pinterest .NB-menu-manage-thirdparty-email,
.NB-menu-manage .NB-menu-manage-story-thirdparty.NB-menu-manage-highlight-buffer .NB-menu-manage-thirdparty-email,
.NB-menu-manage .NB-menu-manage-story-thirdparty.NB-menu-manage-highlight-diigo .NB-menu-manage-thirdparty-email,
@ -8666,6 +8671,9 @@ form.opml_import_form input {
.NB-menu-manage .NB-menu-manage-story-thirdparty.NB-menu-manage-highlight-pinboard .NB-menu-manage-thirdparty-pinboard {
opacity: 1;
}
.NB-menu-manage .NB-menu-manage-story-thirdparty.NB-menu-manage-highlight-raindrop .NB-menu-manage-thirdparty-raindrop {
opacity: 1;
}
.NB-menu-manage .NB-menu-manage-story-thirdparty.NB-menu-manage-highlight-pinterest .NB-menu-manage-thirdparty-pinterest {
opacity: 1;
}
@ -11268,6 +11276,9 @@ form.opml_import_form input {
.NB-modal-preferences .NB-preference-story-share label[for=NB-preference-story-share-pinboard] {
background: transparent url('/media/embed/reader/pinboard.png') no-repeat 0 0;
}
.NB-modal-preferences .NB-preference-story-share label[for=NB-preference-story-share-raindrop] {
background: transparent url('/media/embed/reader/raindrop.svg') no-repeat 0 0;
}
.NB-modal-preferences .NB-preference-story-share label[for=NB-preference-story-share-pinterest] {
background: transparent url('/media/embed/reader/pinterest.png') no-repeat 0 0;
background-size: 16px;

1
media/img/reader/raindrop.svg Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48"><defs/><defs><path id="a" d="M12 0a12 12 0 0112 12v12H12a12 12 0 110-24z"/><path id="c" d="M0 24V11.7A12 12 0 1112 24H0z"/></defs><g fill="none" fill-rule="evenodd"><path fill="#1988E0" d="M35.3 9.7a16 16 0 01-.6 23.2L24 43 13.3 33l-.6-.7A16 16 0 1135.3 9.7z"/><g transform="translate(0 19)"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><use fill="#2CD4ED" xlink:href="#a"/><path fill="#0DB4E2" d="M35.3-9.3a16 16 0 01-.6 23.2L24 24 13.3 14l-.6-.7A16 16 0 1135.3-9.3z" mask="url(#b)"/></g><g transform="translate(24 19)"><mask id="d" fill="#fff"><use xlink:href="#c"/></mask><use fill="#3169FF" xlink:href="#c"/><path fill="#3153FF" d="M11.3-9.3a16 16 0 01-.6 23.2L0 24l-10.7-10-.6-.7A16 16 0 1111.3-9.3z" mask="url(#d)"/></g></g></svg>
Side by side

After

Width:  |  Height:  |  Size: 848 B

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

@ -2702,6 +2702,22 @@
NEWSBLUR.assets.stories.mark_read(story, {skip_delay: true});
},
send_story_to_raindrop: function(story_id) {
var story = this.model.get_story(story_id);
var url = 'https://app.raindrop.io/add?';
var raindrop_url = [
url,
'link=',
encodeURIComponent(story.get('story_permalink')),
'&title=',
encodeURIComponent(story.get('story_title')),
'&tags=',
encodeURIComponent(story.get('story_tags').join(', '))
].join('');
window.open(raindrop_url, '_blank');
NEWSBLUR.assets.stories.mark_read(story, {skip_delay: true});
},
send_story_to_pinterest: function(story_id) {
var story = this.model.get_story(story_id);
var url = 'https://www.pinterest.com/pin/find/?';
@ -3905,6 +3921,11 @@
}, this)).bind('mouseleave', _.bind(function(e) {
$(e.target).siblings('.NB-menu-manage-title').text('Email story').parent().removeClass('NB-menu-manage-highlight-pinboard');
}, this))),
(NEWSBLUR.Preferences['story_share_raindrop'] && $.make('div', { className: 'NB-menu-manage-thirdparty-icon NB-menu-manage-thirdparty-raindrop'}).bind('mouseenter', _.bind(function(e) {
$(e.target).siblings('.NB-menu-manage-title').text('Raindrop.io').parent().addClass('NB-menu-manage-highlight-raindrop');
}, this)).bind('mouseleave', _.bind(function(e) {
$(e.target).siblings('.NB-menu-manage-title').text('Email story').parent().removeClass('NB-menu-manage-highlight-raindrop');
}, this))),
(NEWSBLUR.Preferences['story_share_pinterest'] && $.make('div', { className: 'NB-menu-manage-thirdparty-icon NB-menu-manage-thirdparty-pinterest'}).bind('mouseenter', _.bind(function(e) {
$(e.target).siblings('.NB-menu-manage-title').text('Pinterest').parent().addClass('NB-menu-manage-highlight-pinterest');
}, this)).bind('mouseleave', _.bind(function(e) {
@ -3956,6 +3977,8 @@
this.send_story_to_delicious(story.id);
} else if ($target.hasClass('NB-menu-manage-thirdparty-pinboard')) {
this.send_story_to_pinboard(story.id);
} else if ($target.hasClass('NB-menu-manage-thirdparty-raindrop')) {
this.send_story_to_raindrop(story.id);
} else if ($target.hasClass('NB-menu-manage-thirdparty-pinterest')) {
this.send_story_to_pinterest(story.id);
} else if ($target.hasClass('NB-menu-manage-thirdparty-buffer')) {

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

@ -706,6 +706,10 @@ _.extend(NEWSBLUR.ReaderPreferences.prototype, {
$.make('input', { type: 'checkbox', id: 'NB-preference-story-share-pinboard', name: 'story_share_pinboard' }),
$.make('label', { 'for': 'NB-preference-story-share-pinboard' })
]),
$.make('div', { className: 'NB-preference-option', title: 'Raindrop.io' }, [
$.make('input', { type: 'checkbox', id: 'NB-preference-story-share-raindrop', name: 'story_share_raindrop' }),
$.make('label', { 'for': 'NB-preference-story-share-raindrop' })
]),
$.make('div', { className: 'NB-preference-option', title: 'Pinterest' }, [
$.make('input', { type: 'checkbox', id: 'NB-preference-story-share-pinterest', name: 'story_share_pinterest' }),
$.make('label', { 'for': 'NB-preference-story-share-pinterest' })