equal
deleted
inserted
replaced
25 |
25 |
26 pop = Popcorn("#" + tmpId).mediafragment({start : 0}); |
26 pop = Popcorn("#" + tmpId).mediafragment({start : 0}); |
27 break; |
27 break; |
28 |
28 |
29 case "jwplayer": |
29 case "jwplayer": |
30 Popcorn.noConflict(); /* remove current popcorn instance */ |
30 // Popcorn.noConflict(true); /* remove current popcorn instance */ |
31 Popcorn = PopcornReplacement; |
31 Popcorn = PopcornReplacement; |
32 var opts = IriSP.jQuery.extend({}, options); |
32 var opts = IriSP.jQuery.extend({}, options); |
33 delete opts.container; |
33 delete opts.container; |
34 pop = Popcorn.jwplayer("#" + containerDiv, opts); |
34 pop = Popcorn.jwplayer("#" + containerDiv, opts); |
35 break; |
35 break; |