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

Flipping the switch: More than 64 sites, even added individually, now trigger the premium upgrade dialog.

Browse source
This commit is contained in:
Samuel Clay 2012-12-10 16:25:21 -08:00
parent 4302f102e8
commit 6ac7878bb5
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -159,6 +159,10 @@ NEWSBLUR.Collections.Feeds = Backbone.Collection.extend({
return this.detect(function(feed) { return feed.get('selected'); });
},
active: function() {
return this.select(function(feed) { return feed.get('active'); });
},
has_chosen_feeds: function() {
return this.any(function(feed) {
return feed.get('active');

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

@ -887,7 +887,8 @@
options = options || {};
if (!NEWSBLUR.Globals.is_authenticated) return;
if (!NEWSBLUR.assets.folders.length || !NEWSBLUR.assets.preference('has_setup_feeds')) {
if (!NEWSBLUR.assets.folders.length ||
!NEWSBLUR.assets.preference('has_setup_feeds')) {
if (options.delayed_import || this.flags.delayed_import) {
this.setup_ftux_add_feed_callout("Check your email...");
} else if (NEWSBLUR.assets.preference('has_setup_feeds')) {
@ -895,7 +896,11 @@
} else if (!NEWSBLUR.intro || !NEWSBLUR.intro.flags.open) {
_.defer(_.bind(this.open_intro_modal, this), 100);
}
} else if (!NEWSBLUR.assets.flags['has_chosen_feeds'] && NEWSBLUR.assets.folders.length) {
} else if (!NEWSBLUR.assets.flags['has_chosen_feeds'] &&
NEWSBLUR.assets.folders.length) {
_.defer(_.bind(this.open_feedchooser_modal, this), 100);
} else if (!NEWSBLUR.Globals.is_premium &&
NEWSBLUR.assets.feeds.active().length > 64) {
_.defer(_.bind(this.open_feedchooser_modal, this), 100);
}
},