New folder options: add subfolder.

This commit is contained in:
Samuel Clay 2012-09-13 14:20:09 -07:00
parent f351226846
commit 717402261d
3 changed files with 16 additions and 1 deletions

View file

@ -5135,6 +5135,9 @@ form.opml_import_form input {
.NB-menu-manage .NB-menu-manage-folder-subscribe .NB-menu-manage-image {
background: transparent url('/media/embed/icons/silk/add.png') no-repeat 0 1px;
}
.NB-menu-manage .NB-menu-manage-folder-subfolder .NB-menu-manage-image {
background: transparent url('/media/embed/icons/silk/folder.png') no-repeat 0 1px;
}
.NB-menu-manage .NB-menu-manage-social-profile .NB-menu-manage-image {
background: transparent url('/media/embed/icons/silk/user_orange.png') no-repeat 0 1px;
}

View file

@ -2622,6 +2622,10 @@
$.make('div', { className: 'NB-menu-manage-image' }),
$.make('div', { className: 'NB-menu-manage-title' }, 'Add a site to this folder')
]),
$.make('li', { className: 'NB-menu-item NB-menu-manage-folder-subfolder' }, [
$.make('div', { className: 'NB-menu-manage-image' }),
$.make('div', { className: 'NB-menu-manage-title' }, 'Create a new subfolder')
]),
$.make('li', { className: 'NB-menu-separator' }),
$.make('li', { className: 'NB-menu-subitem NB-menu-manage-controls NB-menu-manage-controls-folder' }, [
$.make('ul', { className: 'segmented-control NB-menu-manage-view-setting-order' }, [
@ -4689,6 +4693,12 @@
var $folder = $t.parents('.NB-menu-manage').data('$folder');
self.open_add_feed_modal({folder_title: folder_name});
});
$.targetIs(e, { tagSelector: '.NB-menu-manage-folder-subfolder' }, function($t, $p){
e.preventDefault();
var folder_name = $t.parents('.NB-menu-manage').data('folder_name');
var $folder = $t.parents('.NB-menu-manage').data('$folder');
self.open_add_feed_modal({folder_title: folder_name, init_folder: true});
});
$.targetIs(e, { tagSelector: '.NB-menu-manage-story-open' }, function($t, $p){
e.preventDefault();
if (!self.flags['showing_confirm_input_on_manage_menu']) {

View file

@ -105,7 +105,9 @@ _.extend(NEWSBLUR.ReaderAddFeed.prototype, {
},
focus_add_feed: function() {
var $add = $('.NB-add-url', this.$modal);
var $add = this.options.init_folder ?
$('.NB-add-folder', this.$modal) :
$('.NB-add-url', this.$modal);
if (!NEWSBLUR.Globals.is_anonymous) {
_.delay(function() {
$add.focus();