don't overwrite popcorn when using our jwplayer wrapper. bugslaying-after-r417-merge
authorhamidouk
Thu, 08 Dec 2011 12:29:33 +0100
branchbugslaying-after-r417-merge
changeset 430 c0b529ae20d2
parent 429 e84a7100cc3f
child 431 f9460dc1957f
don't overwrite popcorn when using our jwplayer wrapper.
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":