src/js/main.js
branchpopcorn-port
changeset 835 a8af9da7c622
parent 834 573c7ca752e0
child 842 4ae2247a59f4
--- a/src/js/main.js	Mon Mar 19 18:46:17 2012 +0100
+++ b/src/js/main.js	Tue Mar 20 21:17:48 2012 +0100
@@ -25,17 +25,17 @@
     var $L = $LAB.script(libs.jQuery).script(libs.swfObject).wait()
                 .script(libs.jQueryUI);
                                    
-    if (config.player.type === "jwplayer") {
+    if (config.player.type === "jwplayer" || config.player.type === "allocine") {
       // load our popcorn.js lookalike
-      $L = $L.script(libs.jwplayer);
+      $L.script(libs.jwplayer);
     } else {
       // load the real popcorn
-      $L = $L.script(libs.popcorn).script(libs["popcorn.code"]);
+      $L.script(libs.popcorn).script(libs["popcorn.code"]);
       if (config.player.type === "youtube") {
-        $L = $L.script(libs["popcorn.youtube"]);
+        $L.script(libs["popcorn.youtube"]);
       } 
       if (config.player.type === "vimeo")
-        $L = $L.script(libs["popcorn.vimeo"]);
+        $L.script(libs["popcorn.vimeo"]);
       
       /* do nothing for html5 */
     }       
@@ -47,6 +47,9 @@
           config.gui.widgets[idx].type === "SparklineWidget") {        
         $L.script(libs.raphael);
       }
+      if (config.gui.widgets[idx].type === "TraceWidget") {
+          $L.script(libs.tracemanager)
+      }
     }
     
     // same for modules