| branch | popcorn-port |
| changeset 420 | 03beb43df33a |
| parent 418 | 06d2aa32c5f4 |
| child 422 | b14a1a83ebc1 |
--- 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);