Merge pull request mediaelement#801 from jbdemonte/master

fix type resolution when extension is uppercased
avalonmediasystem · Apr 10, 2013 · 1ebb8cb · 1ebb8cb
2 parents 7978693 + 36605b9
commit 1ebb8cb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/js/me-i18n.js b/src/js/me-i18n.js
@@ -37,12 +37,11 @@
  *   me-i18n-locale.js
  *
  * @params
- *  - $       - zepto || jQuery  ..
  *  - context - document, iframe ..
  *  - exports - CommonJS, window ..
  *
  */
-;(function($, context, exports, undefined) {
+;(function(context, exports, undefined) {
     "use strict";
     var i18n = {
         "locale": {
@@ -192,4 +191,4 @@
 
 // end i18n
     exports.i18n = i18n;
-}(jQuery, document, mejs));
+}(document, mejs));
diff --git a/src/js/me-shim.js b/src/js/me-shim.js
@@ -371,7 +371,7 @@ mejs.HtmlMediaElementShim = {
 
 	getTypeFromFile: function(url) {
 		url = url.split('?')[0];
-		var ext = url.substring(url.lastIndexOf('.') + 1);
+		var ext = url.substring(url.lastIndexOf('.') + 1).toLowerCase();
 		return (/(mp4|m4v|ogg|ogv|webm|webmv|flv|wmv|mpeg|mov)/gi.test(ext) ? 'video' : 'audio') + '/' + this.getTypeFromExtension(ext);
 	},