Merge branch 'master' into extension_manager

1 files changed, 0 insertions, 19 deletions

diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index 182d5fefe..8ca21ecab 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -921,23 +921,4 @@ var dw_mediamanager = {
     }
 };
 
-// moved from helpers.js temporarily here
-/**
- * Very simplistic Flash plugin check, probably works for Flash 8 and higher only
- *
- */
-function hasFlash(version){
-    var ver = 0, axo;
-    try{
-        if(navigator.plugins !== null && navigator.plugins.length > 0){
-           ver = navigator.plugins["Shockwave Flash"].description.split(' ')[2].split('.')[0];
-        }else{
-           axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash");
-           ver = axo.GetVariable("$version").split(' ')[1].split(',')[0];
-        }
-    }catch(e){ }
-
-    return ver >= version;
-}
-
 jQuery(dw_mediamanager.init);