If a video file is not MP4, look for a MP4 version and use that.

modules/xerte/parent_templates/Nottingham/common_html5/mediaelement/mediaPlayer.js

@@ -96,36 +96,33 @@
 					}
 				}
 			});
-		}
-
-
-		var checkFileType = function() {
-			// if video is flv look for alternative mp4 file to use as this can play in flash player or video tag
+		};
+
+
+		var fileExists = function(url, resultCallback) {
 			$.ajax({
-				url:	eval(fileInfo[0] + ".mp4'"),
-				type:	"HEAD",
+				url: url,
+				type: 'HEAD',
 				success: function() {
-					// mp4 version exists - use this instead
+					resultCallback(true);
+				}, error: function() {
+					resultCallback(false);
+				}
+			});
+		};
+
+
+		if (fileInfo['1'] !== 'mp4') {
+			var url = eval(fileInfo[0] + ".mp4'");
+
+			fileExists(url, function(exists) {
+				if (exists) {
 					opts.source = fileInfo[0] + ".mp4'";
-					fileInfo.splice(1, 1, "mp4");
-					if (thisMedia.data("src") != undefined) { // save this new src so it doesn't have to check again if page returned to
-						thisMedia.data("src", opts.source);
-					}
-					setUpMedia();
-				},
-				error:	function() {
-					// no mp4 version to use - continue with flv
-					setUpMedia();
 				}
+
+				setUpMedia();
 			});
 		}
-
-
-		if (opts.type == "video" && fileInfo[1] == "flv") {
-			checkFileType();
-		} else {
-			setUpMedia();
-		}
-
-	}
+
+	};
 })(jQuery);