Don't hide upload box on document click in Safari on Windows (#1486823)

release-0.6
thomascube 14 years ago
parent dbdd71f166
commit 0e2ccb3bca

@ -1,6 +1,8 @@
CHANGELOG RoundCube Webmail
===========================
- Fix disapearing upload form disapears when user selects a file on Safari (#1486823)
- Don't replace error messages with loading info (#1486300)
- Fix JS errors on compose mode switch (#1486870)
- Fix message structure parsing when it lacks optional fields (#1486881)
- Include all recipients in sendmail log

@ -36,7 +36,7 @@ function rcube_mail_ui()
groupmenu: {id:'groupoptionsmenu', above:1},
mailboxmenu: {id:'mailboxoptionsmenu', above:1},
composemenu: {id:'composeoptionsmenu', editable:1},
uploadmenu: {id:'attachment-form', editable:1, above:1}
uploadmenu: {id:'attachment-form', editable:1, above:1, toggle:bw.safari&&bw.win }
};
var obj;
@ -68,6 +68,8 @@ show_popupmenu: function(popup, show)
if (typeof show == 'undefined')
show = obj.is(':visible') ? false : true;
else if (this.popups[popup].toggle && show && this.popups[popup].obj.is(':visible') )
show = false;
if (show && ref) {
var pos = $(ref).offset();
@ -215,6 +217,7 @@ body_mouseup: function(evt, p)
for (i in this.popups) {
if (this.popups[i].obj.is(':visible') && target != rcube_find_object(i+'link')
&& !this.popups[i].toggle
&& (!this.popups[i].editable || !this.target_overlaps(target, this.popups[i].id))
&& (!this.popups[i].sticky || !rcube_mouse_is_over(evt, rcube_find_object(this.popups[i].id)))
) {

Loading…
Cancel
Save