# HG changeset patch # User veltr # Date 1358439623 -3600 # Node ID f1b68efb360a7c8b58e70c03c6ae9fb2f0feb828 # Parent 729a6ee4ea1c056a77221e25321b39f0d42bb23d Different handling of videos diff -r 729a6ee4ea1c -r f1b68efb360a integration/edition.html --- a/integration/edition.html Thu Dec 06 17:07:49 2012 +0100 +++ b/integration/edition.html Thu Jan 17 17:20:23 2013 +0100 @@ -345,7 +345,6 @@ - diff -r 729a6ee4ea1c -r f1b68efb360a integration/hashcut.html --- a/integration/hashcut.html Thu Dec 06 17:07:49 2012 +0100 +++ b/integration/hashcut.html Thu Jan 17 17:20:23 2013 +0100 @@ -254,7 +254,6 @@ - diff -r 729a6ee4ea1c -r f1b68efb360a integration/js/mashupcore.js --- a/integration/js/mashupcore.js Thu Dec 06 17:07:49 2012 +0100 +++ b/integration/js/mashupcore.js Thu Jan 17 17:20:23 2013 +0100 @@ -297,6 +297,8 @@ } + var can_play_mp4 = !!document.createElement('video').canPlayType('video/mp4'); + function addMedia(media) { if (media.has_player) { return; @@ -310,116 +312,155 @@ videoEl = $('