mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-08-05 16:58:59 +00:00
Twitter and Facebook links on every story. Yay?
This commit is contained in:
parent
941864db53
commit
ef1bd93c19
3 changed files with 77 additions and 7 deletions
|
@ -1442,7 +1442,7 @@ background: transparent;
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
display: none;
|
display: none;
|
||||||
opacity: .9;
|
opacity: .8;
|
||||||
}
|
}
|
||||||
|
|
||||||
.NB-view-river .NB-feed-story-view-floater {
|
.NB-view-river .NB-feed-story-view-floater {
|
||||||
|
@ -3630,9 +3630,34 @@ background: transparent;
|
||||||
.NB-menu-manage .NB-menu-manage-feedchooser .NB-menu-manage-image {
|
.NB-menu-manage .NB-menu-manage-feedchooser .NB-menu-manage-image {
|
||||||
background: transparent url('../img/icons/silk/color_swatch.png') no-repeat 0 2px;
|
background: transparent url('../img/icons/silk/color_swatch.png') no-repeat 0 2px;
|
||||||
}
|
}
|
||||||
.NB-menu-manage .NB-menu-manage-story-instapaper .NB-menu-manage-image {
|
.NB-menu-manage .NB-menu-manage-story-thirdparty .NB-menu-manage-image {
|
||||||
background: transparent url('../img/reader/instapaper.png') no-repeat 0 1px;
|
background: transparent url('../img/reader/instapaper.png') no-repeat 0 1px;
|
||||||
}
|
}
|
||||||
|
.NB-menu-manage .NB-menu-manage-story-thirdparty .NB-menu-manage-thirdparty-icon {
|
||||||
|
width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
float: right;
|
||||||
|
margin: 6px 0 0 0;
|
||||||
|
padding: 0 4px 0 0;
|
||||||
|
}
|
||||||
|
.NB-menu-manage .NB-menu-manage-story-thirdparty .NB-menu-manage-thirdparty-instapaper {
|
||||||
|
background: transparent url('../img/reader/instapaper.png') no-repeat 0 0;
|
||||||
|
}
|
||||||
|
.NB-menu-manage .NB-menu-manage-story-thirdparty .NB-menu-manage-thirdparty-twitter {
|
||||||
|
background: transparent url('../img/reader/twitter.png') no-repeat 0 0;
|
||||||
|
}
|
||||||
|
.NB-menu-manage .NB-menu-manage-story-thirdparty .NB-menu-manage-thirdparty-facebook {
|
||||||
|
background: transparent url('../img/reader/facebook.gif') no-repeat 0 0;
|
||||||
|
}
|
||||||
|
.NB-menu-manage .NB-menu-manage-story-thirdparty.NB-menu-manage-highlight-twitter .NB-menu-manage-image,
|
||||||
|
.NB-menu-manage .NB-menu-manage-story-thirdparty.NB-menu-manage-highlight-twitter .NB-menu-manage-thirdparty-facebook {
|
||||||
|
opacity: .2;
|
||||||
|
}
|
||||||
|
.NB-menu-manage .NB-menu-manage-story-thirdparty.NB-menu-manage-highlight-facebook .NB-menu-manage-image,
|
||||||
|
.NB-menu-manage .NB-menu-manage-story-thirdparty.NB-menu-manage-highlight-facebook .NB-menu-manage-thirdparty-twitter {
|
||||||
|
opacity: .2;
|
||||||
|
}
|
||||||
|
|
||||||
.NB-menu-manage .NB-menu-manage-story-unread .NB-menu-manage-image {
|
.NB-menu-manage .NB-menu-manage-story-unread .NB-menu-manage-image {
|
||||||
background: transparent url('../img/icons/silk/bullet_orange.png') no-repeat 0 1px;
|
background: transparent url('../img/icons/silk/bullet_orange.png') no-repeat 0 1px;
|
||||||
}
|
}
|
||||||
|
|
|
@ -187,7 +187,7 @@ NEWSBLUR.AssetModel.Reader.prototype = {
|
||||||
var self = this;
|
var self = this;
|
||||||
|
|
||||||
var pre_callback = function(subscriptions) {
|
var pre_callback = function(subscriptions) {
|
||||||
NEWSBLUR.log(['subscriptions', subscriptions]);
|
// NEWSBLUR.log(['subscriptions', subscriptions]);
|
||||||
var flat_feeds = function(feeds) {
|
var flat_feeds = function(feeds) {
|
||||||
var flattened = _.flatten(_.map(feeds, _.values));
|
var flattened = _.flatten(_.map(feeds, _.values));
|
||||||
return _.flatten(_.map(flattened, function(feed) {
|
return _.flatten(_.map(flattened, function(feed) {
|
||||||
|
|
|
@ -1841,7 +1841,7 @@
|
||||||
this.flags['iframe_story_locations_fetched'] ||
|
this.flags['iframe_story_locations_fetched'] ||
|
||||||
parseInt($story.offset().top, 10) > this.cache['prefetch_iteration']*4000) {
|
parseInt($story.offset().top, 10) > this.cache['prefetch_iteration']*4000) {
|
||||||
if ($story && $story.length) {
|
if ($story && $story.length) {
|
||||||
NEWSBLUR.log(['Prefetch break on position too far', parseInt($story.offset().top, 10), this.cache['prefetch_iteration']*4000]);
|
// NEWSBLUR.log(['Prefetch break on position too far', parseInt($story.offset().top, 10), this.cache['prefetch_iteration']*4000]);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (!prefetch_tries_left) {
|
if (!prefetch_tries_left) {
|
||||||
|
@ -2153,6 +2153,34 @@
|
||||||
this.mark_story_as_read(story_id);
|
this.mark_story_as_read(story_id);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
send_story_to_twitter: function(story_id) {
|
||||||
|
var story = this.model.get_story(story_id);
|
||||||
|
var url = 'http://twitter.com/';
|
||||||
|
var twitter_url = [
|
||||||
|
url,
|
||||||
|
'?status=',
|
||||||
|
encodeURIComponent(story.story_title),
|
||||||
|
': ',
|
||||||
|
encodeURIComponent(story.story_permalink)
|
||||||
|
].join('');
|
||||||
|
window.open(twitter_url, '_blank');
|
||||||
|
this.mark_story_as_read(story_id);
|
||||||
|
},
|
||||||
|
|
||||||
|
send_story_to_facebook: function(story_id) {
|
||||||
|
var story = this.model.get_story(story_id);
|
||||||
|
var url = 'http://www.facebook.com/sharer.php?src=bm&v=4&i=1296796865';
|
||||||
|
var facebook_url = [
|
||||||
|
url,
|
||||||
|
'&u=',
|
||||||
|
encodeURIComponent(story.story_permalink),
|
||||||
|
'&t=',
|
||||||
|
encodeURIComponent(story.story_title)
|
||||||
|
].join('');
|
||||||
|
window.open(facebook_url, '_blank');
|
||||||
|
this.mark_story_as_read(story_id);
|
||||||
|
},
|
||||||
|
|
||||||
// =====================
|
// =====================
|
||||||
// = Story Titles Pane =
|
// = Story Titles Pane =
|
||||||
// =====================
|
// =====================
|
||||||
|
@ -2996,7 +3024,7 @@
|
||||||
// ===================
|
// ===================
|
||||||
|
|
||||||
switch_taskbar_view: function(view, skip_save_type) {
|
switch_taskbar_view: function(view, skip_save_type) {
|
||||||
NEWSBLUR.log(['switch_taskbar_view', view]);
|
// NEWSBLUR.log(['switch_taskbar_view', view]);
|
||||||
var self = this;
|
var self = this;
|
||||||
var $story_pane = this.$s.$story_pane;
|
var $story_pane = this.$s.$story_pane;
|
||||||
var feed = this.model.get_feed(this.active_feed);
|
var feed = this.model.get_feed(this.active_feed);
|
||||||
|
@ -3377,13 +3405,30 @@
|
||||||
$.make('div', { className: 'NB-menu-manage-image' }),
|
$.make('div', { className: 'NB-menu-manage-image' }),
|
||||||
$.make('div', { className: 'NB-menu-manage-title' }, starred_title)
|
$.make('div', { className: 'NB-menu-manage-title' }, starred_title)
|
||||||
]),
|
]),
|
||||||
$.make('li', { className: 'NB-menu-manage-story-instapaper' }, [
|
$.make('li', { className: 'NB-menu-manage-story-thirdparty' }, [
|
||||||
|
$.make('div', { className: 'NB-menu-manage-thirdparty-icon NB-menu-manage-thirdparty-facebook'}).bind('mouseenter', _.bind(function(e) {
|
||||||
|
$(e.target).siblings('.NB-menu-manage-title').text('Send to Facebook').parent().addClass('NB-menu-manage-highlight-facebook');
|
||||||
|
}, this)).bind('mouseleave', _.bind(function(e) {
|
||||||
|
$(e.target).siblings('.NB-menu-manage-title').text('Send to Instapaper').parent().removeClass('NB-menu-manage-highlight-facebook');
|
||||||
|
}, this)),
|
||||||
|
$.make('div', { className: 'NB-menu-manage-thirdparty-icon NB-menu-manage-thirdparty-twitter'}).bind('mouseenter', _.bind(function(e) {
|
||||||
|
$(e.target).siblings('.NB-menu-manage-title').text('Send to Twitter').parent().addClass('NB-menu-manage-highlight-twitter');
|
||||||
|
}, this)).bind('mouseleave', _.bind(function(e) {
|
||||||
|
$(e.target).siblings('.NB-menu-manage-title').text('Send to Instapaper').parent().removeClass('NB-menu-manage-highlight-twitter');
|
||||||
|
}, this)),
|
||||||
$.make('div', { className: 'NB-menu-manage-image' }),
|
$.make('div', { className: 'NB-menu-manage-image' }),
|
||||||
$.make('div', { className: 'NB-menu-manage-title' }, 'Send to Instapaper')
|
$.make('div', { className: 'NB-menu-manage-title' }, 'Send to Instapaper')
|
||||||
]).bind('click', _.bind(function(e) {
|
]).bind('click', _.bind(function(e) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
|
var $target = $(e.target);
|
||||||
|
if ($target.hasClass('NB-menu-manage-thirdparty-facebook')) {
|
||||||
|
this.send_story_to_facebook(story.id);
|
||||||
|
} else if ($target.hasClass('NB-menu-manage-thirdparty-twitter')) {
|
||||||
|
this.send_story_to_twitter(story.id);
|
||||||
|
} else {
|
||||||
this.send_story_to_instapaper(story.id);
|
this.send_story_to_instapaper(story.id);
|
||||||
|
}
|
||||||
}, this)),
|
}, this)),
|
||||||
$.make('li', { className: 'NB-menu-separator' }),
|
$.make('li', { className: 'NB-menu-separator' }),
|
||||||
$.make('li', { className: 'NB-menu-manage-story-train' }, [
|
$.make('li', { className: 'NB-menu-manage-story-train' }, [
|
||||||
|
|
Loading…
Add table
Reference in a new issue