Fixing unread counts for manage menu (showing/hiding mark read on feed menus), and removing the misbehaving back button in the trainer.

This commit is contained in:
Samuel Clay 2011-02-01 00:51:19 -05:00
parent c06c55e6b6
commit 518c5e85d4
2 changed files with 10 additions and 4 deletions

View file

@ -2463,6 +2463,9 @@ a.NB-splash-link:hover {
/* = Classifier Trainer = */
/* ====================== */
.NB-modal-trainer .NB-modal-submit .NB-modal-submit-back {
display: none;
}
.NB-modal-trainer .NB-modal-submit .NB-modal-submit-back,
.NB-modal-trainer .NB-modal-submit .NB-modal-submit-reset {
float: left;
@ -2470,10 +2473,13 @@ a.NB-splash-link:hover {
background-color: #b5b4bB;
}
.NB-modal-trainer .NB-modal-submit .NB-modal-submit-close {
float: right;
float: left;
color: #FFF;
background-color: #b5b4bB;
}
.NB-modal-trainer .NB-modal-submit .NB-modal-submit-begin {
float: right;
}
.NB-modal-trainer .NB-modal-submit .NB-modal-submit-end {
float: right;
color: #FFF;

View file

@ -3829,7 +3829,7 @@
var $folder;
feed_id = feed_id || this.active_feed;
if (this.flags['river_view'] && feed_id != 'starred') {
if (_.isString(feed_id) && feed_id.indexOf('river:') != -1) {
if (feed_id == 'river:') {
$folder = this.$s.$feed_list;
} else {
@ -3837,7 +3837,7 @@
}
var counts = this.list_feeds_with_unreads_in_folder($folder, true, visible_only);
return _.reduce(counts, function(m, c) { return m + c; }, 0);
} else if (this.flags['river_view'] && feed_id == 'starred') {
} else if (feed_id == 'starred') {
// Umm, no. Not yet.
} else {
var feed = this.model.get_feed(feed_id);
@ -4909,7 +4909,7 @@
handle_rightclicks: function(elem, e) {
var self = this;
// NEWSBLUR.log(['right click', e.button]);
// NEWSBLUR.log(['right click', e.button, e, e.target, e.currentTarget]);
$.targetIs(e, { tagSelector: '.story', childOf: '#story_titles' }, function($t, $p) {
e.preventDefault();