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

Fixing race condition for showing the feed chooser modal on OPML import.

Browse source
This commit is contained in:
Samuel Clay 2010-10-15 18:38:49 -04:00
parent 742869bf93
commit 5b162d0707
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
media/css/reader.css
View file

@ -394,7 +394,11 @@ a img {
}
.NB-feedlist .feed.NB-feed-exception {
background-color: #F7EDC6;
/* background-color: #F7EDC6;*/
}
.NB-feedlist .feed.NB-feed-exception .feed_title {
color: #A0A0A0;
}
#feed_list.NB-feedlist .feed.NB-feed-inactive {

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

@ -575,7 +575,7 @@
$('.feed', $feed_list).tsort('.feed_title');
$('.folder', $feed_list).tsort('.folder_title_text');
}
if (NEWSBLUR.Globals.is_authenticated && this.flags['has_chosen_feeds']) {
this.start_count_unreads_after_import();
this.force_feeds_refresh($.rescope(this.finish_count_unreads_after_import, this));
@ -591,7 +591,6 @@
var has_chosen_feeds = _.any(feeds, function(feed) {
return feed.active;
});
return has_chosen_feeds;
},

6
media/js/newsblur/reader_feedchooser.js
View file

@ -1,6 +1,6 @@
NEWSBLUR.ReaderFeedchooser = function(options) {
var defaults = {};
this.options = $.extend({}, defaults, options);
this.model = NEWSBLUR.AssetModel.reader();
this.runner();
@ -13,7 +13,7 @@ NEWSBLUR.ReaderFeedchooser.prototype = {
this.MAX_FEEDS = 40;
this.approve_list = [];
this.make_modal();
this.open_modal();
_.defer(_.bind(function() { this.open_modal(); }, this));
this.find_feeds_in_feed_list();
this.initial_load_feeds();
@ -132,7 +132,6 @@ NEWSBLUR.ReaderFeedchooser.prototype = {
resize_modal: function(previous_height) {
var height = this.$modal.height() + 24;
var parent_height = this.$modal.parent().height();
NEWSBLUR.log(['resize', $('#NB-feedchooser-feeds').height(), height, parent_height]);
if (height > parent_height && previous_height != height) {
var chooser_height = $('#NB-feedchooser-feeds').height();
var diff = Math.max(4, height - parent_height);
@ -143,7 +142,6 @@ NEWSBLUR.ReaderFeedchooser.prototype = {
open_modal: function() {
var self = this;
this.$modal.modal({
'minWidth': 750,
'maxWidth': 750,