summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorestadtherr <estadtherr@208e9e7b-5314-0410-a742-e7e81cd9613c>2006-11-11 23:02:04 +0000
committerestadtherr <estadtherr@208e9e7b-5314-0410-a742-e7e81cd9613c>2006-11-11 23:02:04 +0000
commita5719fd480ec0325b45344c7effcba55ee3c93da (patch)
tree838f7e1dad2f1284e0ecf90081d17b53ab84ad0f
parent628e63d11ba7f1e9c8edb3cf78256037795e867e (diff)
finish previous commit
git-svn-id: https://svn.roundcube.net/trunk@366 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/CHANGELOG5
-rw-r--r--roundcubemail/program/js/app.js10
2 files changed, 11 insertions, 4 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index 7b67ed27d..831f444bc 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/CHANGELOG
@@ -1,6 +1,11 @@
CHANGELOG RoundCube Webmail
---------------------------
+2006/11/11 (estadtherr)
+----------
+- fixed deletion/moving of messages from within "show" page
+
+
2006/11/07 (estadtherr)
----------
- Upgraded to TinyMCE v2.0.8
diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js
index 50078cfd8..caef29271 100644
--- a/roundcubemail/program/js/app.js
+++ b/roundcubemail/program/js/app.js
@@ -1272,10 +1272,12 @@ function rcube_webmail()
this.permanently_remove_messages = function()
{
// exit if no mailbox specified or if selection is empty
- var selection = this.message_list.get_selection();
- if (!(selection.length || this.env.uid))
- return;
-
+ if (!this.env.uid)
+ {
+ if (!this.message_list || !this.message_list.get_selection().length)
+ return;
+ }
+
var a_uids = new Array();
if (this.env.uid)