diff -r dcf7121b1202 -r 0907b73a1f00 src/js/init.js --- a/src/js/init.js Wed Dec 07 14:31:47 2011 +0100 +++ b/src/js/init.js Thu Dec 08 12:30:54 2011 +0100 @@ -27,11 +27,9 @@ break; case "jwplayer": - // Popcorn.noConflict(true); /* remove current popcorn instance */ - Popcorn = PopcornReplacement; var opts = IriSP.jQuery.extend({}, options); delete opts.container; - pop = Popcorn.jwplayer("#" + containerDiv, opts); + pop = IriSP.PopcornReplacement.jwplayer("#" + containerDiv, opts); break; case "youtube":