vendor/assets/javascripts/webshims/shims/combos/23.js in webshims-rails-1.11.2 vs vendor/assets/javascripts/webshims/shims/combos/23.js in webshims-rails-1.11.3

- old
+ new

@@ -586,11 +586,11 @@ tmp = elem.attr('data-server'); if(tmp != null){ src.server = tmp; } - tmp = elem.attr('type'); + tmp = elem.attr('type') || elem.attr('data-type'); if(tmp){ src.type = tmp; src.container = $.trim(tmp.split(';')[0]); } else { if(!nodeName){ @@ -610,10 +610,15 @@ src.type = tmp; src.container = tmp; } } } + + if(!src.container){ + $(elem).attr('data-wsrecheckmimetype', ''); + } + tmp = elem.attr('media'); if(tmp){ src.media = tmp; } if(src.type == 'audio/rtmp' || src.type == 'video/rtmp'){ @@ -843,18 +848,21 @@ }; var handleThird = (function(){ var requested; + var readyType = hasSwf ? swfType : 'mediaelement-yt'; return function( mediaElem, ret, data ){ + //readd to ready - webshims.ready(hasSwf ? swfType : 'mediaelement-yt', function(){ - if(mediaelement.createSWF){ + + webshims.ready(readyType, function(){ + if(mediaelement.createSWF && $(mediaElem).parent()[0]){ mediaelement.createSWF( mediaElem, ret, data ); } else if(!requested) { requested = true; loadThird(); - //readd to ready + handleThird( mediaElem, ret, data ); } }); if(!requested && hasYt && !mediaelement.createSWF){ loadYt(); \ No newline at end of file