banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:roundcube/roundcubemail

Browse Source
pull/198/head
Aleksander Machniak 10 years ago
parent 7706df99f0 bde467d8da
commit e306ac72fc
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File

10
program/js/treelist.js
Unescape Escape View File

@ -339,18 +339,22 @@ function rcube_treelist_widget(node, p)
if (updates.id || updates.html || updates.children || updates.classes || updates.parent) { if (updates.id || updates.html || updates.children || updates.classes || updates.parent) {
if (updates.parent && (parent_node = indexbyid[updates.parent])) { if (updates.parent && (parent_node = indexbyid[updates.parent])) {
// remove reference from old parent's child list // remove reference from old parent's child list
if (old_parent = indexbyid[dom2id(parent_ul.closest('li'))]) { if (parent_ul.closest('li').length && (old_parent = indexbyid[dom2id(parent_ul.closest('li'))])) {
old_parent.children = $.grep(old_parent.children, function(elem, i){ return elem.id != node.id; }); old_parent.children = $.grep(old_parent.children, function(elem, i){ return elem.id != node.id; });
} }
// append to new parent node // append to new parent node
parent_ul = id2dom(updates.parent).children('ul').first(); parent_ul = id2dom(updates.parent).children('ul').first();
if (!parent_node.children) if (!parent_node.children)
parent_node.children = []; parent_node.children = [];
parent_node.children.push(node); parent_node.children.push(node);
} }
else if (updates.parent !== undefined) {
parent_ul = container;
}
$.extend(node, updates); $.extend(node, updates);
render_node(node, parent_ul, li); li = render_node(node, parent_ul, li);
} }
if (node.id != id) { if (node.id != id) {
@ -677,7 +681,7 @@ function rcube_treelist_widget(node, p)
*/ */
function dom2id(li) function dom2id(li)
{ {
var domid = li.attr('id').replace(new RegExp('^' + (p.id_prefix) || '%'), '').replace(/--xsR$/, ''); var domid = String(li.attr('id')).replace(new RegExp('^' + (p.id_prefix) || '%'), '').replace(/--xsR$/, '');
return p.id_decode ? p.id_decode(domid) : domid; return p.id_decode ? p.id_decode(domid) : domid;
} }

Write Preview
Loading…
Cancel
Save