- Fix folder rename/delete buttons do not appear on creation of first folder (#1486468)

release-0.6
alecpl 15 years ago
parent f52e7a0073
commit c5c3ae791d

@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail CHANGELOG RoundCube Webmail
=========================== ===========================
- Fix folder rename/delete buttons do not appear on creation of first folder (#1486468)
- Fix character set conversion fails on systems where iconv doesn't accept //IGNORE (#1486375) - Fix character set conversion fails on systems where iconv doesn't accept //IGNORE (#1486375)
- Login preformance: Create default folders on first login only - Login preformance: Create default folders on first login only
- Import contacts into the selected address book (by Phil Weir) - Import contacts into the selected address book (by Phil Weir)

@ -3368,10 +3368,13 @@ function rcube_webmail()
if (!this.gui_objects.subscriptionlist) if (!this.gui_objects.subscriptionlist)
return false; return false;
// find not protected folder // find not protected folder
for (var refid in this.env.subscriptionrows) var refid;
if (this.env.subscriptionrows[refid]!=null && !this.env.subscriptionrows[refid][2]) for (var rid in this.env.subscriptionrows)
if (this.env.subscriptionrows[rid]!=null && !this.env.subscriptionrows[rid][2]) {
refid = rid;
break; break;
}
var refrow, form; var refrow, form;
var tbody = this.gui_objects.subscriptionlist.tBodies[0]; var tbody = this.gui_objects.subscriptionlist.tBodies[0];
@ -3384,10 +3387,11 @@ function rcube_webmail()
refid = replace.id; refid = replace.id;
} }
if (!id || !(refrow = document.getElementById(refid))) if (!id || !refid || !(refrow = document.getElementById(refid)))
{ {
// Refresh page if we don't have a table row to clone // Refresh page if we don't have a table row to clone
this.goto_url('folders'); this.goto_url('folders');
return false;
} }
else else
{ {
@ -3413,7 +3417,7 @@ function rcube_webmail()
// set messages count to zero // set messages count to zero
if (!replace) if (!replace)
row.cells[1].innerHTML = '*'; row.cells[1].innerHTML = '*';
if (!replace && row.cells[2] && row.cells[2].firstChild.tagName.toLowerCase()=='input') if (!replace && row.cells[2] && row.cells[2].firstChild.tagName.toLowerCase()=='input')
{ {
row.cells[2].firstChild.value = name; row.cells[2].firstChild.value = name;
@ -4175,7 +4179,7 @@ function rcube_webmail()
if (this.env.framed && window.parent) if (this.env.framed && window.parent)
parent.location.href = url; parent.location.href = url;
else else
location.href = url; location.href = url;
}; };

Loading…
Cancel
Save