Use navigator.pdfViewerEnabled for PDF viewer detection

Drop ActiveXObject based detection code

2 files changed, 6 insertions, 17 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca5c9b3ee..875d353f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Update to jQuery-UI 1.13.1 (#8455)
+- Use navigator.pdfViewerEnabled for PDF viewer detection
 - Password: Add support for ssha256 algorithm (#8459)
 - Fix slow loading of long HTML content into the HTML editor (#8108)
 - Fix bug where SMTP password didn't work if it contained '%p' (#8435)
diff --git a/program/js/app.js b/program/js/app.js
index 26405387c..fdcc1249f 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -10012,29 +10012,17 @@ function rcube_webmail()
 
   this.pdf_support_check = function()
   {
+    if ('pdfViewerEnabled' in navigator)
+      return navigator.pdfViewerEnabled ? 1 : 0;
+
     var i, plugin = navigator.mimeTypes ? navigator.mimeTypes["application/pdf"] : {},
-      plugins = navigator.plugins,
-      len = plugins.length,
       regex = /Adobe Reader|PDF|Acrobat/i;
 
     if (plugin && plugin.enabledPlugin)
         return 1;
 
-    if ('ActiveXObject' in window) {
-      try {
-        if (plugin = new ActiveXObject("AcroPDF.PDF"))
-          return 1;
-      }
-      catch (e) {}
-      try {
-        if (plugin = new ActiveXObject("PDF.PdfCtrl"))
-          return 1;
-      }
-      catch (e) {}
-    }
-
-    for (i=0; i<len; i++) {
-      plugin = plugins[i];
+    for (i in navigator.plugins) {
+      plugin = navigator.plugins[i];
       if (typeof plugin === 'string') {
         if (regex.test(plugin))
           return 1;