| branch | bugslaying-after-r417-merge |
| changeset 430 | c0b529ae20d2 |
| parent 422 | b14a1a83ebc1 |
| child 453 | 8568e47379a2 |
--- 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":