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

Fixing merge conflict.

Browse source
This commit is contained in:
Samuel Clay 2014-11-17 16:38:41 -08:00
parent 1bc6941cd3
commit 1155b0e486
1 changed files with 0 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
media/js/newsblur/reader/reader_feedchooser.js
View file

@ -272,48 +272,11 @@ _.extend(NEWSBLUR.ReaderFeedchooser.prototype, {
}
},
<<<<<<< HEAD
open_modal: function() {
var self = this;
this.$modal.modal({
'minWidth': this.options.premium_only || this.options.chooser_only ? 460 : 900,
'maxWidth': this.options.premium_only || this.options.chooser_only ? 460 : 900,
'overlayClose': true,
'onOpen': function (dialog) {
dialog.overlay.fadeIn(200, function () {
dialog.container.fadeIn(200);
dialog.data.fadeIn(200, function() {
_.defer(_.bind(self.resize_modal, self), 10);
});
});
},
'onShow': function(dialog) {
$('#simplemodal-container').corner('6px');
},
'onClose': function(dialog, callback) {
if (!self.flags['has_saved'] && !self.model.flags['has_chosen_feeds']) {
NEWSBLUR.reader.show_feed_chooser_button();
}
dialog.data.hide().empty().remove();
dialog.container.hide().empty().remove();
dialog.overlay.fadeOut(200, function() {
dialog.overlay.empty().remove();
$.modal.close(callback);
});
$('.NB-modal-holder').empty().remove();
}
});
},
add_feed_to_decline: function(feed, update) {
feed.highlight_in_all_folders(false, true, {silent: !update});
=======
add_feed_to_decline: function(feed_id, update) {
this.approve_list = _.without(this.approve_list, feed_id);
var $feed = this.$feeds[feed_id];
if (!$feed) return;
>>>>>>> master
if (update) {
this.update_counts();