Thomas Bruederli
2013-02-05 e8fd39d12b4649d94d63d220d2201169b6dece08
Fix inserting a new contact group when list is still empty
2 files modified
17 ■■■■■ changed files
program/js/app.js 5 ●●●● patch | view | raw | blame | history
program/js/treelist.js 12 ●●●●● patch | view | raw | blame | history
program/js/app.js
@@ -4438,7 +4438,10 @@
      this.name_input_li = $('<li>').addClass(type).append(this.name_input);
      var li = type == 'contactsearch' ? $('li:last', this.gui_objects.folderlist) : $('ul.groups li:last', this.get_folder_li(this.env.source,'',true));
      this.name_input_li.insertAfter(li);
      if (li.length)
        this.name_input_li.insertAfter(li);
      else
        this.name_input_li.appendTo(type == 'contactsearch' ? this.gui_objects.folderlist : $('ul.groups', this.get_folder_li(this.env.source,'',true)));
    }
    this.name_input.select().focus();
program/js/treelist.js
@@ -263,7 +263,7 @@
        if (sibling) {
            li.insertAfter(sibling);
        }
        else {
        else if (first.id != myid) {
            li.insertBefore(first);
        }
@@ -380,18 +380,20 @@
    {
        var result = [];
        ul.children('li').each(function(i,e){
            var li = $(e);
            var li = $(e), sublist = li.children('ul');
            var node = {
                id: dom2id(li),
                classes: li.attr('class').split(' '),
                virtual: li.hasClass('virtual'),
                html: li.children().first().get(0).outerHTML,
                children: walk_list(li.children('ul'))
                children: walk_list(sublist)
            }
            if (sublist.length) {
                node.childlistclass = sublist.attr('class');
            }
            if (node.children.length) {
                node.childlistclass = li.children('ul').attr('class');
                node.collapsed = li.children('ul').css('display') == 'none';
                node.collapsed = sublist.css('display') == 'none';
            }
            if (li.hasClass('selected')) {
                selection = node.id;