diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-07-31 11:01:10 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-07-31 11:01:10 +0000 |
| commit | e7e5632b102ed3a69e8abf928d0510750c7187fa (patch) | |
| tree | f2d225d3ab72076221d81242e33bf23f03d51288 | |
| parent | 295f8920b1f24bb3c558f61491a20e8b2c582be6 (diff) | |
Don't hide upload box on document click in Safari on Windows (#1486823)
git-svn-id: https://svn.roundcube.net/trunk@3848 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 2 | ||||
| -rw-r--r-- | roundcubemail/skins/default/functions.js | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index fe27ecda1..84244a5e7 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -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 diff --git a/roundcubemail/skins/default/functions.js b/roundcubemail/skins/default/functions.js index a42c47d2b..2112c340c 100644 --- a/roundcubemail/skins/default/functions.js +++ b/roundcubemail/skins/default/functions.js @@ -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))) ) { |