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 deletion of sites in Organizer, even when switching b/w flat and nested.

Browse source
This commit is contained in:
Samuel Clay 2014-12-11 18:19:14 -08:00
parent 253eda2e02
commit 0361321215
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
media/js/newsblur/common/assetmodel.js
View file

@ -1015,6 +1015,9 @@ NEWSBLUR.AssetModel = Backbone.Router.extend({
delete_feeds_by_folder: function(feeds_by_folder, callback, error_callback) {
var pre_callback = _.bind(function(data) {
_.each(feeds_by_folder, _.bind(function(feed_in_folder) {
this.feeds.remove(feed_in_folder[0]);
}, this));
this.folders.reset(_.compact(data.folders), {parse: true});
return callback();
}, this);

8
media/js/newsblur/reader/reader_organizer.js
View file

@ -230,11 +230,9 @@ _.extend(NEWSBLUR.ReaderOrganizer.prototype, {
// ==========
serialize: function() {
// Using full folders and not flat folders to get all folder highlights.
var highlighted_feeds = this.feedlist.folder_view.highlighted_feeds({
collection: NEWSBLUR.assets.folders
collection: this.options.folders
});
console.log(["highlighted feeds", highlighted_feeds]);
return highlighted_feeds;
},
@ -256,7 +254,7 @@ _.extend(NEWSBLUR.ReaderOrganizer.prototype, {
console.log(["Moving feeds by folder", highlighted_feeds, to_folder, new_folder]);
NEWSBLUR.assets.move_feeds_by_folder(highlighted_feeds, to_folder, new_folder, function(data) {
NEWSBLUR.assets.move_feeds_by_folder(highlighted_feeds, to_folder, new_folder, function() {
NEWSBLUR.reader.flags['reloading_feeds'] = false;
$loading.removeClass('NB-active');
self.reset_feeds();
@ -286,7 +284,7 @@ _.extend(NEWSBLUR.ReaderOrganizer.prototype, {
console.log(["Deleting feeds by folder", highlighted_feeds]);
NEWSBLUR.assets.delete_feeds_by_folder(highlighted_feeds, function(data) {
NEWSBLUR.assets.delete_feeds_by_folder(highlighted_feeds, function() {
NEWSBLUR.reader.flags['reloading_feeds'] = false;
$loading.removeClass('NB-active');
self.reset_feeds();