vendor/assets/javascripts/webshims/shims/combos/12.js in webshims-rails-1.14.5 vs vendor/assets/javascripts/webshims/shims/combos/12.js in webshims-rails-1.14.6

@@ -280,11 +280,11 @@
 			}
 		})();
 	}
 
 webshims.register('mediaelement-core', function($, webshims, window, document, undefined, options){
-	var hasSwf = swfmini.hasFlashPlayerVersion('10.0.3');
+	var hasSwf = swfmini.hasFlashPlayerVersion('11.3');
 	var mediaelement = webshims.mediaelement;
 	
 	mediaelement.parseRtmp = function(data){
 		var src = data.src.split('://');
 		var paths = src[1].split('/');
@@ -390,10 +390,11 @@
 			loadSwf();
 		} else {
 			loadYt();
 		}
 	};
+
 	
 	webshims.addPolyfill('mediaelement-yt', {
 		test: !hasYt,
 		d: ['dom-support']
 	});
@@ -434,11 +435,20 @@
 	
 	mediaelement.getTypeForSrc = function(src, nodeName){
 		if(src.indexOf('youtube.com/watch?') != -1 || src.indexOf('youtube.com/v/') != -1){
 			return 'video/youtube';
 		}
-		if(src.indexOf('rtmp') === 0){
+
+		if(!src.indexOf('mediastream:') || !src.indexOf('blob:http')){
+			return 'usermedia';
+		}
+
+		if(!src.indexOf('webshimstream')){
+			return 'jarisplayer/stream';
+		}
+
+		if(!src.indexOf('rtmp')){
 			return nodeName+'/rtmp';
 		}
 		src = src.split('?')[0].split('#')[0].split('.');
 		src = src[src.length - 1];
 		var mt;
@@ -451,32 +461,28 @@
 		});
 		return mt;
 	};
 	
 	
-	mediaelement.srces = function(mediaElem, srces){
+	mediaelement.srces = function(mediaElem){
+		var srces = [];
 		mediaElem = $(mediaElem);
-		if(!srces){
-			srces = [];
-			var nodeName = mediaElem[0].nodeName.toLowerCase();
-			var src = getSrcObj(mediaElem, nodeName);
-			
-			if(!src.src){
-				$('source', mediaElem).each(function(){
-					src = getSrcObj(this, nodeName);
-					if(src.src){srces.push(src);}
-				});
-			} else {
-				srces.push(src);
-			}
-			return srces;
+		var nodeName = mediaElem[0].nodeName.toLowerCase();
+		var src = getSrcObj(mediaElem, nodeName);
+
+		if(!src.src){
+			$('source', mediaElem).each(function(){
+				src = getSrcObj(this, nodeName);
+				if(src.src){srces.push(src);}
+			});
 		} else {
-			webshims.error('setting sources was removed.');
+			srces.push(src);
 		}
+		return srces;
 	};
 	
-	mediaelement.swfMimeTypes = ['video/3gpp', 'video/x-msvideo', 'video/quicktime', 'video/x-m4v', 'video/mp4', 'video/m4p', 'video/x-flv', 'video/flv', 'audio/mpeg', 'audio/aac', 'audio/mp4', 'audio/x-m4a', 'audio/m4a', 'audio/mp3', 'audio/x-fla', 'audio/fla', 'youtube/flv', 'video/jarisplayer', 'jarisplayer/jarisplayer', 'video/youtube', 'video/rtmp', 'audio/rtmp'];
+	mediaelement.swfMimeTypes = ['video/3gpp', 'video/x-msvideo', 'video/quicktime', 'video/x-m4v', 'video/mp4', 'video/m4p', 'video/x-flv', 'video/flv', 'audio/mpeg', 'audio/aac', 'audio/mp4', 'audio/x-m4a', 'audio/m4a', 'audio/mp3', 'audio/x-fla', 'audio/fla', 'youtube/flv', 'video/jarisplayer', 'jarisplayer/jarisplayer', 'jarisplayer/stream', 'video/youtube', 'video/rtmp', 'audio/rtmp'];
 	
 	mediaelement.canThirdPlaySrces = function(mediaElem, srces){
 		var ret = '';
 		if(hasSwf || hasYt){
 			mediaElem = $(mediaElem);
@@ -502,11 +508,11 @@
 			var nativeCanPlay = (nativeCanPlayType[nodeName] || {prop: {_supvalue: false}}).prop._supvalue || mediaElem[0].canPlayType;
 			if(!nativeCanPlay){return ret;}
 			srces = srces || mediaelement.srces(mediaElem);
 			
 			$.each(srces, function(i, src){
-				if(src.type && nativeCanPlay.call(mediaElem[0], src.type) ){
+				if(src.type == 'usermedia' || (src.type && nativeCanPlay.call(mediaElem[0], src.type)) ){
 					ret = src;
 					return false;
 				}
 			});
 		}
@@ -1217,15 +1223,33 @@
 			}
 			if(obj.kind == 'subtitles' && !obj.language){
 				webshims.error('you must provide a language for track in subtitles state');
 			}
 			obj.__wsmode = obj.mode;
+
+			webshims.defineProperty(obj, '_wsUpdateMode', {
+				value: function(){
+					$(mediaelem).triggerHandler('updatetrackdisplay');
+				},
+				enumerable: false
+			});
 		}
 		
 		return obj;
 	};
 
+	if(!$.propHooks.mode){
+		$.propHooks.mode = {
+			set: function(obj, value){
+				obj.mode = value;
+				if(obj._wsUpdateMode && obj._wsUpdateMode.call){
+					obj._wsUpdateMode();
+				}
+				return obj.mode;
+			}
+		};
+	}
 
 /*
 taken from:
 Captionator 0.5.1 [CaptionCrunch]
 Christopher Giffard, 2011
@@ -1472,10 +1496,10 @@
 	
 	$.each(copyProps, function(i, copyProp){
 		var name = copyName[copyProp] || copyProp;
 		webshims.onNodeNamesPropertyModify('track', copyProp, function(){
 			var trackData = webshims.data(this, 'trackData');
-			var track = this;
+
 			if(trackData){
 				if(copyProp == 'kind'){
 					refreshTrack(this, trackData);
 				}
 				if(!supportTrackMod){