From 2d62ecec1d012ec1c75bcbbb177e62147d9f61c3 Mon Sep 17 00:00:00 2001 From: vogdb Date: Fri, 22 Jan 2016 19:16:07 +0300 Subject: [PATCH 1/9] report errors of createAudioPlayer --- library/CM/View/Abstract.js | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/library/CM/View/Abstract.js b/library/CM/View/Abstract.js index df28ae20c..0a1294d07 100644 --- a/library/CM/View/Abstract.js +++ b/library/CM/View/Abstract.js @@ -482,13 +482,12 @@ var CM_View_Abstract = Backbone.View.extend({ $element.attr('src', cm.getUrlResource('layout', 'audio/' + mp3Path)); $element.attr('autoplay', params.autoplay); - var error = false; - var mediaElement = new MediaElement($element.get(0), { + return new MediaElement($element.get(0), { startVolume: 1, flashName: cm.getUrlResource('layout', 'swf/flashmediaelement.swf'), silverlightName: cm.getUrlResource('layout', 'swf/silverlightmediaelement.xap'), - error: function() { - error = true; + error: function(err) { + throw err; }, success: function(mediaElement, domObject) { if (params.loop) { @@ -498,12 +497,6 @@ var CM_View_Abstract = Backbone.View.extend({ } } }); - if (error) { - mediaElement.play = new Function(); - mediaElement.pause = new Function(); - } - - return mediaElement; }, /** From 902f73437bbb398a37411b3204f9f34bba9a306a Mon Sep 17 00:00:00 2001 From: vogdb Date: Fri, 22 Jan 2016 22:11:48 +0300 Subject: [PATCH 2/9] Update mediaelement.js from 2.18.1 to 2.19.0. --- .../mediaelement/mediaelement-and-player.js | 148 ++++++++++-------- 1 file changed, 80 insertions(+), 68 deletions(-) diff --git a/client-vendor/after-body/mediaelement/mediaelement-and-player.js b/client-vendor/after-body/mediaelement/mediaelement-and-player.js index ad30ac645..98e57c47e 100755 --- a/client-vendor/after-body/mediaelement/mediaelement-and-player.js +++ b/client-vendor/after-body/mediaelement/mediaelement-and-player.js @@ -16,7 +16,7 @@ var mejs = mejs || {}; // version number -mejs.version = '2.18.1'; +mejs.version = '2.19.0'; // player number (for missing, same id attr) @@ -182,6 +182,18 @@ mejs.Utility = { time = 0; } + // Maintain backward compatibility with method signature before v2.18. + if (typeof options !== 'object') { + var format = 'm:ss'; + format = arguments[1] ? 'hh:mm:ss' : format; // forceHours + format = arguments[2] ? format + ':ff' : format; // showFrameCount + + options = { + currentTimeFormat: format, + framesPerSecond: arguments[3] || 25 + }; + } + var fps = options.framesPerSecond; if(typeof fps === 'undefined') { fps = 25; @@ -413,16 +425,17 @@ mejs.MediaFeatures = { t.isGecko = (ua.match(/gecko/gi) !== null) && !t.isWebkit && !t.isIE; t.isOpera = (ua.match(/opera/gi) !== null); t.hasTouch = ('ontouchstart' in window); // && window.ontouchstart != null); // this breaks iOS 7 - - // borrowed from Modernizr - t.svg = !! document.createElementNS && - !! document.createElementNS('http://www.w3.org/2000/svg','svg').createSVGRect; + + // Borrowed from `Modernizr.svgasimg`, sources: + // - https://github.com/Modernizr/Modernizr/issues/687 + // - https://github.com/Modernizr/Modernizr/pull/1209/files + t.svgAsImg = !!document.implementation.hasFeature('http://www.w3.org/TR/SVG11/feature#Image', '1.1'); // create HTML5 media elements for IE before 9, get a