| author | hamidouk |
| Wed, 07 Dec 2011 12:34:56 +0100 | |
| branch | popcorn-port |
| changeset 420 | 03beb43df33a |
| parent 419 | fe7e46eda1b4 |
| child 421 | d62a52c4bfa8 |
| src/js/init.js | file | annotate | diff | comparison | revisions |
--- 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);