diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-05-30 10:53:19 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-05-30 10:53:19 +0200 |
| commit | b408e0bc532e6023248c6671c5cef52d1c06f3f3 (patch) | |
| tree | 70f578f0e0850d8cc2e91d3371dfd2a01b12e580 /program/js | |
| parent | 37dfc4bc0572a598e99ce0fa646648b22bf62415 (diff) | |
Display a warning if popup window was blocked (#1489618)
Diffstat (limited to 'program/js')
| -rw-r--r-- | program/js/app.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/program/js/app.js b/program/js/app.js index 914bb0278..cd0737e6d 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -685,9 +685,6 @@ function rcube_webmail() form.target = win.name; form.submit(); } - else { - // this.display_message(this.get_label('windowopenerror'), 'error'); - } } else { this.open_window(this.env.permaurl, true); @@ -1780,6 +1777,13 @@ function rcube_webmail() +(toolbar ? ',toolbar=yes,menubar=yes,status=yes' : ',toolbar=no,menubar=no,status=no')); } + // detect popup blocker (#1489618) + // don't care this might not work with all browsers + if (!extwin || extwin.closed) { + this.display_message(this.get_label('windowopenerror'), 'warning'); + return; + } + // write loading... message to empty windows if (!url && extwin.document) { extwin.document.write('<html><body>' + this.get_label('loading') + '</body></html>'); |