Mercurial Mercurial > metadataplayer / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed noConflict feature. popcorn-port
authorhamidouk
Wed, 07 Dec 2011 14:30:59 +0100
branchpopcorn-port
changeset 422 b14a1a83ebc1
parent 421 d62a52c4bfa8
child 423 748cce3d80d4
removed noConflict feature.
src/js/init.js file | annotate | diff | comparison | revisions 
--- a/src/js/init.js	Wed Dec 07 12:36:08 2011 +0100
+++ b/src/js/init.js	Wed Dec 07 14:30:59 2011 +0100
@@ -27,7 +27,7 @@
         break;
         
       case "jwplayer":
-          Popcorn.noConflict(); /* remove current popcorn instance */
+          // Popcorn.noConflict(true); /* remove current popcorn instance */
           Popcorn = PopcornReplacement;
           var opts = IriSP.jQuery.extend({}, options);
           delete opts.container;
metadataplayer