From 187c03801ce8e96ba815257f07132cf9c014e762 Mon Sep 17 00:00:00 2001 From: Mark Oleson Date: Mon, 10 Mar 2014 14:07:32 -0400 Subject: [PATCH] updated mediaelement to 2.13.2 --- .../mediaelement_rails/mediaelement.js | 3104 +++++---- .../mediaelement_rails/mediaelementplayer.js | 5987 +++++++++-------- .../flashmediaelement-cdn.swf | Bin 0 -> 29127 bytes .../mediaelement_rails/flashmediaelement.swf | Bin 29142 -> 28709 bytes .../mediaelementplayer.css.erb | 26 +- .../mediaelement_rails/mejs-skins.css.erb | 34 +- 6 files changed, 4567 insertions(+), 4584 deletions(-) create mode 100644 app/assets/plugins/mediaelement_rails/flashmediaelement-cdn.swf diff --git a/app/assets/javascripts/mediaelement_rails/mediaelement.js b/app/assets/javascripts/mediaelement_rails/mediaelement.js index 19e0c1e..5184cf8 100755 --- a/app/assets/javascripts/mediaelement_rails/mediaelement.js +++ b/app/assets/javascripts/mediaelement_rails/mediaelement.js @@ -15,7 +15,7 @@ var mejs = mejs || {}; // version number -mejs.version = '2.13.0'; +mejs.version = '2.13.2'; // player number (for missing, same id attr) @@ -23,386 +23,416 @@ mejs.meIndex = 0; // media types accepted by plugins mejs.plugins = { - silverlight: [ - {version: [3,0], types: ['video/mp4','video/m4v','video/mov','video/wmv','audio/wma','audio/m4a','audio/mp3','audio/wav','audio/mpeg']} - ], - flash: [ - {version: [9,0,124], types: ['video/mp4','video/m4v','video/mov','video/flv','video/rtmp','video/x-flv','audio/flv','audio/x-flv','audio/mp3','audio/m4a','audio/mpeg', 'video/youtube', 'video/x-youtube']} - //,{version: [12,0], types: ['video/webm']} // for future reference (hopefully!) - ], - youtube: [ - {version: null, types: ['video/youtube', 'video/x-youtube', 'audio/youtube', 'audio/x-youtube']} - ], - vimeo: [ - {version: null, types: ['video/vimeo', 'video/x-vimeo']} - ] + silverlight: [ + {version: [3,0], types: ['video/mp4','video/m4v','video/mov','video/wmv','audio/wma','audio/m4a','audio/mp3','audio/wav','audio/mpeg']} + ], + flash: [ + {version: [9,0,124], types: ['video/mp4','video/m4v','video/mov','video/flv','video/rtmp','video/x-flv','audio/flv','audio/x-flv','audio/mp3','audio/m4a','audio/mpeg', 'video/youtube', 'video/x-youtube']} + //,{version: [12,0], types: ['video/webm']} // for future reference (hopefully!) + ], + youtube: [ + {version: null, types: ['video/youtube', 'video/x-youtube', 'audio/youtube', 'audio/x-youtube']} + ], + vimeo: [ + {version: null, types: ['video/vimeo', 'video/x-vimeo']} + ] }; /* Utility methods */ mejs.Utility = { - encodeUrl: function(url) { - return encodeURIComponent(url); //.replace(/\?/gi,'%3F').replace(/=/gi,'%3D').replace(/&/gi,'%26'); - }, - escapeHTML: function(s) { - return s.toString().split('&').join('&').split('<').join('<').split('"').join('"'); - }, - absolutizeUrl: function(url) { - var el = document.createElement('div'); - el.innerHTML = 'x'; - return el.firstChild.href; - }, - getScriptPath: function(scriptNames) { - var - i = 0, - j, - codePath = '', - testname = '', - slashPos, - filenamePos, - scriptUrl, - scriptPath, - scriptFilename, - scripts = document.getElementsByTagName('script'), - il = scripts.length, - jl = scriptNames.length; - - // go through all