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

Fixed issues with feed classifier trainer, but still cna't go back to intro without messing up the order.

Browse source
This commit is contained in:
Samuel Clay 2010-10-18 18:14:47 -04:00
parent 8c6cd75409
commit 637a1aafc6
2 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/profile/views.py
View file

@ -87,7 +87,7 @@ def paypal_form(request):
"item_name": "NewsBlur Premium Account",
"notify_url": "http://dev.newsblur.com/profile/paypal_ipn/",
"return_url": "http://dev.newsblur.com/profile/paypal_return/",
"cancel_return": "http://dev.newsblur.com/profile/paypal_cancel/",
"cancel_return": "http://dev.newsblur.com/",
"custom": request.user.username,
}

42
media/js/newsblur/reader_classifier.js
View file

@ -113,54 +113,54 @@ var classifier = {
},
load_previous_feed_in_trainer: function() {
var trainer_data_length = this.trainer_data.length;
var trainer_data = this.trainer_data[this.trainer_iterator];
NEWSBLUR.log(['previous', trainer_data_length, this.trainer_iterator]);
this.trainer_iterator = this.trainer_iterator - 1;
var trainer_data_length = this.trainer_data.length;
if (this.trainer_iterator < 1) {
NEWSBLUR.log(['intro', this.trainer_iterator]);
this.make_trainer_intro();
this.load_feeds_trainer(null, this.trainer_data);
this.reload_modal();
}
// Show only feeds, not the trainer intro if going backwards.
if (this.trainer_iterator > 0 && this.trainer_iterator <= trainer_data_length) {
} else if (this.trainer_iterator > 0 && this.trainer_iterator <= trainer_data_length) {
var trainer_data = this.trainer_data[this.trainer_iterator-1];
NEWSBLUR.log(['previous', trainer_data_length, this.trainer_iterator-1, trainer_data]);
this.load_feed(trainer_data);
}
},
load_next_feed_in_trainer: function(backwards) {
var trainer_data_length = this.trainer_data.length;
var trainer_data = this.trainer_data[this.trainer_iterator];
this.trainer_iterator = this.trainer_iterator + 1;
NEWSBLUR.log(['next', trainer_data_length, this.trainer_iterator]);
if (!trainer_data || this.trainer_iterator >= trainer_data_length) {
var trainer_data_length = this.trainer_data.length;
if (this.trainer_iterator > trainer_data_length) {
NEWSBLUR.log(['outro', this.trainer_iterator, trainer_data_length]);
this.make_trainer_outro();
this.load_feeds_trainer(null, this.trainer_data);
this.reload_modal();
} else {
this.feed_id = trainer_data['feed_id'];
this.trainer_iterator = this.trainer_iterator + 1;
// Show only feeds, not the trainer intro if going backwards.
if (this.trainer_iterator > 0 && this.trainer_iterator <= trainer_data_length) {
this.load_feed(trainer_data);
}
var trainer_data = this.trainer_data[this.trainer_iterator-1];
NEWSBLUR.log(['next', trainer_data_length, this.trainer_iterator-1, trainer_data]);
this.load_feed(trainer_data);
}
},
load_feed: function(trainer_data) {
this.feed_id = trainer_data['feed_id'];
this.feed = this.model.get_feed(this.feed_id);
this.feed_tags = trainer_data['feed_tags'];
this.feed_authors = trainer_data['feed_authors'];
this.user_classifiers = trainer_data['classifiers'];
this.options.feed_loaded = true;
this.make_modal_feed();
this.make_modal_title();
this.make_modal_trainer_count();
if (this.feed_id in this.cache) {
this.$modal = this.cache[this.feed_id];
} else {
this.make_modal_feed();
this.make_modal_title();
this.make_modal_trainer_count();
}
this.reload_modal();
},