Merge pull request mozilla#104 from ScottDowne/t1156

[#1156] create track event _id before setup is called, still allow user ...

popcorn.js

@@ -930,7 +930,7 @@
 
     if ( track._natives ) {
       //  Supports user defined track event id
-      track._id = !track.id ? Popcorn.guid( track._natives.type ) : track.id;
+      track._id = track.id || track._id || Popcorn.guid( track._natives.type );
 
       //  Push track event ids into the history
       obj.data.history.push( track._id );
@@ -1536,6 +1536,11 @@
         options.target = manifestOpts && "target" in manifestOpts && manifestOpts.target;
       }
 
+      if ( options._natives ) {
+        // ensure an initial id is there before setup is called
+        options._id = Popcorn.guid( options._natives.type );
+      }
+
       // Trigger _setup method if exists
       options._natives._setup && options._natives._setup.call( this, options );
 

test/popcorn.unit.js

@@ -1839,6 +1839,23 @@ test( "UI/Mouse", function() {
 });
 
 module( "Popcorn Plugin" );
+
+test( "Plugin _id applied before setup", function() {
+
+  expect( 1 );
+
+  var p = Popcorn( "#video" );
+
+  Popcorn.plugin( "idPlugin", {
+    _setup: function( options ) {
+      ok( options._id, "_id was set before setup" );
+      Popcorn.removePlugin( "idPlugin" );
+    }
+  });
+
+  p.idPlugin({});
+});
+
 test( "Manifest", function() {
 
   var p = Popcorn( "#video" ),