vendor/assets/javascripts/webshims/shims/combos/23.js in webshims-rails-1.11.3.1 vs vendor/assets/javascripts/webshims/shims/combos/23.js in webshims-rails-1.11.6
- old
+ new
@@ -493,11 +493,11 @@
1: 1
};
var switchOptions = function(e){
var media, error, parent;
if(!options.preferFlash &&
- ($(e.target).is('audio, video') || ((parent = e.target.parentNode) && $('source:last', parent)[0] == e.target)) &&
+ ($(e.target).is('audio, video') || ((parent = e.target.parentNode) && $('source', parent).last()[0] == e.target)) &&
(media = $(e.target).closest('audio, video')) && (error = media.prop('error')) && !noSwitch[error.code]
){
$(function(){
if(hasSwf && !options.preferFlash){
@@ -1001,9 +1001,10 @@
var data = webshims.data(this, 'mediaelement');
selectSource(this, data);
if(hasNative && (!data || data.isActive == 'html5') && supLoad.prop._supvalue){
supLoad.prop._supvalue.apply(this, arguments);
}
+ $(this).triggerHandler('wsmediareload');
}
}
});
nativeCanPlayType[nodeName] = webshims.defineNodeNameProperty(nodeName, 'canPlayType', {
prop: {
\ No newline at end of file