# HG changeset patch # User hamidouk # Date 1323257696 -3600 # Node ID 03beb43df33ae6e7dbbd0a62c61822b0108d1c70 # Parent fe7e46eda1b41995ac23c13881379c7a2ec2dcbe call our Popcorn replacement when using jwplayer instead of the real popcorn. diff -r fe7e46eda1b4 -r 03beb43df33a src/js/init.js --- a/src/js/init.js Wed Dec 07 12:34:29 2011 +0100 +++ b/src/js/init.js Wed Dec 07 12:34:56 2011 +0100 @@ -27,6 +27,8 @@ break; case "jwplayer": + Popcorn.noConflict(); /* remove current popcorn instance */ + Popcorn = PopcornReplacement; var opts = IriSP.jQuery.extend({}, options); delete opts.container; pop = Popcorn.jwplayer("#" + containerDiv, opts);