summaryrefslogtreecommitdiff
path: root/program/js/app.js
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-05-04 18:53:11 +0000
committeralecpl <alec@alec.pl>2011-05-04 18:53:11 +0000
commitba9c7b40f0dfcadf1d5711246e7b332ff7a60787 (patch)
tree10d8bc0a125fe8bc29d33592a480e245c5627e21 /program/js/app.js
parent4a7ed027e4d9b605060cecc9bd97bc3dd2c1889b (diff)
- Apply fixes from trunk (up to r4728)
Diffstat (limited to 'program/js/app.js')
-rw-r--r--program/js/app.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 8cdddccca..07947db76 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -4872,8 +4872,9 @@ function rcube_webmail()
quota_width = parseInt(quota / 100 * width),
pos = $(obj).position();
- // Opera bug?
+ // workarounds for Opera and Webkit bugs
pos.top = Math.max(0, pos.top);
+ pos.left = Math.max(0, pos.left);
this.env.indicator_width = width;
this.env.indicator_height = height;
@@ -5163,7 +5164,7 @@ function rcube_webmail()
this.set_busy(false, null, lock);
request.abort();
- if (errmsg)
+ if (request.status && errmsg)
this.display_message(this.get_label('servererror') + ' (' + errmsg + ')', 'error');
};