# HG changeset patch
# User hamidouk
# Date 1323343773 -3600
# Node ID c0b529ae20d2b4bd3467503a508bceb8b61ce5c1
# Parent  e84a7100cc3ff54a657717d98aa50b3b0869ccb3
don't overwrite popcorn when using our jwplayer wrapper.

diff -r e84a7100cc3f -r c0b529ae20d2 src/js/init.js
--- a/src/js/init.js	Thu Dec 08 12:29:04 2011 +0100
+++ b/src/js/init.js	Thu Dec 08 12:29:33 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":