Display a warning if popup window was blocked (#1489618)

10 years ago · b408e0bc53
parent 37dfc4bc05
commit b408e0bc53
4 changed files with 11 additions and 4 deletions
--- a/1
+++ b/1
@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================

+- Display a warning if popup window was blocked (#1489618)
 - Remove (was: ...) from message subject on reply (#1489375)
 - Update to TinyMCE 4.0 (#1489057)
 - Enable autolink plugin in TinyMCE (#1488845)
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@ -428,7 +428,8 @@ class rcmail extends rcube
        }

        // add some basic labels to client
-        $this->output->add_label('loading', 'servererror', 'connerror', 'requesttimedout', 'refreshing');
+        $this->output->add_label('loading', 'servererror', 'connerror', 'requesttimedout',
+            'refreshing', 'windowopenerror');

        return $this->output;
    }
--- 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>');
--- a/program/localization/en_US/messages.inc
+++ b/program/localization/en_US/messages.inc
@ -26,6 +26,7 @@ $messages['servererror'] = 'Server Error!';
 $messages['servererrormsg'] = 'Server Error: $msg';
 $messages['connerror'] = 'Connection Error (Failed to reach the server)!';
 $messages['dberror'] = 'Database Error!';
+$messages['windowopenerror'] = 'The popup window was blocked!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';