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

Multi-select for folders.

Browse source
This commit is contained in:
Samuel Clay 2014-06-27 16:53:01 -07:00
parent 7dc8175f8b
commit d18be422be
4 changed files with 115 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
media/css/reader.css
View file

@ -6550,6 +6550,9 @@ form.opml_import_form input {
padding-top: 3px;
padding-bottom: 2px;
}
.NB-menu-manage .NB-menu-manage-feed-move-confirm {
padding: 0;
}
.NB-menu-manage .NB-menu-manage-confirm .NB-menu-manage-confirm-position {
position: absolute;
bottom: 2px;
@ -6626,6 +6629,56 @@ form.opml_import_form input {
max-height: 84px;
overflow-y: auto;
}
.NB-menu-manage .NB-menu-manage-feed-move-save {
display: none;
}
.NB-menu-manage .NB-menu-manage-feed-move-save {
float: right;
display: none;
}
.NB-menu-manage .NB-menu-manage-confirm .NB-change-folders {
width: 100%;
height: 84px;
overflow-y: auto;
}
.NB-menu-manage .NB-change-folders .NB-folders {
padding: 4px 0;
}
.NB-menu-manage .NB-change-folders .NB-folder-option {
overflow: hidden;
clear: both;
cursor: pointer;
}
.NB-menu-manage .NB-change-folders .NB-folder-option:hover {
background-color: rgba(0, 4, 0, .1);
}
.NB-menu-manage .NB-change-folders .NB-folder-option .NB-icon {
background: transparent url('/media/embed/icons/circular/g_icn_folder.png') no-repeat 0 0;
width: 16px;
height: 16px;
background-size: 16px;
float: left;
margin: 1px 4px;
}
.NB-menu-manage .NB-change-folders .NB-folder-option.NB-folder-option-active .NB-icon {
background: transparent url('/media/embed/icons/circular/g_icn_folder_rss.png') no-repeat 0 0;
background-size: 16px;
}
.NB-menu-manage .NB-change-folders .NB-folder-option.NB-folder-option-active .NB-selected-icon {
background: transparent url('/media/embed/icons/circular/widget_left.png') no-repeat 0 0;
float: right;
width: 13px;
height: 13px;
margin: 3px 4px 0 4px;
background-size: 13px 12px;
}
.NB-menu-manage .NB-change-folders .NB-folder-option-title {
padding: 3px 0 2px;
}
.NB-menu-manage .NB-change-folders .NB-folder-option.NB-folder-option-active .NB-folder-option-title {
font-weight: bold;
}
.NB-menu-manage .NB-menu-manage-story-share-confirm .NB-sideoption-share {
overflow: hidden;
border: none;

6
media/js/newsblur/models/feeds.js
View file

@ -86,6 +86,12 @@ NEWSBLUR.Models.Feed = Backbone.Model.extend({
return names;
},
in_folders: function() {
var in_folders = _.pluck(_.pluck(this.folders, 'options'), 'title');
return in_folders;
},
rename: function(new_title) {
this.set('feed_title', new_title);
NEWSBLUR.assets.rename_feed(this.id, new_title);

2
media/js/newsblur/models/folders.js
View file

@ -138,7 +138,7 @@ NEWSBLUR.Collections.Folders = Backbone.Collection.extend({
initialize: function(models, options) {
_.bindAll(this, 'propagate_feed_selected');
this.options = options || {};
this.options = _.extend({}, this.options, options);
this.parent_folder = options && options.parent_folder;
this.comparator = NEWSBLUR.Collections.Folders.comparator;
this.bind('change:feed_selected', this.propagate_feed_selected);

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

@ -3042,14 +3042,13 @@
$.make('div', { className: 'NB-menu-manage-title' }, 'Site settings')
]),
$.make('li', { className: 'NB-menu-item NB-menu-manage-move NB-menu-manage-feed-move' }, [
$.make('div', { className: 'NB-menu-manage-move-save NB-menu-manage-feed-move-save NB-modal-submit-green NB-modal-submit-button' }, 'Save'),
$.make('div', { className: 'NB-menu-manage-image' }),
$.make('div', { className: 'NB-menu-manage-title' }, 'Change folders')
]),
$.make('li', { className: 'NB-menu-subitem NB-menu-manage-confirm NB-menu-manage-feed-move-confirm NB-modal-submit' }, [
$.make('div', { className: 'NB-menu-manage-confirm-position'}, [
$.make('div', { className: 'NB-menu-manage-move-save NB-menu-manage-feed-move-save NB-modal-submit-green NB-modal-submit-button' }, 'Save'),
$.make('div', { className: 'NB-menu-manage-image' }),
$.make('div', { className: 'NB-add-folders' })
$.make('div', { className: 'NB-change-folders' })
])
]),
$.make('li', { className: 'NB-menu-item NB-menu-manage-rename NB-menu-manage-feed-rename' }, [
@ -3708,15 +3707,19 @@
var $move = $('.NB-menu-manage-feed-move,.NB-menu-manage-folder-move');
var $confirm = $('.NB-menu-manage-feed-move-confirm,.NB-menu-manage-folder-move-confirm');
var $position = $('.NB-menu-manage-confirm-position', $confirm);
var $add = $(".NB-add-folders", $confirm);
var $add = $(".NB-add-folders,.NB-change-folders", $confirm);
var $save = $(".NB-menu-manage-feed-move-save");
var $select = $('select', $confirm);
var isFeed = _.isNumber(feed_id);
if (_.isNumber(feed_id)) {
if (isFeed) {
var feed = this.model.get_feed(feed_id);
var feed_view = feed.get_view($feed, true);
var in_folder = feed_view.options.folder_title;
feed.set('menu_folders', null);
var $folders = this.make_folders_multiselect(feed);
$add.html($folders);
$save.addClass("NB-disabled").attr('disabled', "disabled").text('Select folders');
} else {
folder_view = NEWSBLUR.assets.folders.get_view($feed) ||
this.active_folder.folder_view;
@ -3724,7 +3727,7 @@
}
$move.addClass('NB-menu-manage-feed-move-cancel');
$('.NB-menu-manage-title', $move).text('Cancel move');
$('.NB-menu-manage-title', $move).text('Cancel');
$position.css('position', 'relative');
var height = $confirm.height();
$position.css('position', 'absolute');
@ -3732,6 +3735,9 @@
'duration': 380,
'easing': 'easeOutQuart'
});
if (isFeed) {
$save.fadeIn(380);
}
this.flags['showing_confirm_input_on_manage_menu'] = true;
if (!_.isNumber(feed_id)) {
@ -3745,9 +3751,11 @@
}
},
make_folders_multiselect: function(feed) {
make_folders_multiselect: function(feed, in_folders) {
var folders = NEWSBLUR.assets.get_folders();
var in_folders = _.pluck(_.pluck(feed.folders, 'options'), 'title');
if (!in_folders) in_folders = feed.in_folders();
in_folders = _.unique(in_folders.concat(feed.get('menu_folders') || []));
feed.set('menu_folders', in_folders);
var $options = $.make('div', { className: 'NB-folders' });
var $option = this.make_folder_selectable('Top Level', '', 0, _.any(in_folders, function(folder) {
return !folder;
@ -3764,7 +3772,7 @@
items.each(function(item) {
if (item.is_folder()) {
var title = item.get('folder_title');
var $option = self.make_folder_selectable(title, title, _.contains(in_folders, title));
var $option = self.make_folder_selectable(title, title, depth, _.contains(in_folders, title));
$options.append($option);
$options = self.make_folders_multiselect_options($options, item.folders, depth+1, in_folders);
}
@ -3778,17 +3786,45 @@
className: "NB-folder-option " + (selected ? "NB-folder-option-active" : ""),
style: 'padding-left: ' + depth*12 + 'px;'
}, [
$.make('div', { className: 'NB-selected-icon' }),
$.make('div', { className: 'NB-icon' }),
$.make('div', { className: 'NB-folder-option-title' }, folder_title)
]).data('folder', folder_value);
},
switch_change_folder: function(feed_id, folder_value) {
var feed = this.model.get_feed(feed_id);
var in_folders = feed.get('menu_folders');
var $confirm = $('.NB-menu-manage-feed-move-confirm,.NB-menu-manage-folder-move-confirm');
var $add = $(".NB-add-folders,.NB-change-folders", $confirm);
var $save = $(".NB-menu-manage-feed-move-save");
if (_.contains(in_folders, folder_value)) {
in_folders = _.without(in_folders, folder_value);
} else {
in_folders = in_folders.concat(folder_value);
}
feed.set('menu_folders', in_folders);
var $folders = this.make_folders_multiselect(feed, in_folders);
$add.html($folders);
$save.toggleClass("NB-disabled", !in_folders.length).attr('disabled', !in_folders.length ? "disabled" : false);
if (!in_folders.length) {
$save.text('Select a folder');
} else {
$save.text("Save " + Inflector.pluralize(' folder', in_folders.length, true));
}
},
hide_confirm_move_menu_item: function(moved) {
var $move_folder = $('.NB-menu-manage-folder-move');
var $move_feed = $('.NB-menu-manage-feed-move');
var $confirm_folder = $('.NB-menu-manage-folder-move-confirm');
var $confirm_feed = $('.NB-menu-manage-feed-move-confirm');
var $save = $(".NB-menu-manage-feed-move-save");
$move_folder.removeClass('NB-menu-manage-feed-move-cancel');
$move_feed.removeClass('NB-menu-manage-feed-move-cancel');
var text_folder = 'Move to folder';
@ -3806,6 +3842,7 @@
$('.NB-menu-manage-title', $move_feed).text(text_feed);
$confirm_feed.slideUp(500);
$confirm_folder.slideUp(500);
$save.hide();
this.flags['showing_confirm_input_on_manage_menu'] = false;
},
@ -5324,6 +5361,12 @@
var $folder = $t.parents('.NB-menu-manage').data('$folder');
self.manage_menu_delete_folder(folder_name, $folder);
});
$.targetIs(e, { tagSelector: '.NB-folder-option', childOf: '.NB-menu-manage' }, function($t, $p){
e.preventDefault();
e.stopPropagation();
var feed_id = $t.parents('.NB-menu-manage').data('feed_id');
self.switch_change_folder(feed_id, $t.data('folder') || '');
});
$.targetIs(e, { tagSelector: '.NB-menu-manage-move' }, function($t, $p){
e.preventDefault();
e.stopPropagation();
@ -5350,6 +5393,8 @@
$.targetIs(e, { tagSelector: '.NB-menu-manage-feed-move-save' }, function($t, $p){
e.preventDefault();
e.stopPropagation();
if ($t.hasClass('NB-disabled')) return;
var feed_id = $t.parents('.NB-menu-manage').data('feed_id');
var $feed = $t.parents('.NB-menu-manage').data('$feed');
self.manage_menu_move_feed(feed_id, $feed);