Reworked and improved version detection (to solve FF51)

syranide · Mar 30, 2017 · 26b441e · 26b441e
1 parent 9f87416
commit 26b441e
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 29 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "swf-player-version",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "license": "MIT",
   "description": "Shockwave Flash Player version utility",
   "authors": ["Andreas Svensson <[email protected]>"],

diff --git a/npm-swf-player-version/package.json b/npm-swf-player-version/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swf-player-version",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "license": "MIT",
   "description": "Shockwave Flash Player version utility",
   "author": "Andreas Svensson <[email protected]>",

diff --git a/npm-swf-player-version/swf-player-version.js b/npm-swf-player-version/swf-player-version.js
@@ -1,4 +1,4 @@
-/*! swf-player-version v1.1.4 | @syranide | MIT license */
+/*! swf-player-version v1.1.5 | @syranide | MIT license */
 
 'use strict';
 
@@ -19,17 +19,15 @@ function parseVersion(description) {
 
 function detectAvailableVersion() {
   if (typeof navigator === 'object') {
-    if (navigator.mimeTypes) {
+    if (navigator.plugins && navigator.mimeTypes) {
+      var plugin = navigator.plugins['Shockwave Flash'];
       var mimeType = navigator.mimeTypes['application/x-shockwave-flash'];
 
-      if (mimeType) {
-        var plugin = mimeType.enabledPlugin;
-
-        if (plugin) {
-          // Expected format "Shockwave Flash #.# r#", "Shockwave Flash #.# d#"
-          detectedVersion = parseVersion(plugin.description);
-          return;
-        }
+      // FF51 mimeType.enabledPlugin does not return a valid plugin
+      if (plugin && mimeType && mimeType.enabledPlugin) {
+        // Expected format "Shockwave Flash #.# r#", "Shockwave Flash #.# d#"
+        detectedVersion = parseVersion(plugin.description);
+        return;
       }
     }
   }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swf-player-version",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "license": "MIT",
   "description": "Shockwave Flash Player version utility",
   "author": "Andreas Svensson <[email protected]>",

diff --git a/swf-player-version.js b/swf-player-version.js
@@ -1,4 +1,4 @@
-/*! swf-player-version v1.1.4 | @syranide | MIT license */
+/*! swf-player-version v1.1.5 | @syranide | MIT license */
 
 (function(root, factory) {
   if (typeof define === 'function' && define.amd) {
@@ -14,10 +14,6 @@
   var detectedVersion;
 
   function parseVersion(description) {
-    if (typeof description !== 'string') {
-      return '0.0.0';
-    }
-
     var match = description.match(/\d+/g);
     if (match != null) {
       return match.slice(0, 3).join('.');
@@ -28,17 +24,15 @@
 
   function detectAvailableVersion() {
     if (typeof navigator === 'object') {
-      if (navigator.mimeTypes) {
+      if (navigator.plugins && navigator.mimeTypes) {
+        var plugin = navigator.plugins['Shockwave Flash'];
         var mimeType = navigator.mimeTypes['application/x-shockwave-flash'];
 
-        if (mimeType) {
-          var plugin = mimeType.enabledPlugin;
-
-          if (plugin) {
-            // Expected format "Shockwave Flash #.# r#", "Shockwave Flash #.# d#"
-            detectedVersion = parseVersion(plugin.description);
-            return;
-          }
+        // FF51 mimeType.enabledPlugin does not return a valid plugin
+        if (plugin && mimeType && mimeType.enabledPlugin) {
+          // Expected format "Shockwave Flash #.# r#", "Shockwave Flash #.# d#"
+          detectedVersion = parseVersion(plugin.description);
+          return;
         }
       }
     }

diff --git a/swf-player-version.min.js b/swf-player-version.min.js