From f6113bc0d4e2c5af059811f1feab46645f963fab Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Fri, 22 Jul 2011 14:11:58 -0400
Subject: [PATCH 001/140] modified buildFrameRunner so that it wont run onFrame
 after onEnd

---
 plugins/code/popcorn.code.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/plugins/code/popcorn.code.js b/plugins/code/popcorn.code.js
index a871a3505..52f7f3aca 100755
--- a/plugins/code/popcorn.code.js
+++ b/plugins/code/popcorn.code.js
@@ -78,10 +78,8 @@
         return function( f, options ) {
     
           var _f = function() {
-            f();
-            if ( running ) {
-              runner( _f );
-            }
+            running && f();
+            running && runner( _f );
           };
     
           _f();

From 00b8fefa6b163230668bd4997712eeb3fdba11c0 Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Mon, 29 Aug 2011 12:53:33 -0400
Subject: [PATCH 002/140] [#685] fixed an issue where a footnote unit test was
 being run twice

---
 plugins/footnote/popcorn.footnote.unit.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/footnote/popcorn.footnote.unit.js b/plugins/footnote/popcorn.footnote.unit.js
index dbdf83f16..f35c3661e 100755
--- a/plugins/footnote/popcorn.footnote.unit.js
+++ b/plugins/footnote/popcorn.footnote.unit.js
@@ -84,18 +84,19 @@ test("Popcorn Text Plugin", function () {
   plus();
 
   popped.text({
-    start: 0, // seconds
-    end: 3, // seconds
+    start: 5, // seconds
+    end: 6, // seconds
     text: "I am an alias",
     target: "textdiv"
   });
 
   stop();
 
-  popped.exec( 2, function() {
+  popped.exec( 5, function() {
 
     equal( textdiv.children[0].innerHTML , "I am an alias", "I am an alias set by Popcorn.p.text" );
     plus();
 
-  }).currentTime(1).play();
+    popped.pause();
+  }).currentTime(5).play();
 });

From 27490ef31ee046859a5e8b7263fa119e3438420f Mon Sep 17 00:00:00 2001
From: Jon Buckley <jon@jbuckley.ca>
Date: Tue, 30 Aug 2011 15:15:43 -0400
Subject: [PATCH 003/140] Remove git merge marker

---
 test/index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/index.html b/test/index.html
index dd813c18a..b29fafa1a 100644
--- a/test/index.html
+++ b/test/index.html
@@ -54,7 +54,6 @@ <h2 id="qunit-userAgent"></h2>
 
   </video>
 
-<<<<<<< HEAD
   <audio id='audio' data-timeline-sources="data/parserData.json" controls>
     <source src="italia.mp4" type='audio/mp4; codecs="mp4a.40.2"'>
     <source src="italia.ogg" type='audio/ogg; codecs="vorbis"'>

From 52f84a09c42149ceed8886f6a61b0384aa3e2beb Mon Sep 17 00:00:00 2001
From: rwldrn <waldron.rick@gmail.com>
Date: Wed, 31 Aug 2011 13:54:23 -0400
Subject: [PATCH 004/140] [#700] Popcorn dummies; Includes test suite w/ 59
 tests

---
 popcorn.js                         |  15 ++-
 test/archaic.html                  | 110 +++++++++++++++++++++
 test/index.html                    |   2 +
 test/popcorn.unit.archaic.js       |  56 +++++++++++
 test/popcorn.unit.archaic.setup.js |   3 +
 test/popcorn.unit.setup.js         |  18 ++--
 test/ready.html                    | 152 ++++++++++++++---------------
 7 files changed, 271 insertions(+), 85 deletions(-)
 create mode 100644 test/archaic.html
 create mode 100644 test/popcorn.unit.archaic.js
 create mode 100644 test/popcorn.unit.archaic.setup.js

diff --git a/popcorn.js b/popcorn.js
index 51659a728..2b5ad2230 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1,6 +1,19 @@
 (function(global, document) {
 
-  //  Cache refs to speed up calls to native utils
+  // Popcorn.js does not support archaic browsers
+  if ( !document.addEventListener ) {
+    global.Popcorn = {};
+
+    var methods = ( "removeInstance addInstance getInstanceById removeInstanceById " + 
+          "forEach extend effects error guid sizeOf isArray nop position disable enable " + 
+          "addTrackEvent removeTrackEvent getTrackEvents getTrackEvent getLastTrackEventId " + 
+          "timeUpdate plugin removePlugin compose effect parser xhr getJSONP getScript" ).split(/\s+/);
+
+    while( methods.length ) {
+      global.Popcorn[ methods.shift() ] = function(){};
+    }
+    return;
+  }
 
   var
 
diff --git a/test/archaic.html b/test/archaic.html
new file mode 100644
index 000000000..c72a4b221
--- /dev/null
+++ b/test/archaic.html
@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Simulate Archaic Browser</title>
+  <link rel="stylesheet" href="qunit/qunit.css" type="text/css" media="screen">
+
+  <style>
+    body {
+      margin: 3px;
+      padding: 0px;
+    }
+    h3 {
+      margin: 3px;
+      padding: 0px;
+    }
+    h2 {
+      display: inline;
+      margin: 3px;
+      padding: 0px;
+    }    
+    .pass {
+      color: #33FF00;
+    }
+    .expect {
+      color: #2d2d2d;
+    }    
+    .fail {
+      color: #FF0000;
+    }
+  </style>
+  <script src="jquery.js"></script>
+
+
+  <script src="qunit/qunit.js"></script>
+
+  <!--
+    do not move - this must be called immediately prior to
+    popcorn-api-draft.js
+  -->
+  <script src="popcorn.unit.setup.js"></script>
+  <script src="popcorn.unit.archaic.setup.js"></script>
+
+  <script src="../popcorn.js"></script>
+  <script src="popcorn.unit.archaic.js"></script>
+  <script>
+  (function( Popcorn, $ ) {
+
+    var results = {
+          pass: 0, 
+          fail: 0,
+          expect: 40
+        };
+
+    $(function() {
+
+      function isComplete( callback ) {
+
+        if ( !QUnit.config.queue.length ) {
+          // is complete
+
+          callback && callback( QUnit.config.stats );
+
+        } else {
+          setTimeout(function() {
+            isComplete( callback );
+          }, 10 );
+        }
+      }
+
+      isComplete(function( qResults ) {
+
+        //  Hack together the results as used in ready.html
+        results.pass = qResults.all - qResults.bad;
+        results.fail = qResults.bad;
+        results.expect = qResults.all;
+
+        $.each( results, function( name, value ) {
+          $("#qunit-header").before( 
+            $("<h2>", {
+              className: name, 
+              html: name + ": " + value  
+            }) 
+          );
+        });
+      
+      });
+    });
+  })( Popcorn, jQuery );
+
+  </script>
+</head>
+<body>
+  <h3>Archaic<h3>
+
+  <h1 id="qunit-header">
+    Popcorn.js: Simulate Archaic Browser
+  </h1>
+  <h2 id="qunit-banner"></h2>
+  <div id="qunit-testrunner-toolbar"></div>
+  <h2 id="qunit-userAgent"></h2>
+  <ol id="qunit-tests"></ol>
+  <div id="qunit-fixture">
+
+
+
+
+
+  </div>
+</body>
+</html>
diff --git a/test/index.html b/test/index.html
index dd813c18a..b54d7e7ab 100644
--- a/test/index.html
+++ b/test/index.html
@@ -20,6 +20,8 @@
 <body>
   <h1 id="qunit-header">
     Popcorn.js API
+    <iframe id="archaic-tests" data-src="archaic.html" style="width:325px;height:60px;float:right;border:0px;margin:-10px 20px 0 -10px;background:#fff" ></iframe>
+    
     <iframe id="butter-tests" data-src="butter_test.html" style="width:325px;height:60px;float:right;border:0px;margin:-10px 20px 0 -10px;background:#fff" ></iframe>
 
     <iframe id="ready-tests" data-src="ready.html" style="width:325px;height:60px;float:right;border:0px;margin:-10px 20px 0 -10px;background:#fff" ></iframe>
diff --git a/test/popcorn.unit.archaic.js b/test/popcorn.unit.archaic.js
new file mode 100644
index 000000000..e1df25c9a
--- /dev/null
+++ b/test/popcorn.unit.archaic.js
@@ -0,0 +1,56 @@
+module("Core");
+test("Dummy", function () {
+
+  expect(1);
+
+  ok( Popcorn, "Popcorn dummy exists");
+});
+
+module("Static Methods");
+(function() {
+
+  var method, 
+      methods = ( "removeInstance addInstance getInstanceById removeInstanceById " +
+          "forEach extend effects error guid sizeOf isArray nop position disable enable " +
+          "addTrackEvent removeTrackEvent getTrackEvents getTrackEvent getLastTrackEventId " +
+          "timeUpdate plugin removePlugin compose effect parser xhr getJSONP getScript" ).split(/\s+/);
+
+  while( methods.length ) {
+
+    method = methods.shift();
+
+    test( method, function () {
+
+      expect(1);
+
+      ok( Popcorn[ method ], "Popcorn." + method + " exists");
+    });
+  }
+
+})( Popcorn );
+
+
+module("Attempt");
+(function() {
+
+  var method, 
+      methods = ( "removeInstance addInstance getInstanceById removeInstanceById " +
+          "forEach extend effects error guid sizeOf isArray nop position disable enable " +
+          "addTrackEvent removeTrackEvent getTrackEvents getTrackEvent getLastTrackEventId " +
+          "timeUpdate plugin removePlugin compose effect parser xhr getJSONP getScript" ).split(/\s+/);
+
+  while( methods.length ) {
+
+    method = methods.shift();
+
+    test( method, function () {
+
+      expect(1);
+
+      equal( Popcorn[ method ](), undefined, "Popcorn." + method + "() dummy returns undefined without throwing exception");
+
+    });
+  }
+
+})( Popcorn );
+
diff --git a/test/popcorn.unit.archaic.setup.js b/test/popcorn.unit.archaic.setup.js
new file mode 100644
index 000000000..16cff7b94
--- /dev/null
+++ b/test/popcorn.unit.archaic.setup.js
@@ -0,0 +1,3 @@
+
+
+document.addEventListener = null;
diff --git a/test/popcorn.unit.setup.js b/test/popcorn.unit.setup.js
index ebfa253ee..4f2394846 100644
--- a/test/popcorn.unit.setup.js
+++ b/test/popcorn.unit.setup.js
@@ -1,13 +1,15 @@
 //  suppress console log errors
 if ( !window['console'] ) {
-  var console = {}, 
-      methods = 'log debug info warn error exception assert dir dirxml trace group groupEnd groupCollapsed time timeEnd profile profileEnd count clear notifyFirebug getFirebugElement firebug element'.split(' ');
-  
-  for ( var m in methods ) {
-    console[ methods[m] ] = function () {
-      //Array.prototype.slice.call(arguments)
-    };
-  }  
+//  var console = {}, 
+//      methods = 'log debug info warn error exception assert dir dirxml trace group groupEnd groupCollapsed time timeEnd profile profileEnd count clear notifyFirebug getFirebugElement firebug element'.split(' ');
+//  
+//  for ( var m in methods ) {
+//    console[ methods[m] ] = function () {
+//      //Array.prototype.slice.call(arguments)
+//    };
+//  }
+
+  jQuery.getScript("https://getfirebug.com/firebug-lite-debug.js");
 }
 
 
diff --git a/test/ready.html b/test/ready.html
index 8bf78d18e..deccc2b17 100644
--- a/test/ready.html
+++ b/test/ready.html
@@ -4,89 +4,89 @@
   <title>Popcorn API</title>
   <link rel="stylesheet" href="qunit/qunit.css" type="text/css" media="screen">
 
-	<style>
-		body {
-			margin: 3px;
-			padding: 0px;
-		}
-		h3 {
-			margin: 3px;
-			padding: 0px;
-		}
-		h2 {
-			display: inline;
-			margin: 3px;
-			padding: 0px;
-		}		
-		.pass {
-			color: #33FF00;
-		}
-		.expect {
-			color: #2d2d2d;
-		}		
-		.fail {
-			color: #FF0000;
-		}
-	</style>
-	<script src="jquery.js"></script>
+  <style>
+    body {
+      margin: 3px;
+      padding: 0px;
+    }
+    h3 {
+      margin: 3px;
+      padding: 0px;
+    }
+    h2 {
+      display: inline;
+      margin: 3px;
+      padding: 0px;
+    }    
+    .pass {
+      color: #33FF00;
+    }
+    .expect {
+      color: #2d2d2d;
+    }    
+    .fail {
+      color: #FF0000;
+    }
+  </style>
+  <script src="jquery.js"></script>
   <script src="../popcorn.js"></script>
   <script>
-	(function( Popcorn, $ ) {
-
-		var readyCalled = 0, 
-				readyOrder = [], 
-				readyComposed = "Ready Callback 1,Ready Callback 2", 
-				results = {
-					pass: 0, 
-					fail: 0,
-					expect: 2
-				};
-
-		$(function() {
-		  readyCalled++;
-		});
-
-		Popcorn(function (e) {
-
-		  readyCalled++;
-		  readyOrder.push("Ready Callback 1");
-		  
-		  Popcorn("#video").exec( 1, function () {
-
-				results[ 
-					( readyCalled === 3 ? "pass" : "fail" ) 
-				]++;
-
-				if ( readyOrder.join(",") === readyComposed ) {
-					results.pass++;
-				}
-
-				$.each( results, function( name, value ) {
-					$("video").before( 
-						$("<h2>", {
-							className: name, 
-							html: name + ": " + value  
-						}) 
-					);
-				});
-
-		  }).play().volume(0);
-		  
-		});
-
-		Popcorn(function () {
-		  
-		  readyCalled++;
-		  readyOrder.push("Ready Callback 2");
-
-		});  	
-	})( Popcorn, jQuery );
+  (function( Popcorn, $ ) {
+
+    var readyCalled = 0, 
+        readyOrder = [], 
+        readyComposed = "Ready Callback 1,Ready Callback 2", 
+        results = {
+          pass: 0, 
+          fail: 0,
+          expect: 2
+        };
+
+    $(function() {
+      readyCalled++;
+    });
+
+    Popcorn(function (e) {
+
+      readyCalled++;
+      readyOrder.push("Ready Callback 1");
+      
+      Popcorn("#video").exec( 1, function () {
+
+        results[ 
+          ( readyCalled === 3 ? "pass" : "fail" ) 
+        ]++;
+
+        if ( readyOrder.join(",") === readyComposed ) {
+          results.pass++;
+        }
+
+        $.each( results, function( name, value ) {
+          $("video").before( 
+            $("<h2>", {
+              className: name, 
+              html: name + ": " + value  
+            }) 
+          );
+        });
+
+      }).play().volume(0);
+      
+    });
+
+    Popcorn(function () {
+      
+      readyCalled++;
+      readyOrder.push("Ready Callback 2");
+
+    });    
+  })( Popcorn, jQuery );
 
   </script>
   
 </head>
 <body>
-	<h3>Popcorn(/* DOM Ready */)<h3>
+  <h3>Popcorn(/* DOM Ready */)<h3>
 
   <video id='video'style="display:none" 
     controls 

From ec5e7861a81d3bbf49e458a45fe4abc2b0467c01 Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Tue, 6 Sep 2011 11:35:47 -0400
Subject: [PATCH 005/140] Reduced code inside Popcorn.timeUpdate

---
 popcorn.js | 129 ++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 83 insertions(+), 46 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index 51659a728..21de7bdb5 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -875,50 +875,73 @@
 
   Popcorn.timeUpdate = function( obj, event ) {
 
-    var currentTime    = obj.media.currentTime,
-        previousTime   = obj.data.trackEvents.previousUpdateTime,
-        tracks         = obj.data.trackEvents,
-        tracksByEnd    = tracks.byEnd,
-        tracksByStart  = tracks.byStart;
+    var currentTime = obj.media.currentTime,
+        previousTime = obj.data.trackEvents.previousUpdateTime,
+        tracks = obj.data.trackEvents,
+        tracksBy = {
+          start: tracks.byStart,
+          end: tracks.byEnd
+        },
+
+        end = tracks.endIndex,
+        start = tracks.startIndex,
+
+        registryByName = Popcorn.registryByName;
+
 
     //  Playbar advancing
     if ( previousTime < currentTime ) {
 
-      while ( tracksByEnd[ tracks.endIndex ] && tracksByEnd[ tracks.endIndex ].end <= currentTime ) {
+
+
+
+
+      while ( tracksBy.end[ end ] && tracksBy.end[ end ].end <= currentTime ) {
+
+        var byEnd = tracksBy.end[ end ],
+            natives = byEnd._natives,
+            type = natives && natives.type;
+
         //  If plugin does not exist on this instance, remove it
-        if ( !tracksByEnd[ tracks.endIndex ]._natives ||
-            ( !!Popcorn.registryByName[ tracksByEnd[ tracks.endIndex ]._natives.type ] ||
-              !!obj[ tracksByEnd[ tracks.endIndex ]._natives.type ] ) ) {
+        if ( !natives ||
+            ( !!registryByName[ type ] ||
+              !!obj[ type ] ) ) {
 
-          if ( tracksByEnd[ tracks.endIndex ]._running === true ) {
-            tracksByEnd[ tracks.endIndex ]._running = false;
-            tracksByEnd[ tracks.endIndex ]._natives.end.call( obj, event, tracksByEnd[ tracks.endIndex ] );
+          if ( byEnd._running === true ) {
+            byEnd._running = false;
+            natives.end.call( obj, event, byEnd );
           }
-          tracks.endIndex++;
+
+          end++;
         } else {
           // remove track event
-          Popcorn.removeTrackEvent( obj, tracksByEnd[ tracks.endIndex ]._id );
+          Popcorn.removeTrackEvent( obj, byEnd._id );
           return;
         }
       }
 
-      while ( tracksByStart[ tracks.startIndex ] && tracksByStart[ tracks.startIndex ].start <= currentTime ) {
+      while ( tracksBy.start[ start ] && tracksBy.start[ start ].start <= currentTime ) {
+
+        var byStart = tracksBy.start[ start ],
+            natives = byStart._natives,
+            type = natives && natives.type;
+
         //  If plugin does not exist on this instance, remove it
-        if ( !tracksByStart[ tracks.startIndex ]._natives ||
-          ( !!Popcorn.registryByName[ tracksByStart[ tracks.startIndex ]._natives.type ] ||
-            !!obj[ tracksByStart[ tracks.startIndex ]._natives.type ] ) ) {
+        if ( !natives ||
+            ( !!registryByName[ type ] ||
+              !!obj[ type ] ) ) {
 
-          if ( tracksByStart[ tracks.startIndex ].end > currentTime &&
-                tracksByStart[ tracks.startIndex ]._running === false &&
-                  obj.data.disabled.indexOf( tracksByStart[ tracks.startIndex ]._natives.type ) === -1 ) {
+          if ( byStart.end > currentTime &&
+                byStart._running === false &&
+                  obj.data.disabled.indexOf( type ) === -1 ) {
 
-            tracksByStart[ tracks.startIndex ]._running = true;
-            tracksByStart[ tracks.startIndex ]._natives.start.call( obj, event, tracksByStart[ tracks.startIndex ] );
+            byStart._running = true;
+            natives.start.call( obj, event, byStart );
           }
-          tracks.startIndex++;
+          start++;
         } else {
           // remove track event
-          Popcorn.removeTrackEvent( obj, tracksByStart[ tracks.startIndex ]._id );
+          Popcorn.removeTrackEvent( obj, byStart._id );
           return;
         }
       }
@@ -926,47 +949,61 @@
     // Playbar receding
     } else if ( previousTime > currentTime ) {
 
-      while ( tracksByStart[ tracks.startIndex ] && tracksByStart[ tracks.startIndex ].start > currentTime ) {
+      while ( tracksBy.start[ start ] && tracksBy.start[ start ].start > currentTime ) {
+
+        var byStart = tracksBy.start[ start ],
+            natives = byStart._natives,
+            type = natives && natives.type;
+
         // if plugin does not exist on this instance, remove it
-        if ( !tracksByStart[ tracks.startIndex ]._natives ||
-          ( !!Popcorn.registryByName[ tracksByStart[ tracks.startIndex ]._natives.type ] ||
-            !!obj[ tracksByStart[ tracks.startIndex ]._natives.type ] ) ) {
+        if ( !natives ||
+            ( !!registryByName[ type ] ||
+              !!obj[ type ] ) ) {
 
-          if ( tracksByStart[ tracks.startIndex ]._running === true ) {
-            tracksByStart[ tracks.startIndex ]._running = false;
-            tracksByStart[ tracks.startIndex ]._natives.end.call( obj, event, tracksByStart[ tracks.startIndex ] );
+          if ( byStart._running === true ) {
+            byStart._running = false;
+            natives.end.call( obj, event, byStart );
           }
-          tracks.startIndex--;
+          start--;
         } else {
           // remove track event
-          Popcorn.removeTrackEvent( obj, tracksByStart[ tracks.startIndex ]._id );
+          Popcorn.removeTrackEvent( obj, byStart._id );
           return;
         }
       }
 
-      while ( tracksByEnd[ tracks.endIndex ] && tracksByEnd[ tracks.endIndex ].end > currentTime ) {
+      while ( tracksBy.end[ end ] && tracksBy.end[ end ].end > currentTime ) {
+
+        var byEnd = tracksBy.end[ end ],
+            natives = byEnd._natives,
+            type = natives && natives.type;
+
         // if plugin does not exist on this instance, remove it
-        if ( !tracksByEnd[ tracks.endIndex ]._natives ||
-          ( !!Popcorn.registryByName[ tracksByEnd[ tracks.endIndex ]._natives.type ] ||
-            !!obj[ tracksByEnd[ tracks.endIndex ]._natives.type ] ) ) {
+        if ( !natives ||
+            ( !!registryByName[ type ] ||
+              !!obj[ type ] ) ) {
 
-          if ( tracksByEnd[ tracks.endIndex ].start <= currentTime &&
-                tracksByEnd[ tracks.endIndex ]._running === false  &&
-                  obj.data.disabled.indexOf( tracksByEnd[ tracks.endIndex ]._natives.type ) === -1 ) {
+          if ( byEnd.start <= currentTime &&
+                byEnd._running === false  &&
+                  obj.data.disabled.indexOf( type ) === -1 ) {
 
-            tracksByEnd[ tracks.endIndex ]._running = true;
-            tracksByEnd[ tracks.endIndex ]._natives.start.call( obj, event, tracksByEnd[tracks.endIndex] );
+            byEnd._running = true;
+            natives.start.call( obj, event, byEnd );
           }
-          tracks.endIndex--;
+          end--;
         } else {
           // remove track event
-          Popcorn.removeTrackEvent( obj, tracksByEnd[ tracks.endIndex ]._id );
+          Popcorn.removeTrackEvent( obj, byEnd._id );
           return;
         }
       }
     // time bar is not moving ( video is paused )
+    } else if ( previousTime === currentTime ) {
+
     }
 
+    tracks.endIndex = end;
+    tracks.startIndex = start;
     tracks.previousUpdateTime = currentTime;
 
   };
@@ -999,7 +1036,7 @@
 
     timeUpdate: function( event ) {
       Popcorn.timeUpdate.call( null, this, event );
-      return this; 
+      return this;
     }
   });
 

From ce502fcc933f89ad827617d94c8bcde5a69cab4c Mon Sep 17 00:00:00 2001
From: brianchirls <brian@chirls.com>
Date: Tue, 6 Sep 2011 12:26:31 -0400
Subject: [PATCH 006/140] implementd optional requestAnimationFrame and .frame
 method for plugins per #494

---
 popcorn.js | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 96 insertions(+), 5 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index 51659a728..982957a3d 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -28,6 +28,18 @@
     }
   },
 
+  requestAnimFrame = (function(){
+    // shim from http://paulirish.com/2011/requestanimationframe-for-smart-animating/
+    return global.requestAnimationFrame       || 
+      global.webkitRequestAnimationFrame || 
+      global.mozRequestAnimationFrame    || 
+      global.oRequestAnimationFrame      || 
+      global.msRequestAnimationFrame     || 
+      function(/* function */ callback, /* DOMElement */ element){
+        global.setTimeout(callback, 16);
+      };
+  }()),
+
   //  Declare constructor
   //  Returns an instance object.
   Popcorn = function( entity, options ) {
@@ -190,6 +202,7 @@
             start: -1,
             end: -1
           }],
+          animating:[],
           startIndex: 0,
           endIndex: 0,
           previousUpdateTime: -1
@@ -212,10 +225,26 @@
             end: videoDurationPlus
           });
 
-          that.media.addEventListener( "timeupdate", function( event ) {
+          if ( that.options.frameAnimation ) {
+
+            var animate = function () {
+              Popcorn.timeUpdate( that, event );
+              that.trigger( "timeupdate" );
+
+              requestAnimFrame(animate);
+            };
+
+            requestAnimFrame(animate);
+
+          } else {
+
+            that.media.addEventListener( "timeupdate", function( event ) {
+
+              Popcorn.timeUpdate( that, event );
+            }, false );
+
+          }
 
-            Popcorn.timeUpdate( that, event );
-          }, false );
         } else {
           global.setTimeout(function() {
             isReady( that );
@@ -775,6 +804,7 @@
         indexWasAt = 0,
         byStart = [],
         byEnd = [],
+        animating = [],
         history = [];
 
     Popcorn.forEach( obj.data.trackEvents.byStart, function( o, i, context ) {
@@ -802,6 +832,23 @@
 
     });
 
+    Popcorn.forEach( obj.data.trackEvents.animating, function( o, i, context ) {
+      // Preserve the original start/end trackEvents
+      if ( !o._id ) {
+        animating.push( obj.data.trackEvents.animating[i] );
+      }
+
+      // Filter for user track events (vs system track events)
+      if ( o._id ) {
+
+        // Filter for the trackevent to remove
+        if ( o._id !== trackId ) {
+          animating.push( obj.data.trackEvents.animating[i] );
+        }
+      }
+
+    });
+
     //  Update
     if ( indexWasAt <= obj.data.trackEvents.startIndex ) {
       obj.data.trackEvents.startIndex--;
@@ -813,6 +860,7 @@
 
     obj.data.trackEvents.byStart = byStart;
     obj.data.trackEvents.byEnd  = byEnd;
+    obj.data.trackEvents.animating  = animating;
 
     for ( var i = 0; i < historyLen; i++ ) {
       if ( obj.data.history[ i ] !== trackId ) {
@@ -879,7 +927,9 @@
         previousTime   = obj.data.trackEvents.previousUpdateTime,
         tracks         = obj.data.trackEvents,
         tracksByEnd    = tracks.byEnd,
-        tracksByStart  = tracks.byStart;
+        tracksByStart  = tracks.byStart,
+        tracksAnimating= tracks.animating,
+        animIndex = 0;
 
     //  Playbar advancing
     if ( previousTime < currentTime ) {
@@ -914,6 +964,10 @@
 
             tracksByStart[ tracks.startIndex ]._running = true;
             tracksByStart[ tracks.startIndex ]._natives.start.call( obj, event, tracksByStart[ tracks.startIndex ] );
+
+            if (tracksByStart[ tracks.startIndex ]._natives.frame) {
+              tracksAnimating.push(tracksByStart[ tracks.startIndex ]);
+            }
           }
           tracks.startIndex++;
         } else {
@@ -923,6 +977,15 @@
         }
       }
 
+      while (animIndex < tracksAnimating.length) {
+        if (tracksAnimating[animIndex]._running == false) {
+          tracksAnimating.splice(animIndex,1);
+        } else {
+          tracksAnimating[animIndex]._natives.frame.call( obj, event, tracksAnimating[animIndex], currentTime );
+          animIndex++;
+        }
+      }
+
     // Playbar receding
     } else if ( previousTime > currentTime ) {
 
@@ -956,6 +1019,10 @@
 
             tracksByEnd[ tracks.endIndex ]._running = true;
             tracksByEnd[ tracks.endIndex ]._natives.start.call( obj, event, tracksByEnd[tracks.endIndex] );
+
+            if (tracksByEnd[ tracks.endIndex ]._natives.frame) {
+              tracksAnimating.push(tracksByEnd[ tracks.endIndex ]);
+            }
           }
           tracks.endIndex--;
         } else {
@@ -964,6 +1031,16 @@
           return;
         }
       }
+
+      while (animIndex < tracksAnimating.length) {
+        if (tracksAnimating[animIndex]._running == false) {
+          tracksAnimating.splice(animIndex,1);
+        } else {
+          tracksAnimating[animIndex]._natives.frame.call( obj, event, tracksAnimating[animIndex], currentTime );
+          animIndex++;
+        }
+      }
+
     // time bar is not moving ( video is paused )
     }
 
@@ -1023,7 +1100,7 @@
         plugin = {},
         setup,
         isfn = typeof definition === "function",
-        methods = [ "_setup", "_teardown", "start", "end" ];
+        methods = [ "_setup", "_teardown", "start", "end", "frame" ];
 
     // combines calls of two function calls into one
     var combineFn = function( first, second ) {
@@ -1202,6 +1279,7 @@
 
     var byStart = obj.data.trackEvents.byStart,
         byEnd = obj.data.trackEvents.byEnd,
+        animating = obj.data.trackEvents.animating,
         idx, sl;
 
     // remove all trackEvents
@@ -1223,6 +1301,19 @@
         }
       }
     }
+
+    //remove all animating events
+    for ( idx = 0, sl = animating.length; idx < sl; idx++ ) {
+
+      if ( ( animating[ idx ] && animating[ idx ]._natives && animating[ idx ]._natives.type === name ) ) {
+
+        animating.splice( idx, 1 );
+
+        // update for loop if something removed, but keep checking
+        idx--; sl--;
+      }
+    }
+
   };
 
   Popcorn.compositions = {};

From b728f6718f96e2d601134a0639b6f98cbf45fb4c Mon Sep 17 00:00:00 2001
From: brianchirls <brian@chirls.com>
Date: Tue, 6 Sep 2011 14:27:02 -0400
Subject: [PATCH 007/140] Adjusted formatting per rwldrn's comments

---
 popcorn.js | 66 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 36 insertions(+), 30 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index 982957a3d..4a48bdfb5 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -35,8 +35,8 @@
       global.mozRequestAnimationFrame    || 
       global.oRequestAnimationFrame      || 
       global.msRequestAnimationFrame     || 
-      function(/* function */ callback, /* DOMElement */ element){
-        global.setTimeout(callback, 16);
+      function( callback, element){
+        global.setTimeout( callback, 16 );
       };
   }()),
 
@@ -202,7 +202,7 @@
             start: -1,
             end: -1
           }],
-          animating:[],
+          animating: [],
           startIndex: 0,
           endIndex: 0,
           previousUpdateTime: -1
@@ -226,15 +226,19 @@
           });
 
           if ( that.options.frameAnimation ) {
+            // if Popcorn is created with frameAnimation option set to true,
+            // requestAnimFrame is used instead of "timeupdate" media event.
+            // This is for greater frame time accuracy, theoretically up to
+            // 60 frames per second as opposed to 4
 
             var animate = function () {
               Popcorn.timeUpdate( that, event );
               that.trigger( "timeupdate" );
 
-              requestAnimFrame(animate);
+              requestAnimFrame( animate );
             };
 
-            requestAnimFrame(animate);
+            requestAnimFrame( animate );
 
           } else {
 
@@ -832,22 +836,24 @@
 
     });
 
-    Popcorn.forEach( obj.data.trackEvents.animating, function( o, i, context ) {
-      // Preserve the original start/end trackEvents
-      if ( !o._id ) {
-        animating.push( obj.data.trackEvents.animating[i] );
-      }
+    if ( obj.data.trackEvents.animating.length ) {
+      Popcorn.forEach( obj.data.trackEvents.animating, function( o, i, context ) {
+        // Preserve the original start/end trackEvents
+        if ( !o._id ) {
+          animating.push( obj.data.trackEvents.animating[i] );
+        }
 
-      // Filter for user track events (vs system track events)
-      if ( o._id ) {
+        // Filter for user track events (vs system track events)
+        if ( o._id ) {
 
-        // Filter for the trackevent to remove
-        if ( o._id !== trackId ) {
-          animating.push( obj.data.trackEvents.animating[i] );
+          // Filter for the trackevent to remove
+          if ( o._id !== trackId ) {
+            animating.push( obj.data.trackEvents.animating[i] );
+          }
         }
-      }
 
-    });
+      });
+    }
 
     //  Update
     if ( indexWasAt <= obj.data.trackEvents.startIndex ) {
@@ -965,8 +971,8 @@
             tracksByStart[ tracks.startIndex ]._running = true;
             tracksByStart[ tracks.startIndex ]._natives.start.call( obj, event, tracksByStart[ tracks.startIndex ] );
 
-            if (tracksByStart[ tracks.startIndex ]._natives.frame) {
-              tracksAnimating.push(tracksByStart[ tracks.startIndex ]);
+            if ( tracksByStart[ tracks.startIndex ]._natives.frame ) {
+              tracksAnimating.push( tracksByStart[ tracks.startIndex ] );
             }
           }
           tracks.startIndex++;
@@ -977,11 +983,11 @@
         }
       }
 
-      while (animIndex < tracksAnimating.length) {
-        if (tracksAnimating[animIndex]._running == false) {
-          tracksAnimating.splice(animIndex,1);
+      while ( animIndex < tracksAnimating.length ) {
+        if ( !tracksAnimating[animIndex]._running ) {
+          tracksAnimating.splice( animIndex, 1 );
         } else {
-          tracksAnimating[animIndex]._natives.frame.call( obj, event, tracksAnimating[animIndex], currentTime );
+          tracksAnimating[ animIndex ]._natives.frame.call( obj, event, tracksAnimating[ animIndex ], currentTime );
           animIndex++;
         }
       }
@@ -1020,8 +1026,8 @@
             tracksByEnd[ tracks.endIndex ]._running = true;
             tracksByEnd[ tracks.endIndex ]._natives.start.call( obj, event, tracksByEnd[tracks.endIndex] );
 
-            if (tracksByEnd[ tracks.endIndex ]._natives.frame) {
-              tracksAnimating.push(tracksByEnd[ tracks.endIndex ]);
+            if ( tracksByEnd[ tracks.endIndex ]._natives.frame ) {
+              tracksAnimating.push( tracksByEnd[ tracks.endIndex ] );
             }
           }
           tracks.endIndex--;
@@ -1032,11 +1038,11 @@
         }
       }
 
-      while (animIndex < tracksAnimating.length) {
-        if (tracksAnimating[animIndex]._running == false) {
-          tracksAnimating.splice(animIndex,1);
+      while ( animIndex < tracksAnimating.length ) {
+        if ( !tracksAnimating[animIndex]._running ) {
+          tracksAnimating.splice( animIndex, 1 );
         } else {
-          tracksAnimating[animIndex]._natives.frame.call( obj, event, tracksAnimating[animIndex], currentTime );
+          tracksAnimating[ animIndex ]._natives.frame.call( obj, event, tracksAnimating[ animIndex ], currentTime );
           animIndex++;
         }
       }
@@ -1305,7 +1311,7 @@
     //remove all animating events
     for ( idx = 0, sl = animating.length; idx < sl; idx++ ) {
 
-      if ( ( animating[ idx ] && animating[ idx ]._natives && animating[ idx ]._natives.type === name ) ) {
+      if ( animating[ idx ] && animating[ idx ]._natives && animating[ idx ]._natives.type === name ) {
 
         animating.splice( idx, 1 );
 

From 4ed129337f29af9e64e737a23977e10478de2894 Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Tue, 6 Sep 2011 14:27:59 -0400
Subject: [PATCH 008/140] [#709] Fixes lint issues

---
 popcorn.js | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index 21de7bdb5..90f729efe 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -886,21 +886,18 @@
         end = tracks.endIndex,
         start = tracks.startIndex,
 
-        registryByName = Popcorn.registryByName;
+        registryByName = Popcorn.registryByName,
 
+        byEnd, byStart, natives, type;
 
     //  Playbar advancing
     if ( previousTime < currentTime ) {
 
-
-
-
-
       while ( tracksBy.end[ end ] && tracksBy.end[ end ].end <= currentTime ) {
 
-        var byEnd = tracksBy.end[ end ],
-            natives = byEnd._natives,
-            type = natives && natives.type;
+				byEnd = tracksBy.end[ end ];
+				natives = byEnd._natives;
+        type = natives && natives.type;
 
         //  If plugin does not exist on this instance, remove it
         if ( !natives ||
@@ -922,9 +919,9 @@
 
       while ( tracksBy.start[ start ] && tracksBy.start[ start ].start <= currentTime ) {
 
-        var byStart = tracksBy.start[ start ],
-            natives = byStart._natives,
-            type = natives && natives.type;
+				byStart = tracksBy.start[ start ];
+        natives = byStart._natives;
+        type = natives && natives.type;
 
         //  If plugin does not exist on this instance, remove it
         if ( !natives ||
@@ -951,9 +948,9 @@
 
       while ( tracksBy.start[ start ] && tracksBy.start[ start ].start > currentTime ) {
 
-        var byStart = tracksBy.start[ start ],
-            natives = byStart._natives,
-            type = natives && natives.type;
+				byStart = tracksBy.start[ start ];
+        natives = byStart._natives;
+        type = natives && natives.type;
 
         // if plugin does not exist on this instance, remove it
         if ( !natives ||
@@ -974,9 +971,9 @@
 
       while ( tracksBy.end[ end ] && tracksBy.end[ end ].end > currentTime ) {
 
-        var byEnd = tracksBy.end[ end ],
-            natives = byEnd._natives,
-            type = natives && natives.type;
+				byEnd = tracksBy.end[ end ];
+        natives = byEnd._natives;
+        type = natives && natives.type;
 
         // if plugin does not exist on this instance, remove it
         if ( !natives ||

From b36a5a4f9d2c3a32d1d8718f0b62a26ee2363ff2 Mon Sep 17 00:00:00 2001
From: brianchirls <brian@chirls.com>
Date: Tue, 6 Sep 2011 14:29:11 -0400
Subject: [PATCH 009/140] timeUpdate no longer assumes event still exists after
 start finishes

---
 popcorn.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index 4a48bdfb5..664acc327 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -971,7 +971,10 @@
             tracksByStart[ tracks.startIndex ]._running = true;
             tracksByStart[ tracks.startIndex ]._natives.start.call( obj, event, tracksByStart[ tracks.startIndex ] );
 
-            if ( tracksByStart[ tracks.startIndex ]._natives.frame ) {
+            if ( tracksByStart[ tracks.startIndex ] &&
+              tracksByStart[ tracks.startIndex ]._running &&
+              tracksByStart[ tracks.startIndex ]._natives.frame ) {
+
               tracksAnimating.push( tracksByStart[ tracks.startIndex ] );
             }
           }
@@ -1026,7 +1029,10 @@
             tracksByEnd[ tracks.endIndex ]._running = true;
             tracksByEnd[ tracks.endIndex ]._natives.start.call( obj, event, tracksByEnd[tracks.endIndex] );
 
-            if ( tracksByEnd[ tracks.endIndex ]._natives.frame ) {
+            if ( tracksByEnd[ tracks.endIndex ] &&
+              tracksByEnd[ tracks.endIndex ]._running &&
+              tracksByEnd[ tracks.endIndex ]._natives.frame ) {
+
               tracksAnimating.push( tracksByEnd[ tracks.endIndex ] );
             }
           }

From 582980dc8b81feed610f2373f654f74085b85a9a Mon Sep 17 00:00:00 2001
From: brianchirls <brian@chirls.com>
Date: Tue, 6 Sep 2011 14:30:30 -0400
Subject: [PATCH 010/140] Added separate unit tests for frame animation

---
 test/anim.html            |  115 ++
 test/popcorn.unit.anim.js | 3258 +++++++++++++++++++++++++++++++++++++
 2 files changed, 3373 insertions(+)
 create mode 100644 test/anim.html
 create mode 100644 test/popcorn.unit.anim.js

diff --git a/test/anim.html b/test/anim.html
new file mode 100644
index 000000000..537ff500d
--- /dev/null
+++ b/test/anim.html
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Popcorn API</title>
+  <link rel="stylesheet" href="qunit/qunit.css" type="text/css" media="screen">
+  <script src="jquery.js"></script>
+
+  
+  <script src="qunit/qunit.js"></script>
+  
+  <!-- 
+    do not move - this must be called immediately prior to 
+    popcorn-api-draft.js
+  -->
+  <script src="popcorn.unit.setup.js"></script>
+  
+  <script src="../popcorn.js"></script>
+  <script src="popcorn.unit.anim.js"></script>
+</head>
+<body>
+  <h1 id="qunit-header">
+    Popcorn.js API
+    <iframe id="butter-tests" data-src="butter_test.html" style="width:325px;height:60px;float:right;border:0px;margin:-10px 20px 0 -10px;background:#fff" ></iframe>
+
+    <iframe id="ready-tests" data-src="ready.html" style="width:325px;height:60px;float:right;border:0px;margin:-10px 20px 0 -10px;background:#fff" ></iframe>
+
+  </h1>
+  <h2 id="qunit-banner"></h2>
+  <div id="qunit-testrunner-toolbar"></div>
+  <h2 id="qunit-userAgent"></h2>
+  <ol id="qunit-tests"></ol>
+  <div id="qunit-fixture">
+    
+    
+
+  
+  
+  </div>
+  
+  <video id='video'
+    style="display:;width:300px" 
+    controls 
+    poster="poster.png"> 
+
+    <source id='mp4'
+      src="trailer.mp4"
+      type='video/mp4; codecs="avc1, mp4a"'> 
+
+    <source id='ogv'
+      src="trailer.ogv"
+      type='video/ogg; codecs="theora, vorbis"'> 
+
+    <p>Your user agent does not support the HTML5 Video element.</p> 
+
+  </video>
+
+  <audio id='audio' src="italia.ogg" data-timeline-sources="data/parserData.json" controls> 
+  </audio>
+
+
+
+
+  <!-- Position Tests Adapted From jQuery offsets/dimensions Tests -->
+  <style type="text/css" media="screen">
+    #position-tests { display:none;margin:0; position: fixed;top:0px;left:0px;  }
+    
+    div.absolute { position: absolute; margin: 0px; width: 100px; height: 100px; background: #fff; }
+    #absolute-1 { top: 0; left: 0; }
+    #absolute-1-1 { top: 1px; left: 1px; }
+    #absolute-1-1-1 { top: 1px; left: 1px; }
+    #absolute-2 { top: 19px; left: 19px; }
+
+    div.relative { position: relative; top: 0; left: 0; width: 100px; height: 100px; background: #fff; overflow: hidden; }
+    #relative-2 { top: 20px; left: 20px; }
+
+    div.fixed { position: fixed; width: 100px; height: 100px; background: #fff; overflow: hidden; }
+    #fixed-1 { top: 0; left: 0; }
+    #fixed-2 { top: 20px; left: 20px; }
+
+    div.static { position: static; top: 0; left: 0; width: 100px; height: 100px; background: #fff; overflow: hidden; }
+    #static-2 { top: 20px; left: 20px; }    
+
+  </style>
+
+  <div id="position-tests">
+    <div id="absolute-1" class="absolute"><video id="vid-absolute-1" src="trailer.ogv" style="visibility:hidden"></video>
+      <div id="absolute-1-1" class="absolute"><video  id="vid-absolute-1-1"" src="trailer.ogv" style="visibility:hidden"></video>
+        <div id="absolute-1-1-1" class="absolute"><video  id="vid-absolute-1-1-1" src="trailer.ogv" style="visibility:hidden"></video></div>
+      </div>
+    </div>
+    <div id="absolute-2" class="absolute"><video  id="vid-absolute-2" src="trailer.ogv" style="visibility:hidden"></video></div>
+
+    <div id="relative-1" class="relative"><video  id="vid-relative-1" src="trailer.ogv" style="visibility:hidden"></video>
+      <div id="relative-1-1" class="relative"><video  id="vid-relative-1-1" src="trailer.ogv" style="visibility:hidden"></video>
+        <div id="relative-1-1-1" class="relative"><video  id="vid-relative-1-1-1" src="trailer.ogv" style="visibility:hidden"></video></div>
+      </div>
+    </div>
+    <div id="relative-2" class="relative"><video  id="vid-relative-2" src="trailer.ogv" style="visibility:hidden"></video></div>
+
+
+    <div id="fixed-1" class="fixed"><video  id="vid-fixed-1" src="trailer.ogv" style="visibility:hidden"></video></div>
+    <div id="fixed-2" class="fixed"><video  id="vid-fixed-2" src="trailer.ogv" style="visibility:hidden"></video></div>
+
+    <div id="static-1" class="static"><video  id="vid-static-1" src="trailer.ogv" style="visibility:hidden">
+      <div id="static-1-1" class="static"><video  id="vid-static-1-1" src="trailer.ogv" style="visibility:hidden">
+        <div id="static-1-1-1" class="static"><video  id="vid-static-1-1-1" src="trailer.ogv" style="visibility:hidden"></div>
+      </div>
+    </div>
+    <div id="static-2" class="static"><video  id="vid-static-2" src="trailer.ogv" style="visibility:hidden"></div>
+
+  </div>
+
+  
+</body>
+</html>
diff --git a/test/popcorn.unit.anim.js b/test/popcorn.unit.anim.js
new file mode 100644
index 000000000..fbbfbcc22
--- /dev/null
+++ b/test/popcorn.unit.anim.js
@@ -0,0 +1,3258 @@
+module("Popcorn API");
+test("API", function () {
+
+  var expects = 4,
+      count = 0;
+
+  expect(expects);
+
+  function plus(){ if ( ++count == expects ) start(); }
+
+  stop( 10000 );
+
+
+  try {
+
+    ok( Popcorn, "Popcorn exists");
+    plus();
+
+  } catch (e) {};
+
+
+  try {
+
+    ok( typeof Popcorn === "function", "Popcorn is a function");
+    plus();
+
+  } catch (e) {};
+
+  try {
+
+    equals( Setup.getGlobalSize(), Setup.globalSize + 1 , "Popcorn API creates only 1 global reference");
+    plus();
+
+  } catch (e) {};
+
+
+  try {
+
+    Popcorn(function() {
+
+      ok(1, "Popcorn calls its function argument");
+      plus();
+
+
+    }, {
+      frameAnimation: true
+    });
+
+  } catch (e) {};
+
+
+});
+
+test("Popcorn.* Static Methods", function () {
+
+  var statics = [ "forEach", "extend", "error", "guid", "sizeOf", "nop",
+                  "addTrackEvent", "removeTrackEvent", "getTrackEvents", "getTrackEvent", "position", "disable", "enable" ],
+    substatics = [ "addTrackEvent", "removeTrackEvent", "getTrackEvents", "getTrackEvent"];
+
+  expect(statics.length + substatics.length);
+
+  statics.forEach(function(val, idx) {
+
+    equals( typeof Popcorn[val], "function" , "Popcorn."+val+"() is a provided static function");
+
+  });
+
+  substatics.forEach(function(val, idx) {
+
+    equals( typeof Popcorn[val].ref, "function" , "Popcorn."+val+".ref() is a private use static function");
+
+  });
+});
+
+test("Popcorn.forEach", function() {
+
+  expect(3);
+
+  var count = 0,
+    nodelist = document.querySelectorAll("div[id^='qunit-']"),
+    array = [ 1, 2 ],
+    object = { a: "1", b: "2" };
+
+  Popcorn.forEach( nodelist, function() {
+    count++;
+  });
+
+  equal(count, nodelist.length, nodelist.length + " elements in NodeList");
+  count = 0;
+
+  Popcorn.forEach( array, function() {
+    count++;
+  });
+
+  equal(count, array.length, array.length + " items in Array");
+  count = 0;
+
+  Popcorn.forEach( object, function() {
+    count++;
+  });
+
+  equal(count, Popcorn.sizeOf(object), Popcorn.sizeOf(object) + " properties in object");
+});
+
+test("Popcorn.util.toSeconds" , function () {
+  var framerate = 24,
+      storedStartTime,
+      storedEndTime,
+      areEquivalent,
+      currentPeriod,
+      startTimeStr,
+      endTimeStr,
+      message;
+
+  //Time period data
+  //The correct times that specify frame are calculated with a framerate of
+  //24fps. Quotation is mixes (single and double) for testing purposes.
+  var timePeriods = [
+    { //Testing double quotes
+      start: "01.234",
+      end: "4.003",
+      correctStartTime: 1.234,
+      correctEndTime: 4.003
+    },
+    { //Tesing actual numbers
+      start: 5.333,
+      end: 6,
+      correctStartTime: 5.333,
+      correctEndTime: 6.000
+    },
+    { //Testing times in different data types (number and string)
+      start: 6.004,
+      end: "6.78",
+      correctStartTime: 6.004,
+      correctEndTime: 6.780
+    },
+    { //Testing times in different data types (string and number)
+      start: "8.090",
+      end: 9.11111111,
+      correctStartTime: 8.090,
+      correctEndTime: 9.11111111
+    },
+    { //Testing double quotes
+      start: "10;4",
+      end: "10;17",
+      correctStartTime: 10.1666,
+      correctEndTime: 10.7083
+    },
+    { //Testing single quotes
+      start: '12;1',
+      end: '13;2',
+      correctStartTime: 12.0416,
+      correctEndTime: 13.0833
+    },
+    { //Testing mixed quotes
+      start: "20;11",
+      end: '23;17',
+      correctStartTime: 20.4583,
+      correctEndTime: 23.7083
+    },
+    { //Testing mixed quotes
+      start: '27;7',
+      end: "27;22",
+      correctStartTime: 27.2916,
+      correctEndTime: 27.9166
+    },
+    { //Testing double quotes
+      start: "12:04;12",
+      end: "22:59;23",
+      correctStartTime: 724.5,
+      correctEndTime: 1379.9583
+    },
+    { //Testing single quotes
+      start: '1:48:27;9',
+      end: '3:23:15;1',
+      correctStartTime: 6507.375,
+      correctEndTime: 12195.0416
+    },
+    { //Testing mixed quotes
+      start: '12:56;7',
+      end: "2:02:42;8",
+      correctStartTime: 776.2916,
+      correctEndTime: 7362.3333
+    }
+  ];
+
+  var equivalentTimes = function ( testedTime, correctTime ) {
+    var tolerance = 0.0001;
+    return ( testedTime < ( correctTime + tolerance ) ) &&
+           ( testedTime > ( correctTime - tolerance ) );
+  };
+
+  var logMessage = function ( timeStr, correctTime, incorrectTime ) {
+    return "Time stored in seconds for '" + timeStr +
+           "' should be " + correctTime +
+           ". Time stored was " + incorrectTime ;
+  };
+
+  for ( var periodsIdx = 0, timPeriodsLength = timePeriods.length; periodsIdx < timPeriodsLength; periodsIdx++ ) {
+    currentPeriod = timePeriods[ periodsIdx ];
+    startTimeStr = currentPeriod.start;
+    endTimeStr = currentPeriod.end;
+
+    storedStartTime = Popcorn.util.toSeconds( startTimeStr, framerate );
+    storedEndTime = Popcorn.util.toSeconds( endTimeStr, framerate );
+
+    message = logMessage(
+      startTimeStr,
+      currentPeriod.correctStartTime,
+      storedStartTime
+    );
+
+    areEquivalent = equivalentTimes( storedStartTime, currentPeriod.correctStartTime );
+    equals( areEquivalent, true, message );
+
+    message = logMessage(
+      endTimeStr,
+      currentPeriod.correctEndTime,
+      storedEndTime
+    );
+
+    areEquivalent = equivalentTimes( storedEndTime, currentPeriod.correctEndTime ) ;
+    equals( areEquivalent, true, message );
+  }
+});
+
+test("Instances", function() {
+  var expects = 11,
+      count   = 0,
+      instance;
+
+  expect(expects);
+
+  function plus(){
+    if ( ++count == expects ) {
+      start();
+    }
+  }
+
+  stop();
+
+  Popcorn("#video", {
+    frameAnimation: true
+  });
+
+  ok( typeof Popcorn.addInstance === "function" , "Popcorn.addInstance is a provided static function");
+  plus();
+
+  ok( typeof Popcorn.removeInstance === "function" , "Popcorn.removeInstance is a provided static function");
+  plus();
+
+  ok( typeof Popcorn.getInstanceById === "function" , "Popcorn.getInstanceById is a provided static function");
+  plus();
+
+  ok( typeof Popcorn.removeInstanceById === "function" , "Popcorn.removeInstanceById is a provided static function");
+  plus();
+
+  ok( typeof Popcorn.instanceIds === "object" , "Popcorn.instanceIds is a provided cache object");
+  plus();
+
+  ok( "length" in Popcorn.instances && "join" in Popcorn.instances, "Popcorn.instances is a provided cache array");
+  plus();
+
+  instance = Popcorn.getInstanceById("video");
+
+  ok( instance.video, "Stored instance as a `video` property" );
+  plus();
+
+  ok( instance.data, "Stored instance as a `data` property" );
+  plus();
+
+  ok( instance instanceof Popcorn, "Instance instanceof Popcorn" );
+  plus();
+
+  equal( Popcorn.instances.length, 2, "There are the correct number of Popcorn instances" );
+  plus();
+
+  //  Create another instance
+  Popcorn("#video", {
+    frameAnimation: true
+  });
+
+  //  Get a reference to remove
+  var remove = Popcorn.instances[1];
+
+  //  Remove and check the length of the currently cached instances
+  equal( Popcorn.removeInstanceById( remove.id ).length, 2, "Removing an instance by id: 1 instance remains" );
+  plus();
+});
+
+test("guid", function () {
+
+  expect(6);
+
+  var count = 3,
+      guids = [],
+      temp;
+
+  for ( var i = 0; i < count; i++ ) {
+
+    temp = Popcorn.guid();
+
+    if ( i > 0 ) {
+      notEqual( temp, guids[ guids.length - 1 ], "Current guid does not equal last guid" );
+    } else {
+      ok( temp, "Popcorn.guid() returns value" );
+    }
+
+    guids.push(temp);
+  }
+
+  guids = [];
+
+  for ( var i = 0; i < count; i++ ) {
+
+    temp = Popcorn.guid( "pre" );
+
+    if ( i > 0 ) {
+      notEqual( temp, guids[ guids.length - 1 ], "Current guid does not equal last guid" );
+    } else {
+      ok( temp, "Popcorn.guid( 'pre' ) returns value" );
+    }
+
+    guids.push(temp);
+  }
+
+});
+test("isArray", function() {
+
+  expect(18);
+
+  var empty = [],
+      fastSmall = [1],
+      slow = [],
+      slowSmall = [],
+      all = null;
+
+  slowSmall[999999] = 0;
+  slowSmall.length = 0;
+  slow.slow = 0;
+
+  all = [ [], [1], new Array, Array(0),'abc'.match(/(a)/g), slow, slowSmall ];
+
+  all.forEach(function( a ) {
+    ok( Popcorn.isArray(a), "Popcorn.isArray("+JSON.stringify(a)+")" );
+  });
+
+  equal( Popcorn.isArray.length, 1, "Popcorn.isArray.length, 1" );
+
+  ok( !Popcorn.isArray(), "!Popcorn.isArray(), false");
+  ok( !Popcorn.isArray({}), "!Popcorn.isArray({}), false");
+  ok( !Popcorn.isArray(null), "!Popcorn.isArray(null), false");
+  ok( !Popcorn.isArray(undefined), "!Popcorn.isArray(undefined)");
+  ok( !Popcorn.isArray(17), "!Popcorn.isArray(17), false");
+  ok( !Popcorn.isArray("Array"), "!Popcorn.isArray('Array'), false");
+  ok( !Popcorn.isArray(Math.PI), "!Popcorn.isArray(Math.PI), false");
+  ok( !Popcorn.isArray(true), "!Popcorn.isArray(true), false");
+  ok( !Popcorn.isArray(false), "!Popcorn.isArray(false), false");
+  ok( !Popcorn.isArray( {__proto__: Array.prototype, length:1, 0:1, 1:2} ), "{__proto__: Array.prototype, length:1, 0:1, 1:2}");
+});
+
+
+test("Protected", function () {
+
+  expect(1);
+  //  TODO: comprehensive tests for these utilities
+
+  ok( !!Popcorn.protect , "Popcorn.protect exists");
+
+
+});
+
+test("Protected from removal", function () {
+
+  expect( Popcorn.protect.natives.length * 2 );
+
+  Popcorn.protect.natives.forEach(function( name ) {
+
+    try {
+      Popcorn.plugin( name );
+    } catch( e ) {
+      ok( true, e.message + " and cannot be used as a plugin name" );
+    }
+
+    try {
+      Popcorn.removePlugin( name );
+    } catch( e ) {
+      ok( true, e.message + " and cannot be removed with this API" );
+    }
+  });
+});
+
+
+
+test( "Object", function () {
+
+  var popped = Popcorn( "#video", {
+    frameAnimation: true
+  }),
+      popObj = Popcorn( document.getElementById( "video" ), {
+        frameAnimation: true
+      }),
+      methods = "load play pause currentTime mute volume roundTime exec removePlugin",
+      count = 0,
+      expects = 30;
+
+  expect( expects );
+
+  function plus() {
+
+    if ( ++count === expects ) {
+
+      start();
+    }
+  }
+
+  stop( 10000 );
+
+  // testing element passed by id
+  ok( "video" in popped, "instance by id has `video` property" );
+  plus();
+  equal( Object.prototype.toString.call( popped.video ), "[object HTMLVideoElement]", "instance by id video property is a HTMLVideoElement" );
+  plus();
+
+  ok( "data" in popped, "instance by id has `data` property" );
+  plus();
+  equal( Object.prototype.toString.call( popped.data ), "[object Object]", "instance by id data property is an object" );
+  plus();
+
+  ok( "trackEvents" in popped.data, "instance by id has `trackEvents` property" );
+  plus();
+  equal( Object.prototype.toString.call( popped.data.trackEvents ), "[object Object]", "instance by id trackEvents property is an object" );
+  plus();
+
+  popped.play();
+
+  methods.split( /\s+/g ).forEach(function ( k,v ) {
+
+    ok( k in popped, "instance by id has method: " + k );
+    plus();
+  });
+
+  // testing element passed by reference
+  ok( "video" in popObj, "instance by reference has `video` property" );
+  plus();
+  equal( Object.prototype.toString.call( popObj.video ), "[object HTMLVideoElement]", "instance by reference video property is a HTMLVideoElement" );
+  plus();
+
+  ok( "data" in popObj, "instance by reference has `data` property" );
+  plus();
+  equal( Object.prototype.toString.call( popObj.data ), "[object Object]", "instance by reference data property is an object" );
+  plus();
+
+  ok( "trackEvents" in popObj.data, "instance by reference has `trackEvents` property" );
+  plus();
+  equal( Object.prototype.toString.call( popObj.data.trackEvents ), "[object Object]", "instance by reference trackEvents property is an object" );
+  plus();
+
+  popObj.play();
+
+  methods.split( /\s+/g ).forEach(function ( k,v ) {
+
+    ok( k in popObj, "instance by reference has method: " + k );
+    plus();
+  });
+});
+
+module("Popcorn Static");
+
+test("Popcorn.[addTrackEvent | removeTrackEvent].ref()", function() {
+
+  expect(2);
+
+  var popped = Popcorn("#video", {
+    frameAnimation: true
+  });
+
+  // Calling exec() will create tracks and added them to the
+  // trackreference internally
+  popped.exec( 1, function() { /* ... */ });
+  popped.exec( 3, function() { /* ... */ });
+  popped.exec( 5, function() { /* ... */ });
+
+  equal( Popcorn.sizeOf( popped.data.trackRefs ), 3, "There are 3 trackRefs in popped.data.trackRefs" );
+
+  Popcorn.forEach( popped.data.trackRefs, function( ref, key ) {
+    popped.removeTrackEvent( key );
+  });
+
+  equal( Popcorn.sizeOf( popped.data.trackRefs ), 0, "There are 0 trackRefs in popped.data.trackRefs" );
+
+  //Popcorn.removeInstance( popped );
+});
+
+
+
+module("Popcorn Methods");
+
+
+
+test("roundTime", function () {
+
+  QUnit.reset();
+
+  var popped = Popcorn("#video", {
+    frameAnimation: true
+  });
+
+  popped.play().pause().currentTime( 0.98 );
+
+  equals( 1, popped.roundTime(), ".roundTime() returns 1 when currentTime is 0.98s" );
+
+
+});
+
+
+test("exec", function () {
+
+  QUnit.reset();
+
+  var popped = Popcorn("#video", {
+    frameAnimation: true
+  }),
+      expects = 2,
+      count = 0,
+      hasLooped = false,
+      loop = 0;
+
+  expect( expects + 1 );
+
+  function plus(){
+    if ( ++count == expects ) {
+
+      setTimeout( function() {
+
+        equals( loop, expects, "exec callback repeat check, only called twice" );
+        Popcorn.removePlugin( popped, "exec" );
+        start();
+
+      }, 1000 );
+    }
+  }
+
+  stop( 10000 );
+
+  popped.exec( 4, function () {
+    ok( loop < 2, "exec callback fired " + ++loop );
+    plus();
+
+    if ( !hasLooped ) {
+
+      popped.currentTime(3).play();
+
+      hasLooped = true;
+    }
+  }).currentTime(3).play();
+
+});
+
+test( "Popcorn.extend", function () {
+
+  QUnit.reset();
+
+  expect( 12 );
+
+  var dest = {},
+      obj1 = {
+        "key11" : "value",
+        "key12" : 9001,
+        "key13" : function() { return true; }
+      },
+      obj2 = {
+        "key21" : "String",
+        "key22" : 9002,
+        "key23" : function() { return false; }
+      },
+      prop;
+
+  Popcorn.extend( dest, obj1 );
+
+  for ( prop in obj1 ) {
+    equal( dest.hasOwnProperty( prop ), true, "{dest} has property: " + prop );
+  }
+
+  equal( typeof dest[ "key13" ], "function", "dest[key13] is a function" );
+
+  dest = {};
+
+  Popcorn.extend( dest, obj1, obj2 );
+
+  for ( prop in obj1 ) {
+    equal( dest.hasOwnProperty( prop ), true, "{dest} has property: " + prop + ", when extending 2 objects" );
+  }
+
+  for ( prop in obj2 ) {
+    equal( dest.hasOwnProperty( prop ), true, "{dest} has property: " + prop + ", when extending 2 objects" );
+  }
+
+  equal( typeof dest[ "key13" ], "function","dest[key13] is a function" );
+
+  equal( typeof dest[ "key23" ], "function","dest[key23] is a function" );
+
+});
+
+test( "Popcorn.events", function() {
+
+  QUnit.reset()
+  expect( 43 );
+
+  var eventTypes = [ "UIEvents", "MouseEvents", "Events" ],
+      natives = "",
+      events,
+      eventsReturned,
+      idx = 0,
+      len,
+      okay = true;
+
+  eventTypes.forEach (function( e ) {
+    ok( Popcorn.Events[ e ], e + " Exists")
+  });
+
+  natives = Popcorn.Events[ eventTypes[ 0 ] ] + " " + Popcorn.Events[ eventTypes[ 1 ] ] + " " + Popcorn.Events[ eventTypes[ 2 ] ];
+  events = natives.split( /\s+/g );
+  eventsReturned = Popcorn.events.all;
+  len = events.length;
+
+  for ( ; idx++ < len && okay; ) {
+    okay = events[ idx ] === eventsReturned[ idx ];
+  }
+
+  ok( okay, "Native events are correctly being handled" );
+
+  equals( typeof Popcorn.Events.Natives, "string", "Popcorn.Events.Natives is a string" );
+  equals( typeof Popcorn.events, "object", "Popcorn.events is an object" );
+
+  Popcorn.forEach( eventsReturned, function ( e ) {
+    ok( Popcorn.events.isNative ( e ), e + " is a native event" );
+  });
+
+});
+
+test("Popcorn.events.hooks", function() {
+
+  expect(1);
+
+  ok( Popcorn.events.hooks, "Popcorn.events.hooks exists" );
+
+});
+
+test("Popcorn.events.hooks: canplayall", function() {
+  //qunit-fixture
+
+  var expects = 1,
+    count = 0,
+    fired = 0;
+
+  expect(expects);
+
+  function plus(){
+    if ( ++count == expects ) {
+      start();
+    }
+  }
+
+  stop( 20000 );
+
+  var video = document.createElement("video"),
+    sources = {
+      mp4: document.createElement("source"),
+      ogv: document.createElement("source"),
+      webm: document.createElement("source")
+    },
+    url = "http://videos.mozilla.org/serv/webmademovies/popcornplug.";
+
+  video.id = "event-fixture";
+  video.controls = true;
+  video.autoplay = true;
+  video.preload = "auto";
+
+
+  Popcorn.forEach( sources, function( source, type ) {
+    source.src = url + type;
+    video.appendChild( source );
+  });
+
+  document.getElementById("qunit-fixture").appendChild( video );
+
+  var $pop = Popcorn("#event-fixture", {
+    frameAnimation: true
+  });
+
+  $pop.listen("canplayall", function( event ) {
+    equal( ++fired, 1, "canplayall is fired only once" );
+    plus();
+  });
+
+  $pop.listen("canplaythrough", function( event ) {
+    // this should trigger re-fires of the original event
+    this.currentTime(0);
+  });
+});
+
+/*
+<video height="180" width="300" id="video" controls>
+<source src="http://videos.mozilla.org/serv/webmademovies/popcornplug.mp4"></source>
+<source src="http://videos.mozilla.org/serv/webmademovies/popcornplug.ogv"></source>
+<source src="http://videos.mozilla.org/serv/webmademovies/popcornplug.webm"></source>
+</video>
+
+*/
+
+module("Popcorn Position");
+test("position", function () {
+
+  expect(25);
+
+  var $absolute = $(".absolute"),
+      $relative = $(".relative"),
+      $fixed = $(".fixed"),
+      $static = $(".static"),
+      tests;
+
+  $("#position-tests").show();
+//  console.log( $absolute );
+//  console.log( $fixed );
+//  console.log( $relative );
+//  console.log( $static );
+
+  tests = [
+    { id: "absolute-1",     top:  0, left:  0 },
+    { id: "absolute-1-1",   top:  1, left:  1 },
+    { id: "absolute-1-1-1", top:  2, left:  2 },
+    { id: "absolute-2",     top: 19, left: 19 }
+  ];
+
+  Popcorn.forEach( tests, function( test ) {
+    equals( Popcorn( "#vid-" + test.id , { frameAnimation: true }).position().top,  test.top,  "Popcorn('#vid-" + test.id + "', { frameAnimation: true }).position().top" );
+    equals( Popcorn( "#vid-" + test.id, { frameAnimation: true } ).position().left, test.left, "Popcorn('#vid-" + test.id + "', { frameAnimation: true }).position().left" );
+  });
+
+  tests = [
+    { id: "relative-1", top:   0, left:  0 },
+    { id: "relative-2", top: 120, left: 20 }
+  ];
+
+  Popcorn.forEach( tests, function( test ) {
+    equals( Popcorn( "#vid-" + test.id, { frameAnimation: true } ).position().top,  test.top,  "Popcorn('#vid-" + test.id + "', { frameAnimation: true }).position().top" );
+    equals( Popcorn( "#vid-" + test.id, { frameAnimation: true } ).position().left, test.left, "Popcorn('#vid-" + test.id + "', { frameAnimation: true }).position().left" );
+  });
+
+  tests = [
+    { id: "fixed-1", top:  0, left:  0 },
+    { id: "fixed-2", top: 20, left: 20 }
+  ];
+
+  Popcorn.forEach( tests, function( test ) {
+    equals( Popcorn( "#vid-" + test.id, { frameAnimation: true } ).position().top,  test.top,  "Popcorn('#vid-" + test.id + "', { frameAnimation: true }).position().top" );
+    equals( Popcorn( "#vid-" + test.id, { frameAnimation: true } ).position().left, test.left, "Popcorn('#vid-" + test.id + "', { frameAnimation: true }).position().left" );
+  });
+
+  tests = [
+    { id: "static-1",     top:  200, left:  0 },
+    { id: "static-1-1",   top:  0, left:  0 },
+    { id: "static-1-1-1", top:  0, left:  0 },
+    { id: "static-2",     top: 300, left: 0 }
+  ];
+
+  Popcorn.forEach( tests, function( test ) {
+    equals( Popcorn( "#vid-" + test.id, { frameAnimation: true } ).position().top,  test.top,  "Popcorn('#vid-" + test.id + "', { frameAnimation: true }).position().top" );
+    equals( Popcorn( "#vid-" + test.id, { frameAnimation: true } ).position().left, test.left, "Popcorn('#vid-" + test.id + "', { frameAnimation: true }).position().left" );
+  });
+
+  try {
+    ok( Popcorn( "#audio", { frameAnimation: true } ).position(), "position called from audio" );
+  } catch( e ) {
+    ok( false, e );
+  }
+
+  $("#position-tests").hide();
+});
+
+test("position called from plugin", function () {
+
+  var $pop = Popcorn("#video", { frameAnimation: true }),
+      expects = 3,
+      count = 0;
+
+  expect( expects );
+
+  function plus(){
+    if ( ++count == expects ) {
+      start();
+      Popcorn.removePlugin("positionPlugin");
+      delete Popcorn.manifest.positionPlugin;
+    }
+  }
+
+  stop( 10000 );
+
+  Popcorn.plugin( "positionPlugin" , function(){
+    return {
+      _setup: function( options ) {
+        ok( "position" in this, "this.position() avaliable in _setup");
+        plus();
+      },
+      start: function(event, options){
+
+        ok( "position" in this, "this.position() avaliable in start");
+        plus();
+      },
+      end: function(event, options){
+        ok( "position" in this, "this.position() avaliable in end");
+        plus();
+      }
+    };
+  });
+
+  $pop.positionPlugin({
+    start: 0,
+    end: 1
+  }).currentTime(0).play();
+});
+
+module("Popcorn Events");
+
+test("Can Detect Native event types", function() {
+
+  var tests = [ "play", "pause", "rough loade", "data seek" ],
+      expects = [ true, true, false, false ];
+
+  expect( tests.length );
+
+  tests.forEach(function( type, idx ) {
+    equal( Popcorn.events.isNative( type ), expects[ idx ], type + ( expects[ idx ] ? " is " : " is not " ) + "a valid native event" );
+  });
+});
+
+test("Determine event api interface", function() {
+
+  var tests = [ "play", "pause", "click", "scroll", "rough loade", "data seek" ],
+      expects = [ "Events", "Events", "MouseEvents", "UIEvents", false, false ];
+
+  expect( tests.length );
+
+  tests.forEach(function( type, idx ) {
+    equal( Popcorn.events.getInterface( type ), expects[ idx ], type + ( expects[ idx ] ? " is " : " is not " ) + "a valid native event" );
+  });
+});
+
+test("Stored By Type", function () {
+
+  QUnit.reset();
+
+  expect(6)
+
+  var p = Popcorn("#video", { frameAnimation: true }),
+      count = 0,
+      fired = 0,
+      wants = 4;
+
+  function plus(){
+
+    if ( ++count === 4 ) {
+
+      equals( fired, wants, "Number of callbacks fired from 1 handler" );
+
+      p.unlisten("play");
+
+      ok( !p.data.events["play"], "play handlers removed" );
+
+      start();
+    }
+  }
+
+  stop( 10000 );
+
+
+  p.listen("play", function () {
+    fired++;
+
+    ok(true, "Play fired " + fired);
+    plus();
+  });
+
+  p.listen("play", function () {
+    fired++;
+
+    ok(true, "Play fired " + fired);
+    plus();
+  });
+
+  p.listen("play", function () {
+    fired++;
+
+    ok(true, "Play fired " + fired);
+    plus();
+  });
+
+  p.listen("play", function () {
+    fired++;
+
+    ok(true, "Play fired " + fired);
+    plus();
+  });
+
+  p.trigger("play");
+
+  if (fired < 4) {
+    start();
+  }
+
+  p.unlisten("play");
+
+});
+
+
+test("Simulated", function () {
+
+  QUnit.reset();
+
+  var p = Popcorn("#video", { frameAnimation: true }),
+      completed = [];
+
+
+  var expects = Setup.events.length,
+      count = 0;
+
+  expect(expects);
+
+  function plus(){
+    if ( ++count == expects ) start();
+  }
+
+  stop( 10000 );
+
+
+  Setup.events.forEach(function ( name ) {
+    p.listen( name, function (event) {
+
+      if ( completed.indexOf(name) === -1 ) {
+        ok( true, name + " fired" );
+        plus();
+
+        completed.push(name);
+      }
+
+
+    });
+  });
+
+  Setup.events.forEach(function ( name ) {
+    p.trigger( name );
+  });
+
+
+});
+
+
+test("Real", function () {
+
+  QUnit.reset();
+
+  var p = Popcorn("#video", { frameAnimation: true }),
+      completed = [];
+
+
+  var expects = 5,
+      count = 0;
+
+
+  function plus(){
+    if ( ++count == expects ) start();
+  }
+
+  stop( 10000 );
+
+
+  [ "play", "pause", "volumechange", "seeking", "seeked" ].forEach(function ( name ) {
+
+    p.listen( name, function (event) {
+
+      if ( completed.indexOf(name) === -1 ) {
+        ok( true, name + " fired" );
+        plus();
+
+        completed.push(name);
+      }
+
+
+    });
+  });
+
+
+
+  p.pause();
+
+  p.play();
+
+  p.volume(0.9);
+
+  p.currentTime(49);
+
+
+
+});
+
+test("Custom", function () {
+
+  var expects = 1,
+      count = 0;
+
+  expect(expects);
+
+  function plus(){ if ( ++count == expects ) start(); }
+
+  stop( 10000 );
+
+  var p = Popcorn("#video", { frameAnimation: true });
+
+
+  p.listen("eventz0rz", function ( event ) {
+
+    ok( true, "Custom event fired" );
+    plus();
+
+  });
+
+  p.trigger("eventz0rz");
+
+
+
+});
+
+
+test("UI/Mouse", function () {
+
+  var expects = 1,
+      count = 0;
+
+  expect(expects);
+
+  function plus(){ if ( ++count == expects ) start(); }
+
+  stop( 10000 );
+
+  var p = Popcorn("#video", { frameAnimation: true });
+
+
+  p.listen("click", function ( event ) {
+
+    ok( true, "click event fired" );
+    plus();
+
+  });
+
+  p.trigger("click");
+
+
+
+});
+
+module("Popcorn Plugin")
+test("Manifest", function () {
+
+
+
+  var p = Popcorn("#video", { frameAnimation: true }),
+      expects = 5,
+      run = 1,
+      count   = 0;
+
+  function plus() {
+    if ( ++count === expects ) {
+      start();
+      // clean up added events after tests
+      Popcorn.removePlugin("footnote");
+    }
+  }
+
+  stop( 10000 );
+  Popcorn.plugin( "footnote" , function(){
+    return {
+      _setup: function( options ) {
+        ok( options.target, "`options.target exists`" );
+        plus();
+
+        if ( run === 2 ) {
+          equals( options.target, 'custom-target', "Uses custom target if one is specified" );
+          plus();
+        }
+
+        if ( run === 1 ) {
+          equals( options.target, 'text-container', "Uses manifest target by default" );
+          plus();
+
+          run++;
+        }
+      },
+      start: function(event, options){
+      },
+
+      end: function(event, options){
+
+      }
+
+    };
+
+  },
+  {
+    about:{
+      name: "Popcorn Manifest Plugin",
+      version: "0.0",
+      author: "Rick Waldron",
+      website: ""
+    },
+    options: {
+      start   : { elem:'input', type:'text', label:'In' },
+      end     : { elem:'input', type:'text', label:'Out' },
+      text    : { elem:'input', type:'text', label:'Manifest Text' },
+      target  : 'text-container'
+    }
+  });
+
+
+  expect(expects);
+
+  equal( Popcorn.sizeOf( Popcorn.manifest ), 1, "One manifest stored" );
+  plus();
+
+  // add more tests
+
+  p.footnote({});
+
+  p.footnote({
+    target: "custom-target"
+  });
+
+
+});
+
+test("Configurable Defaults", function () {
+
+  var expects = 13,
+      count   = 0;
+
+  function plus() {
+    if ( ++count === expects ) {
+      start();
+
+
+      ["configurable", "multiconfig", "overridden"].forEach(function( val ) {
+        Popcorn.removePlugin( val );
+        delete Popcorn.manifest[ val ];
+      });
+    }
+  }
+
+  stop();
+
+  Popcorn.plugin( "configurable", function () {
+    return {
+      _setup: function( options ) {
+
+        options.persistant = true;
+
+        equal( options.target, "foo", 'options.target, "foo" in configurable _setup');
+        plus();
+      },
+      start: function( event, options ) {
+
+        ok( options.persistant, "options.persistant proves same object passed from _setup" );
+        plus();
+        // target: "foo"
+        // text: "bar"
+        // type: "thinger"
+        equal( options.target, "foo", 'options.target, "foo" in configurable start');
+        plus();
+        equal( options.text, "bar", 'options.text, "bar" in configurable start');
+        plus();
+        equal( options.type, "thinger", 'options.type, "thinger" in configurable start');
+        plus();
+      },
+      end: function( event, options ) {
+        ok( true, "end fired");
+        plus();
+      }
+    };
+  },
+  {
+    about:{
+      name: "Popcorn Configurable Plugin",
+      version: "0.0",
+      author: "Rick Waldron",
+      website: ""
+    },
+    options: {
+      target: "manifest"
+    }
+  });
+
+  Popcorn.plugin( "multiconfig", function () {
+    return {
+      start: function( event, options ) {
+        equal( options.target, "quux", 'options.target, "quux" in multiconfig start');
+        plus();
+      },
+      end: function( event, options ) {
+        ok( true, "end fired");
+        plus();
+      }
+    };
+  });
+
+  Popcorn.plugin( "overridden", function () {
+    return {
+      _setup: function( options ) {
+        equal( options.text, "hello!", 'options.text, overriden with "hello!" in overridden _setup');
+        plus();
+
+        equal( options.target, "custom", 'options.target, overriden with "custom" in overridden _setup');
+        plus();
+      },
+      start: function( event, options ) {
+        equal( options.text, "hello!", 'options.text, overriden with "hello!" in overridden start');
+        plus();
+
+        equal( options.target, "custom", 'options.target, overriden with "custom" in overridden start');
+        plus();
+      },
+      end: function( event, options ) {
+        ok( true, "end fired");
+        plus();
+      }
+    };
+  });
+
+  var p = Popcorn("#video", {
+            frameAnimation: true,
+            defaults: {
+              overridden: {
+                target: "default"
+              }
+            }
+          });
+
+  p.defaults( "configurable", {
+
+    // set a default element target id
+    target: "foo"
+
+  }).defaults([
+    {
+      multiconfig: {
+        target: "quux"
+      }
+    },
+    {
+      configurable: {
+        text: "bar",
+        type: "thinger"
+      }
+    }
+  ]).configurable({
+
+    // all calls will have:
+    // target: "foo"
+    // text: "bar"
+    // type: "thinger"
+    start: 3,
+    end: 4
+
+  }).multiconfig({
+
+    // all calls will have:
+    // target: "quux"
+    start: 4,
+    end: 5
+
+  }).overridden({
+
+    // has a default set
+    // we need limitless overriding
+    start: 4,
+    end: 5,
+    target: "custom",
+    text: "hello!"
+
+  }).currentTime( 2 ).play();
+
+});
+
+test("Update Timer", function () {
+
+  QUnit.reset();
+
+  var p2 = Popcorn("#video", { frameAnimation: true }),
+      expects = 12,
+      count   = 0,
+      execCount = 0,
+      // These make sure events are only fired once
+      // any second call will produce a failed test
+      forwardStart  = false,
+      forwardEnd    = false,
+      backwardStart = false,
+      backwardEnd   = false,
+      wrapperRunning = { one: false, two: false, };
+
+  function plus() {
+    if ( ++count === expects ) {
+      // clean up added events after tests
+      Popcorn.removePlugin( "forwards" );
+      Popcorn.removePlugin( "backwards" );
+      Popcorn.removePlugin( "wrapper" );
+      p2.removePlugin( "exec" );
+      start();
+    }
+  }
+
+  // These tests come close to 10 seconds on chrome, increasing to 15
+  stop( 15000 );
+
+  Popcorn.plugin( "forwards", function () {
+    return {
+      start: function ( event, options ) {
+
+        if ( !options.startFired ) {
+
+          options.startFired = true;
+          forwardStart = !forwardStart;
+          ok( forwardStart, "forward's start fired" );
+          plus();
+        }
+      },
+      end: function ( event, options ) {
+
+        if ( !options.endFired ) {
+
+          options.endFired = true;
+          forwardEnd = !forwardEnd;
+          p2.currentTime(1).play();
+          ok( forwardEnd, "forward's end fired" );
+          plus();
+        }
+      }
+    };
+  });
+
+  p2.forwards({
+    start: 3,
+    end: 4
+  });
+
+  Popcorn.plugin( "backwards", function () {
+    return {
+      start: function ( event, options ) {
+
+        if ( !options.startFired ) {
+
+          options.startFired = true;
+          backwardStart = !backwardStart;
+          p2.currentTime(0).play();
+          ok( true, "backward's start fired" );
+          plus();
+        }
+      },
+      end: function ( event, options ) {
+
+        if ( !options.endFired ) {
+
+          options.endFired = true;
+          backwardEnd = !backwardEnd;
+          ok( backwardEnd, "backward's end fired" );
+          plus();
+          p2.currentTime( 5 ).play();
+        }
+      }
+    };
+  });
+
+  p2.backwards({
+    start: 1,
+    end: 2
+  });
+
+  Popcorn.plugin( "wrapper", {
+    start: function ( event, options ) {
+
+      wrapperRunning[ options.wrapper ] = true;
+    },
+    end: function ( event, options ) {
+
+      wrapperRunning[ options.wrapper ] = false;
+    }
+  });
+
+  // second instance of wrapper is wrapping the first
+  p2.wrapper({
+    start: 6,
+    end: 7,
+    wrapper: "one"
+  })
+  .wrapper({
+    start: 5,
+    end: 8,
+    wrapper: "two"
+  })
+  // checking wrapper 2's start
+  .exec( 5, function() {
+
+    if ( execCount === 0 ) {
+
+      execCount++;
+      ok( wrapperRunning.two, "wrapper two is running at second 5" );
+      plus();
+      ok( !wrapperRunning.one, "wrapper one is stopped at second 5" );
+      plus();
+    }
+  })
+  // checking wrapper 1's start
+  .exec( 6, function() {
+
+    if ( execCount === 1 ) {
+
+      execCount++;
+      ok( wrapperRunning.two, "wrapper two is running at second 6" );
+      plus();
+      ok( wrapperRunning.one, "wrapper one is running at second 6" );
+      plus();
+    }
+  })
+  // checking wrapper 1's end
+  .exec( 7, function() {
+
+    if ( execCount === 2 ) {
+
+      execCount++;
+      ok( wrapperRunning.two, "wrapper two is running at second 7" );
+      plus();
+      ok( !wrapperRunning.one, "wrapper one is stopped at second 7" );
+      plus();
+    }
+  })
+  // checking wrapper 2's end
+  .exec( 8, function() {
+
+    if ( execCount === 3 ) {
+
+      execCount++;
+      ok( !wrapperRunning.two, "wrapper two is stopped at second 9" );
+      plus();
+      ok( !wrapperRunning.one, "wrapper one is stopped at second 9" );
+      plus();
+    }
+  });
+
+  p2.currentTime(3).play();
+
+});
+
+test("Plugin Factory", function () {
+
+  QUnit.reset();
+
+  var popped = Popcorn("#video", { frameAnimation: true }),
+      methods = "load play pause currentTime mute volume roundTime exec removePlugin",
+      expects = 34, // 15*2+2+2. executor/complicator each do 15
+      count = 0;
+
+  function plus() {
+    if ( ++count == expects ) {
+      Popcorn.removePlugin("executor");
+      Popcorn.removePlugin("complicator");
+      start();
+    }
+  }
+
+  expect( expects );
+  stop( 15000 );
+
+  Popcorn.plugin("executor", function () {
+
+    return {
+
+      start: function () {
+        var self = this;
+
+        // These ensure that a popcorn instance is the value of `this` inside a plugin definition
+
+        methods.split(/\s+/g).forEach(function (k,v) {
+          ok( k in self, "executor instance has method: " + k );
+
+          plus();
+        });
+
+        ok( "video" in this, "executor instance has `video` property" );
+        plus();
+        ok( Object.prototype.toString.call(popped.video) === "[object HTMLVideoElement]", "video property is a HTMLVideoElement" );
+        plus();
+
+        ok( "data" in this, "executor instance has `data` property" );
+        plus();
+        ok( Object.prototype.toString.call(popped.data) === "[object Object]", "data property is an object" );
+        plus();
+
+        ok( "trackEvents" in this.data, "executor instance has `trackEvents` property" );
+        plus();
+        ok( Object.prototype.toString.call(popped.data.trackEvents) === "[object Object]", "executor trackEvents property is an object" )
+        plus();
+      },
+      end: function () {
+
+      }
+    };
+
+  });
+
+  ok( "executor" in popped, "executor plugin is now available to instance" );
+  plus();
+  equals( Popcorn.registry.length, 1, "One item in the registry");
+  plus();
+
+  popped.executor({
+    start: 1,
+    end: 2
+  });
+
+  Popcorn.plugin("complicator", {
+
+    start: function ( event ) {
+
+      var self = this;
+
+      // These ensure that a popcorn instance is the value of `this` inside a plugin definition
+
+      methods.split(/\s+/g).forEach(function (k,v) {
+        ok( k in self, "complicator instance has method: " + k );
+
+        plus();
+      });
+
+      ok( "video" in this, "complicator instance has `video` property" );
+      plus();
+      ok( Object.prototype.toString.call(popped.video) === "[object HTMLVideoElement]", "video property is a HTMLVideoElement" );
+      plus();
+
+      ok( "data" in this, "complicator instance has `data` property" );
+      plus();
+      ok( Object.prototype.toString.call(popped.data) === "[object Object]", "complicator data property is an object" );
+      plus();
+
+      ok( "trackEvents" in this.data, " complicatorinstance has `trackEvents` property" );
+      plus();
+      ok( Object.prototype.toString.call(popped.data.trackEvents) === "[object Object]", "complicator trackEvents property is an object" )
+      plus();
+    },
+    end: function () {
+
+      //start();
+
+    },
+    timeupdate: function () {
+    }
+  });
+
+  ok( "complicator" in popped, "complicator plugin is now available to instance" );
+  plus();
+  equals( Popcorn.registry.length, 2, "Two items in the registry");
+  plus();
+
+  popped.complicator({
+    start: 4,
+    end: 5
+  });
+
+  popped.currentTime(0).play();
+
+});
+
+test( "Popcorn Compose", function () {
+
+  QUnit.reset();
+
+  var popped = Popcorn("#video", { frameAnimation: true }),
+      expects = 43,
+      count = 0,
+      effectTrackOne,
+      effectTrackTwo,
+      effectTrackThree,
+      composeOptionsOne,
+      composeOptionsTwo,
+      test = {
+        one: {
+          setup: 0,
+          running: 0
+        },
+        two: {
+          setup: 0,
+          running: 0
+        }
+      };
+
+  function plus() {
+    if ( ++count == expects ) {
+      Popcorn.removePlugin("testPlugin");
+      Popcorn.removePlugin("pluginOptions1");
+      Popcorn.removePlugin("pluginOptions2");
+      start();
+    }
+  }
+
+  expect( expects );
+  stop( 15000 );
+
+  ok( Popcorn.compose, "Popcorn.compose method exists" );
+  plus();
+
+  ok( Popcorn.effect, "Popcorn.effect method exists" );
+  plus();
+
+  ok( Popcorn.plugin.effect, "Popcorn.plugin.effect method exists" );
+  plus();
+
+  Popcorn.plugin( "testPlugin", {});
+
+  Popcorn.compose( "testCompose1", {
+    start: function() {
+      test.one.running++;
+    },
+    end: function() {
+      test.one.running--;
+    },
+    _setup: function() {
+      test.one.setup++;
+    },
+    _teardown: function() {
+      test.one.setup--;
+    }
+  });
+
+  Popcorn.effect( "testEffect2", {
+    start: function() {
+      test.two.running++;
+    },
+    end: function() {
+      test.two.running--;
+    },
+    _setup: function() {
+      test.two.setup++;
+    },
+    _teardown: function() {
+      test.two.setup--;
+    }
+  });
+
+  popped.testPlugin({
+    start: 0,
+    end: 1,
+    compose: "testCompose1",
+    effect: "testEffect2"
+  });
+
+  effectTrackOne = popped.getLastTrackEventId();
+
+  popped.testPlugin({
+    start: 1,
+    end: 2
+  })
+  .testPlugin({
+    start: 2,
+    end: 4,
+    compose: "testCompose1"
+  })
+  .testPlugin({
+    start: 3,
+    end: 4,
+    compose: "testCompose1 testEffect2"
+  });
+
+  effectTrackTwo = popped.getLastTrackEventId();
+
+  popped.testPlugin({
+    start: 5,
+    end: 6,
+    effect: "testCompose1"
+  })
+  .testPlugin({
+    start: 6,
+    end: 7,
+    effect: "testCompose1 testEffect2"
+  });
+
+  effectTrackThree = popped.getLastTrackEventId();
+
+  equals( test.one.running, 0, "no compose one running" );
+  plus();
+  equals( test.one.setup, 5, "five compose one setup" );
+  plus();
+  equals( test.two.running, 0, "no compose two running" );
+  plus();
+  equals( test.two.setup, 3, "three compose two setup" );
+  plus();
+
+  popped.exec( 0, function() {
+    equals( test.one.running, 1, "one compose running" );
+   plus();
+   equals( test.two.running, 1, "one effect running" );
+   plus();
+  })
+  .exec( 1, function() {
+    equals( test.one.running, 0, "no compose running" );
+    plus();
+    equals( test.two.running, 0, "no effect running" );
+    plus();
+  })
+  .exec( 2, function() {
+    equals( test.one.running, 1, "one compose running" );
+    plus();
+    equals( test.two.running, 0, "no effect running" );
+    plus();
+  })
+  .exec( 3, function() {
+    equals( test.one.running, 2, "two compose one running" );
+    plus();
+    equals( test.two.running, 1, "one compose two running" );
+    plus();
+  })
+  .exec( 4, function() {
+    equals( test.one.running, 0, "no compose one running" );
+    plus();
+    equals( test.two.running, 0, "no compose two running" );
+    plus();
+  })
+  .exec( 5, function() {
+    equals( test.one.running, 1, "one effect running" );
+    plus();
+    equals( test.two.running, 0, "no compose running" );
+    plus();
+  })
+  .exec( 6, function() {
+    equals( test.one.running, 1, "one effect one running" );
+    plus();
+    equals( test.two.running, 1, "one effect two running" );
+    plus();
+  })
+  .exec( 7, function() {
+    popped.removeTrackEvent( effectTrackOne );
+    popped.removeTrackEvent( effectTrackTwo );
+    popped.removeTrackEvent( effectTrackThree );
+    popped.removeTrackEvent( composeOptionsOne );
+    popped.removeTrackEvent( composeOptionsTwo );
+    equals( test.one.setup, 2, "three compose one teardowns called. 5 - 3 = 2" );
+    plus();
+    equals( test.two.setup, 0, "three compose two teardowns called. 3 - 3 = 0" );
+    plus();
+  });
+
+  // runs once, 2 tests
+  Popcorn.plugin( "pluginOptions1", {
+    _setup: function( options ) {
+      console.log( "runs once?" );
+      ok( options.pluginoption, "plugin option one exists at setup" );
+      plus();
+      ok( !options.composeoption, "compose option one does not exist at setup" );
+      plus();
+      // check to test plugin to effect call order
+      options.composeoption = true;
+    }
+  });
+
+  // runs once, 2 tests
+  Popcorn.plugin( "pluginOptions2", {
+    _setup: function( options ) {
+      ok( !options.pluginoption, "plugin option two does not exist at setup" );
+      plus();
+      ok( options.composeoption, "compose option two exists at setup" );
+      plus();
+      // check to test plugin to effect call order
+      options.pluginoption = true;
+    }
+  });
+
+  // runs twice, 8 tests * 2 runs = 16 tests
+  Popcorn.plugin.effect( "composeOptions", {
+    _setup: function( options ) {
+      ok( options.pluginoption, "plugin option exists at setup" );
+      plus();
+      ok( options.composeoption, "compose option exists at setup" );
+      plus();
+    },
+    _teardown: function( options ) {
+      ok( options.pluginoption, "plugin option exists at teardown" );
+      plus();
+      ok( options.composeoption, "compose option exists at teardown" );
+      plus();
+    },
+    start: function( event, options ) {
+      ok( options.pluginoption, "plugin option exists at start" );
+      plus();
+      ok( options.composeoption, "compose option exists at start" );
+      plus();
+    },
+    end: function( event, options ) {
+      ok( options.pluginoption, "plugin option exists at end" );
+      plus();
+      ok( options.composeoption, "compose option exists at end" );
+      plus();
+    }
+  });
+
+  popped.pluginOptions1({
+    start: 0,
+    end: 1,
+    compose: "composeOptions",
+    pluginoption: true
+  });
+
+  composeOptionsOne = popped.getLastTrackEventId();
+
+  popped.pluginOptions2({
+    start: 0,
+    end: 1,
+    compose: "composeOptions",
+    composeoption: true
+  });
+
+  composeOptionsTwo = popped.getLastTrackEventId();
+
+  popped.currentTime( 0 ).play();
+});
+
+test("Plugin Breaker", function () {
+
+  QUnit.reset();
+
+  var popped = Popcorn("#video", { frameAnimation: true }),
+      expects = 6,
+      count = 0;
+
+  function plus() {
+    if ( ++count == expects ) {
+      Popcorn.removePlugin("breaker");
+      start();
+    }
+  }
+
+  expect( expects );
+  stop( 10000 );
+
+  var breaker = {
+
+    start: 0,
+    end: 0
+
+  };
+
+  Popcorn.plugin("breaker", {
+
+    start: function () {
+
+      breaker.start++;
+
+      ok(true, "breaker started");
+      plus();
+    },
+    end: function () {
+
+      breaker.end++;
+
+      ok(true, "breaker ended");
+      plus();
+
+
+      equals( breaker.start, 1, "plugin start method fires only once");
+      plus();
+      equals( breaker.end, 1, "plugin end method fires only once");
+      plus();
+
+
+    }
+  });
+
+  ok( "breaker" in popped, "breaker plugin is now available to instance" );
+  plus();
+  equals( Popcorn.registry.length, 1, "Three items in the registry");
+  plus();
+
+  popped.breaker({
+    start: 1,
+    end: 2
+  });
+
+  popped.currentTime(0).play();
+
+});
+
+test("Plugin Empty", function () {
+
+  QUnit.reset();
+
+  var popped = Popcorn("#video", { frameAnimation: true }),
+      expects = 4,
+      testObj = {},
+      count = 0;
+
+  function plus() {
+    if ( ++count == expects ) {
+      Popcorn.removePlugin("empty");
+      start();
+    }
+  }
+
+  expect( expects );
+  stop( 10000 );
+
+  Popcorn.plugin("empty", testObj);
+
+  popped.empty({});
+
+  ok( testObj.start, "default start function is generated" );
+  plus();
+  ok( testObj.end, "default end function is generated" );
+  plus();
+  ok( testObj._setup, "default _setup function is generated" );
+  plus();
+  ok( testObj._teardown, "default _teardown function is generated" );
+  plus();
+
+  popped.currentTime(0).play();
+
+});
+
+test("Plugin Closure", function () {
+
+  QUnit.reset();
+
+  var popped = Popcorn("#video", { frameAnimation: true }),
+      methods = "load play pause currentTime mute volume roundTime exec removePlugin",
+      expects = 8,
+      count = 0;
+
+  function plus() {
+    if ( ++count == expects ) {
+      Popcorn.removePlugin("closure");
+      start();
+    }
+  }
+
+  expect( expects );
+  stop( 10000 );
+
+  Popcorn.plugin("closure", function() {
+
+    var startCount = 0;
+    var endCount = 0;
+
+    return {
+
+      _setup: function( options ) {
+        options.startCount = 0;
+        options.endCount = 0;
+      },
+      start: function ( event, options ) {
+        // called once for each instance; the test will fail if startCount is not actually unique per instance
+        equals( startCount++, options.startCount++, options.nick + " has correct start counts" );
+        plus();
+      },
+      end: function ( event, options ) {
+        // likewise for endCount
+        equals( endCount++, options.endCount++, options.nick + " has correct end counts" );
+        plus();
+
+        // running tracks again to make sure data increments uniquly
+        popped.currentTime(5).play();
+      }
+    };
+  });
+
+  popped.closure({
+    start: 5,
+    end: 6,
+    nick: "first closure track"
+  })
+  .closure({
+    start: 5,
+    end: 6,
+    nick: "second closure track"
+  });
+
+  popped.currentTime(5).play();
+
+});
+
+test("Remove Plugin", function () {
+
+  var p = Popcorn("#video", { frameAnimation: true }),
+      p2 = Popcorn("#video", { frameAnimation: true }),
+      rlen = Popcorn.registry.length,
+      count = 0,
+      expects = 25,
+      interval;
+
+  function plus() {
+    if ( ++count === expects ) {
+      start();
+    }
+  }
+
+  expect( expects );
+  stop( 10000 );
+  p.currentTime(0).pause();
+
+  equals( rlen, 0, "Popcorn.registry.length is empty");
+  plus();
+
+  equals( p.data.trackEvents.byStart.length, 2, "p.data.trackEvents.byStart is initialized and has 2 entries");
+  plus();
+  equals( p.data.trackEvents.byEnd.length, 2, "p.data.trackEvents.byEnd is initialized and has 2 entries");
+  plus();
+
+  Popcorn.plugin("removeme", {
+
+    start: function () {
+
+    },
+    end: function () {
+
+    },
+    _teardown: function( options ) {
+      ok( true, "teardown called on " + options.order + " plugin via removePlugin()" );
+      plus();
+    }
+  });
+
+  p.removeme({
+    start: 2,
+    end: 3,
+    order: "first"
+  });
+
+  p2.removeme({
+    start: 2,
+    end: 3,
+    order: "second"
+  });
+
+  equals( Popcorn.registry.length, 1, "Popcorn.registry.length is 1");
+  plus();
+  equals( p.data.trackEvents.byStart.length, 3, "p.data.trackEvents.byStart is updated and has 3 entries");
+  plus();
+  equals( p.data.trackEvents.byEnd.length, 3, "p.data.trackEvents.byEnd is updated and has 3 entries");
+  plus();
+
+  p.removePlugin("removeme");
+
+  // p.removeme still exists on the prototype, even though we said to remove it
+  // the tracks of that type though, are removed.
+  // think of it as removing all tracks of plugin type attached to an instance
+  ok( typeof p.removeme === "function", "removeme plugin is still defined to p instance" );
+  plus();
+  ok( ( "removeme" in Popcorn.prototype ), "removeme plugin is still available to Popcorn.prototype" );
+  plus();
+  equals( Popcorn.registry.length, 1, "Popcorn.registry.length has not changed");
+  plus();
+
+  ok( (typeof p2.removeme === "function"), "removeme plugin is defined to p2 instance" );
+  plus();
+
+  equals( p2.data.trackEvents.byStart.length, 3, "p2.data.trackEvents.byStart is updated and has 3 entries");
+  plus();
+  equals( p2.data.trackEvents.byEnd.length, 3, "p2.data.trackEvents.byEnd is updated and has 3 entries");
+  plus();
+
+  equals( p.data.trackEvents.byStart.length, 2, "p.data.trackEvents.byStart is updated and has 2 entries");
+  plus();
+  equals( p.data.trackEvents.byEnd.length, 2, "p.data.trackEvents.byEnd is updated and has 2 entries");
+  plus();
+  Popcorn.removePlugin("removeme");
+
+  ok( !("removeme" in p2), "removeme plugin is no longer available to p2 instance" );
+  plus();
+  ok( !("removeme" in Popcorn.prototype), "removeme plugin is no longer available to Popcorn.prototype" );
+  plus();
+  equals( Popcorn.registry.length, 0, "Popcorn.registry.length is empty again");
+  plus();
+
+  equals( p2.data.trackEvents.byStart.length, 2, "p2.data.trackEvents.byStart is updated and has 2 entries");
+  plus();
+  equals( p2.data.trackEvents.byEnd.length, 2, "p2.data.trackEvents.byEnd is updated and has 2 entries");
+  plus();
+
+  interval = setInterval( function() {
+    if( p2.currentTime() > 3 ) {
+
+      equals( p2.data.trackEvents.byStart.length, 2, "p2.data.trackEvents.byStart is updated and has 2 entries");
+      plus();
+      equals( p2.data.trackEvents.byEnd.length, 2, "p2.data.trackEvents.byEnd is updated and has 2 entries");
+      plus();
+      clearInterval( interval );
+    }
+  }, 1);
+
+  Popcorn.plugin( "cleanup", {
+
+    _setup: function( options ) {
+
+      options.exist = true;
+    },
+    _teardown: function( options ) {
+
+      ok( true, "cleanup function is called during removal" );
+      plus();
+
+      ok( options.exist, "options object exists at time of cleanup" );
+      plus();
+    },
+    frame: function() {
+    }
+  });
+
+  p2.cleanup({
+    start: 2,
+    end: 3
+  });
+  p2.removeTrackEvent( p2.getLastTrackEventId() );
+
+  p2.currentTime( 2 ).play();
+
+});
+
+
+
+
+test("Protected Names", function () {
+  //QUnit.reset();
+
+  expect(8);
+
+  var popped = Popcorn("#video", { frameAnimation: true });
+
+  $.each( "load play pause currentTime playbackRate mute volume duration".split(/\s+/), function (k, name) {
+    try {
+
+      Popcorn.plugin( name, {});
+    }   catch (e) {
+
+      ok( name, "Attempting to overwrite '" + name + "' threw an exception " );
+
+    };
+  });
+});
+
+test("Defaulting Empty End Values", function() {
+
+  expect (2);
+
+  Popcorn.plugin("testdefault", {
+    _setup: function( options ) {
+      equals( options.end, Number.MAX_VALUE, "The end value defaulted to maximum number value");
+    },
+    start: function(event, options) {
+
+    },
+    end: function(event, options) {
+
+    }
+  });
+
+  var popped = Popcorn( document.createElement( "audio" ), { frameAnimation: true } )
+  .play()
+  .testdefault({
+    start: 0, // seconds
+    apikey: "CHAyhB5IisvLqqzGYNYbmA",
+    mediaid: "13607892"
+  });
+
+  var popped2 = Popcorn( document.createElement( "video" ), { frameAnimation: true } )
+  .play()
+  .testdefault({
+    start: 0, // seconds
+    apikey: "CHAyhB5IisvLqqzGYNYbmA",
+    mediaid: "13607892"
+  });
+});
+
+module("Popcorn TrackEvents");
+test("Functions", function () {
+
+  //  TODO: break this into sep. units per function
+  expect(19);
+
+  var popped = Popcorn("#video", { frameAnimation: true }), ffTrackId, rwTrackId, rw2TrackId, rw3TrackId, historyRef, trackEvents;
+
+
+  Popcorn.plugin("ff", function () {
+    return {
+      start: function () {},
+      end: function () {}
+    };
+  });
+
+  popped.ff({
+    start: 3,
+    end: 4
+  });
+
+
+  ffTrackId = popped.getLastTrackEventId();
+
+
+
+  Popcorn.plugin("rw", function () {
+    return {
+      start: function () {},
+      end: function () {}
+    };
+  });
+
+  popped.rw({
+    start: 1,
+    end: 2
+  });
+
+
+  rwTrackId = popped.getLastTrackEventId();
+
+  historyRef = popped.data.history;
+
+
+  equals( historyRef.length, 2, "2 TrackEvents in history index");
+  equals( popped.data.trackEvents.byStart.length, 4, "4 TrackEvents in popped.data.trackEvents.byStart ");
+  equals( popped.data.trackEvents.byEnd.length, 4, "4 TrackEvents in popped.data.trackEvents.byEnd ");
+
+
+  trackEvents = popped.getTrackEvents();
+
+  equals( trackEvents.length, 2, "2 user created trackEvents returned by popped.getTrackEvents()" )
+
+
+  ok( ffTrackId !== rwTrackId, "Track Events have different ids" );
+
+  popped.removeTrackEvent( rwTrackId );
+
+  equals( popped.data.history.length, 1, "1 TrackEvent in history index - after popped.removeTrackEvent( rwTrackId ); ");
+  equals( popped.data.trackEvents.byStart.length, 3, "3 TrackEvents in popped.data.trackEvents.byStart ");
+  equals( popped.data.trackEvents.byEnd.length, 3, "3 TrackEvents in popped.data.trackEvents.byEnd ");
+
+  trackEvents = popped.getTrackEvents();
+
+  equals( trackEvents.length, 1, "1 user created trackEvents returned by popped.getTrackEvents()" )
+
+  popped.rw({
+    start: 1,
+    end: 2
+  });
+
+
+  rw2TrackId = popped.getLastTrackEventId();
+
+  equals( popped.data.history.length, 2, "2 TrackEvents in history index - after new track added ");
+
+
+  ok( rw2TrackId !== rwTrackId, "rw2TrackId !== rwTrackId" );
+
+  equals( popped.data.trackEvents.byStart.length, 4, "4 TrackEvents in popped.data.trackEvents.byStart  - after new track added");
+  equals( popped.data.trackEvents.byEnd.length, 4, "4 TrackEvents in popped.data.trackEvents.byEnd  - after new track added");
+
+
+  trackEvents = popped.getTrackEvents();
+
+  equals( trackEvents.length, 2, "2 user created trackEvents returned by popped.getTrackEvents()" )
+
+
+  popped.rw({
+    id: "my-track-id",
+    start: 3,
+    end: 10
+  });
+
+  rw3TrackId = popped.getLastTrackEventId();
+
+  equals( popped.data.history.length, 3, "3 TrackEvents in history index - after new track added ");
+  equals( popped.data.trackEvents.byStart.length, 5, "5 TrackEvents in popped.data.trackEvents.byStart  - after new track added");
+  equals( popped.data.trackEvents.byEnd.length, 5, "5 TrackEvents in popped.data.trackEvents.byEnd  - after new track added");
+
+  equals( rw3TrackId, "my-track-id", "TrackEvent has user defined id");
+
+  trackEvents = popped.getTrackEvents();
+
+  equals( trackEvents.length, 3, "3 user created trackEvents returned by popped.getTrackEvents()" )
+
+
+
+
+});
+
+test("getTrackEvent", function () {
+
+  //  TODO: break this into sep. units per function
+  expect(5);
+
+  var popped = Popcorn("#video", { frameAnimation: true }),
+    trackIds = [], obj, oldId;
+
+  Popcorn.plugin("ff", function () {
+    return {
+      start: function () {},
+      end: function () {}
+    };
+  });
+
+  popped.ff({
+    start: 3,
+    end: 4
+  });
+
+  trackIds.push( popped.getLastTrackEventId() );
+
+  Popcorn.plugin("rw", function () {
+    return {
+      start: function () {},
+      end: function () {}
+    };
+  });
+
+  popped.rw({
+    start: 1,
+    end: 2
+  });
+
+
+  trackIds.push( popped.getLastTrackEventId() );
+
+  popped.rw({
+    start: 5,
+    end: 7
+  });
+
+  trackIds.push( popped.getLastTrackEventId() );
+
+  obj = popped.getTrackEvent( trackIds[0] );
+
+  equals( typeof obj  === "object", true, "getTrackEvent() returned an object" );
+
+  trackIds.forEach (function( id ) {
+    var trackEvent = popped.getTrackEvent( id );
+    equals( id, trackEvent._id, "returned the correct TrackEvent");
+  });
+
+  oldId = trackIds[trackIds.length - 1];
+
+  popped.removeTrackEvent( oldId );
+
+  equals( popped.getTrackEvent( oldId ), undefined,  "returned undefined when id is not found" );
+
+});
+
+test("Index Integrity", function () {
+
+
+
+  var trackLen, hasrun = false, lastrun = false;
+
+
+  Popcorn.plugin("ff", function () {
+    return {
+      start: function () {
+        var div = document.createElement('div');
+        div.id = "index-test";
+        div.innerHTML = "foo";
+
+        document.body.appendChild(div);
+      },
+      end: function () {
+        document.getElementById('index-test').parentNode.removeChild(document.getElementById('index-test'));
+      }
+    };
+  });
+
+
+  var p = Popcorn("#video", { frameAnimation: true });
+
+  p.ff({
+    id: "removeable-track-event",
+    start: 40,
+    end: 41
+  });
+
+  p.currentTime(40).pause();
+
+  stop( 10000 );
+
+  equals(p.data.trackEvents.endIndex, 0, "p.data.trackEvents.endIndex is 0");
+  equals(p.data.trackEvents.startIndex, 0, "p.data.trackEvents.startIndex is 0");
+  equals(p.data.trackEvents.byStart.length, 3, "p.data.trackEvents.byStart.length is 3 - before play" );
+
+
+
+
+  p.listen("timeupdate", function () {
+
+    if ( p.roundTime() > 40 && p.roundTime() < 42 && !hasrun ) {
+    }
+
+    if ( p.roundTime() > 40 && p.roundTime() < 42 && hasrun && !lastrun ) {
+
+      lastrun = true;
+
+      equals( document.getElementById('index-test'), null, "document.getElementById('index-test') is null on second run - after removeTrackEvent" );
+
+      start();
+    }
+
+    if ( p.roundTime() >= 42 && !hasrun ) {
+
+      hasrun  = true;
+      p.pause();
+
+      equals(p.data.trackEvents.byStart.length, 3, "p.data.trackEvents.byStart.length is 3 - after play, before removeTrackEvent" );
+      equals(p.data.trackEvents.startIndex, 2, "p.data.trackEvents.startIndex is 2 - after play, before removeTrackEvent");
+      equals(p.data.trackEvents.endIndex, 2, "p.data.trackEvents.endIndex is 2 - after play, before removeTrackEvent");
+
+
+
+      p.removeTrackEvent("removeable-track-event");
+
+      equals(p.data.trackEvents.byStart.length, 2, "p.data.trackEvents.byStart.length is 2 - after removeTrackEvent" );
+      equals(p.data.trackEvents.startIndex, 1, "p.data.trackEvents.startIndex is 1 - after removeTrackEvent");
+      equals(p.data.trackEvents.endIndex, 1, "p.data.trackEvents.endIndex is 1 - after removeTrackEvent");
+
+
+
+      p.currentTime(40).play();
+
+
+
+    }
+  });
+
+  p.play();
+
+
+});
+
+test("Popcorn.disable/enable/toggle", function() {
+
+
+  var $pop = Popcorn( "#video", { frameAnimation: true } ),
+      count = 0,
+      expects = 5;
+
+  expect( expects );
+
+  function plus() {
+    if ( ++count === expects ) {
+      start();
+
+      Popcorn.removeInstance( $pop );
+    }
+  }
+
+  Popcorn.plugin("toggler", function () {
+    return {
+      start: function () {
+        var div = document.createElement("div");
+        div.id = "toggler-test";
+        div.innerHTML = "foo";
+
+        document.body.appendChild(div);
+      },
+      end: function () {
+        document.getElementById("toggler-test").parentNode.removeChild(document.getElementById("toggler-test"));
+      }
+    };
+  });
+
+  $pop.exec( 40, function() {
+
+    //  make sure toggler never happened
+    // look for: "toggler-test"
+
+    ok( !document.getElementById("toggler-test"), "No toggler container, disabled toggler plugin correctly never ran" );
+    plus();
+
+    // Test per-instance toggle on
+    $pop.toggle( "toggler" );
+    ok( $pop.data.disabled.indexOf("toggler") === -1, "toggle() plugin: toggler is re-enabled" );
+    plus();
+  });
+
+  $pop.toggler({
+    start: 40,
+    end: 50
+  });
+
+  // rw/ff
+
+  // Test per-instance function call
+  $pop.disable( "toggler" );
+
+  ok( $pop.data.disabled.indexOf("toggler") > -1, "disable() plugin: toggler is disabled" );
+  plus();
+
+  // Test per-instance function call
+  $pop.enable( "toggler" );
+
+  ok( $pop.data.disabled.indexOf("toggler") === -1, "enable() plugin: toggler is enabled" );
+  plus();
+
+  // Test per-instance toggle off
+  $pop.toggle( "toggler" );
+
+  ok( $pop.data.disabled.indexOf("toggler") > -1, "toggle() plugin: toggler is disabled" );
+  plus();
+
+  stop( 10000 );
+});
+
+test("Frame Animation", function () {
+
+  QUnit.reset();
+
+  var popped = Popcorn("#video", { frameAnimation: true }),
+      expects = 4,
+      count = 0,
+      frameCount = 0,
+      started = false,
+      ended = false;
+
+  function plus() {
+    if ( ++count == expects ) {
+      Popcorn.removePlugin("frame");
+      start();
+    }
+  }
+
+  expect( expects );
+  stop( 5000 );
+
+  Popcorn.plugin("frame", {
+
+    start: function () {
+
+      started = true;
+      ok(!frameCount, "start runs before frame (@ " + popped.currentTime() + ")");
+      plus();
+
+    },
+    frame: function () {
+
+      if (!frameCount) {
+        ok(!ended, "frame runs before end (@ " + popped.currentTime() + ")");
+        plus();
+      }
+      
+      frameCount++;
+
+    },
+    end: function () {
+
+      ended = true;
+
+      //frame should run no more than 125 times in 2 seconds
+      ok(frameCount, "frame has run at least once (" + frameCount + " time" + (frameCount !== 1 ? "s" : "") + ")");
+      plus();
+
+      ok(started, "end runs after start (@ " + popped.currentTime() + ")");
+      plus();
+
+    }
+  });
+
+  popped.frame({
+    start: 1,
+    end: 3
+  });
+
+  popped.currentTime(0).play();
+});
+
+module("Popcorn XHR");
+test("Basic", function () {
+
+  expect(2);
+
+  equals( typeof Popcorn.xhr, "function" , "Popcorn.xhr is a provided static function");
+  equals( typeof Popcorn.xhr.httpData, "function" , "Popcorn.xhr.httpData is a provided static function");
+
+
+});
+
+test("Text Response", function () {
+
+  var expects = 2,
+      count = 0;
+
+  function plus() {
+    if ( ++count === expects ) {
+      start();
+    }
+  }
+
+  expect(expects);
+
+  stop()
+
+  Popcorn.xhr({
+    url: 'data/test.txt',
+    success: function( data ) {
+
+      ok(data, "xhr returns data");
+      plus();
+
+      equals( data.text, "This is a text test", "test.txt returns the string 'This is a text test'");
+      plus();
+
+    }
+  });
+});
+
+test("dataType: Text Response", function () {
+
+  var expects = 2,
+      count = 0;
+
+  function plus() {
+    if ( ++count === expects ) {
+      start();
+    }
+  }
+
+  expect(expects);
+
+  stop()
+
+  Popcorn.xhr({
+    url: 'data/test.txt',
+    dataType: "text",
+    success: function( data ) {
+
+      ok(data, "xhr returns data");
+      plus();
+
+      equals( data, "This is a text test", "dataType: 'text', test.txt returns the string 'This is a text test'");
+      plus();
+
+    }
+  });
+});
+
+
+test("JSON Response", function () {
+
+  var expects = 2,
+      count = 0;
+
+  function plus() {
+    if ( ++count === expects ) {
+      start();
+    }
+  }
+
+  expect(expects);
+
+  stop()
+
+
+  var testObj = { "data": {"lang": "en", "length": 25} };
+
+  Popcorn.xhr({
+    url: 'data/test.js',
+    success: function( data ) {
+
+      ok(data, "xhr returns data");
+      plus();
+
+
+      ok( QUnit.equiv(data.json, testObj) , "data.json returns an object of data");
+      plus();
+
+    }
+  });
+
+});
+
+test("dataType: JSON Response", function () {
+
+  var expects = 2,
+      count = 0;
+
+  function plus() {
+    if ( ++count === expects ) {
+      start();
+    }
+  }
+
+  expect(expects);
+
+  stop()
+
+
+  var testObj = { "data": {"lang": "en", "length": 25} };
+
+  Popcorn.xhr({
+    url: 'data/test.js',
+    dataType: "json",
+    success: function( data ) {
+
+      ok(data, "xhr returns data");
+      plus();
+
+
+      ok( QUnit.equiv(data, testObj) , "dataType: 'json',  data returns an object of data");
+      plus();
+
+    }
+  });
+
+});
+
+
+if ( !/file/.test( location.protocol ) ) {
+
+  test("JSONP Response", function () {
+
+    var expects = 8,
+        count = 0;
+
+    function plus() {
+      if ( ++count === expects ) {
+        start();
+      }
+    }
+
+    expect(expects);
+
+    stop(10000);
+
+
+    var testObj = { "data": {"lang": "en", "length": 25} };
+
+    Popcorn.xhr({
+
+      url: 'data/jsonp.php?callback=jsonp',
+      dataType: 'jsonp',
+      success: function( data ) {
+
+        ok(data, "getJSONP returns data");
+        plus();
+
+
+        ok( QUnit.equiv(data, testObj) , "Popcorn.xhr({}) data.json returns an object of data");
+        plus();
+
+      }
+    });
+
+    Popcorn.xhr.getJSONP(
+      'data/jsonp.php?callback=jsonp',
+
+      function( data ) {
+
+        ok(data, "getJSONP returns data");
+        plus();
+
+
+
+        ok( QUnit.equiv(data, testObj) , "Popcorn.xhr.getJSONP data.json returns an object of data");
+        plus();
+
+      }
+    );
+
+    Popcorn.xhr.getJSONP(
+      "http://api.flickr.com/services/feeds/photos_public.gne?id=35034346917@N01&lang=en-us&format=json&jsoncallback=flickr",
+
+      function( data ) {
+
+
+
+        ok(data, "getJSONP returns flickr data");
+        plus();
+
+        equal( typeof data, "object", "getJSONP returns flickr data");
+        plus();
+
+
+      }
+    );
+
+    Popcorn.getJSONP(
+      'data/jsonp.php?callback=jsonp',
+
+      function( data ) {
+
+        ok(data, "getJSONP returns data");
+        plus();
+
+
+
+        ok( QUnit.equiv(data, testObj) , "Popcorn.xhr.getJSONP data.json returns an object of data");
+        plus();
+
+      }
+    );
+  });
+
+} else {
+  test("JSONP Response", function () {
+
+    expect(1);
+
+
+    stop(10000);
+    ok(false, "jsonp requests require a webserver with php");
+    start();
+  });
+}
+
+test("Popcorn.getScript()", function () {
+
+  var expects = 8,
+      count = 0;
+
+  function plus() {
+    if ( ++count === expects ) {
+      start();
+    }
+  }
+
+  expect(expects);
+
+  stop();
+
+
+  Popcorn.xhr({
+
+    url: "data/remoteA.js",
+
+    dataType: "script",
+
+    success: function() {
+
+      ok( true, "getScript A returned");
+      plus();
+
+
+
+      ok( Popcorn.AlphaLib, "Popcorn.xhr.getScript remoteA.js loaded: `Popcorn.AlphaLib` is available");
+      plus();
+
+    }
+  });
+
+  Popcorn.getScript(
+
+    "data/remoteB.js",
+
+    function() {
+
+      ok( true, "getScript B returned");
+      plus();
+
+
+      ok( Popcorn.BetaLib , "Popcorn.getScript remoteB.js loaded: `Popcorn.BetaLib` is available ");
+      plus();
+
+    }
+  );
+
+
+  Popcorn.getScript(
+
+    "https://github.com/rwldrn/has.js/raw/master/has.js",
+
+    function() {
+
+      ok( true, "getScript C returned");
+      plus();
+
+
+      ok( ("has" in window) , "Popcorn.getScript https://github.com/rwldrn/has.js/raw/master/has.js loaded: `has` is available");
+      plus();
+
+
+      delete window["has"];
+    }
+  );
+
+
+
+  Popcorn.xhr({
+
+    url: "data/remoteA.js",
+
+    dataType: "script",
+
+    success: function( exists ) {
+
+      ok( exists, "Success, remoteA loaded once");
+      plus()
+    }
+  });
+
+  Popcorn.getScript(
+
+    "data/remoteB.js",
+
+    function( exists ) {
+
+      ok( exists, "Success, remoteB loaded once");
+      plus()
+
+    }
+  );
+
+
+});
+
+
+test("XML Response", function () {
+
+  var expects = 2,
+      count = 0;
+
+  function plus() {
+    if ( ++count === expects ) {
+      start();
+    }
+  }
+
+  expect(expects);
+
+  stop()
+
+
+  Popcorn.xhr({
+    url: 'data/test.xml',
+    success: function( data ) {
+
+      ok(data, "xhr returns data");
+      plus();
+
+      var parser = new DOMParser(),
+      xml = parser.parseFromString('<?xml version="1.0" encoding="UTF-8"?><dashboard><locations class="foo"><location for="bar"><infowindowtab> <tab title="Location"><![CDATA[blabla]]></tab> <tab title="Users"><![CDATA[blublu]]></tab> </infowindowtab> </location> </locations> </dashboard>',"text/xml");
+
+
+      equals( data.xml.toString(), xml.toString(), "data.xml returns a document of xml");
+      plus();
+
+    }
+  });
+
+});
+
+test("dataType: XML Response", function () {
+
+  var expects = 2,
+      count = 0;
+
+  function plus() {
+    if ( ++count === expects ) {
+      start();
+    }
+  }
+
+  expect(expects);
+
+  stop()
+
+
+  Popcorn.xhr({
+    url: 'data/test.xml',
+    dataType: "xml",
+    success: function( data ) {
+
+      ok(data, "xhr returns data");
+      plus();
+
+      var parser = new DOMParser(),
+      xml = parser.parseFromString('<?xml version="1.0" encoding="UTF-8"?><dashboard><locations class="foo"><location for="bar"><infowindowtab> <tab title="Location"><![CDATA[blabla]]></tab> <tab title="Users"><![CDATA[blublu]]></tab> </infowindowtab> </location> </locations> </dashboard>',"text/xml");
+
+
+      equals( data.toString(), xml.toString(), "dataType: 'xml', data.xml returns a document of xml");
+      plus();
+
+    }
+  });
+
+});
+
+
+
+module("Popcorn Parser");
+
+test("Parsing Functions", function () {
+
+  var expects = 3,
+      count = 0,
+      popperly = Popcorn("#video", { frameAnimation: true });
+
+  function plus() {
+    if ( ++count === expects ) {
+      start();
+    }
+  }
+
+  expect(expects);
+
+  stop( 10000 );
+
+  ok(typeof Popcorn.parser === "function", "Popcorn.parser is a function");
+  plus();
+
+  Popcorn.parser( "parseJSON" , "json", function( data ){
+    return data;
+  });
+
+  ok(typeof popperly.parseJSON === "function", "Popcorn.parser created a parseJSON function");
+  plus();
+
+  ok(typeof popperly.parseJSON().parseJSON("data/test.js").parseJSON === "function" , "parseJSON function is chainable");
+  plus();
+
+});
+
+test("Parsing Integrity", function () {
+
+  var expects = 6,
+      count = 0,
+      timeOut = 0,
+      poppercore = Popcorn( "#video", { frameAnimation: true } );
+
+  function plus() {
+    if ( ++count === expects ) {
+      start();
+      // clean up added events after tests
+      Popcorn.removePlugin( "parserTest" );
+    }
+  }
+
+  expect(expects);
+
+  stop( 10000 );
+
+  Popcorn.parser( "parseJSON2", function( data ){
+    ok( typeof data.json === "object", "data.json exists");
+    plus();
+    return data.json;
+  });
+
+  Popcorn.parser( "parseJSON3" , "json", function( data ){
+    ok( typeof data === "object", "data exists");
+    plus();
+    return data;
+  });
+
+  Popcorn.plugin("parserTest", {
+
+    start: function () {
+      ok(true, "parserTest started");
+      plus();
+    },
+    end: function () {
+      ok(true, "parserTest ended");
+      plus();
+    }
+  });
+
+  poppercore.parseJSON2("data/parserData.json", function() {
+
+    poppercore.parseJSON3("data/parserData.json", function() {
+      poppercore.currentTime(5).play();
+    });
+
+  });
+
+});
+
+
+test("Parsing Handler - References unavailable plugin", function () {
+
+  var expects = 1,
+      count = 0,
+      timeOut = 0,
+      interval,
+      poppercore = Popcorn( "#video", { frameAnimation: true } );
+
+  function plus() {
+    if ( ++count === expects ) {
+      start();
+      // clean up added events after tests
+      clearInterval( interval );
+      poppercore.removePlugin( "parserTest" );
+    }
+  }
+
+  expect(expects);
+
+  stop();
+
+  Popcorn.parser( "parseJson", function( data ){
+
+    return data.json;
+  });
+
+  poppercore.parseJson("data/parseMissing.json");
+
+  // interval used to wait for data to be parsed
+  interval = setInterval( function() {
+    poppercore.currentTime(5).play().currentTime(6);
+
+    ok( true, "Ignored call to missing plugin " );
+    plus();
+
+  }, 2000);
+
+});
+
+module("Audio");
+test( "Basic Audio Support", function () {
+
+  var popped = Popcorn( "#audio", { frameAnimation: true } ),
+      popObj = Popcorn( document.getElementById( "audio" ), { frameAnimation: true } ),
+      methods = "load play pause currentTime mute volume roundTime exec removePlugin",
+      count = 0,
+      expects = 30;
+
+  expect( expects );
+
+  function plus() {
+
+    if ( ++count === expects ) {
+
+      start();
+    }
+  }
+
+  stop( 10000 );
+
+  // testing element passed by id
+  ok( "audio" in popped, "instance by id has `media` property" );
+  plus();
+  equal( Object.prototype.toString.call( popped.media ), "[object HTMLAudioElement]", "instance by id media property is a HTMLAudioElement" );
+  plus();
+
+  ok( "data" in popped, "instance by id has `data` property" );
+  plus();
+  equal( Object.prototype.toString.call( popped.data ), "[object Object]", "instance by id data property is an object" );
+  plus();
+
+  ok( "trackEvents" in popped.data, "instance by id has `trackEvents` property" );
+  plus();
+  equal( Object.prototype.toString.call( popped.data.trackEvents ), "[object Object]", "instance by id trackEvents property is an object" );
+  plus();
+
+  popped.play();
+
+  methods.split( /\s+/g ).forEach(function ( k,v ) {
+
+    ok( k in popped, "instance by id has method: " + k );
+    plus();
+  });
+
+  // testing element passed by reference
+  ok( "media" in popObj, "instance by reference has `media` property" );
+  plus();
+  equal( Object.prototype.toString.call( popObj.media ), "[object HTMLAudioElement]", "instance by reference media property is a HTMLAudioElement" );
+  plus();
+
+  ok( "data" in popObj, "instance by reference has `data` property" );
+  plus();
+  equal( Object.prototype.toString.call( popObj.data ), "[object Object]", "instance by reference data property is an object" );
+  plus();
+
+  ok( "trackEvents" in popObj.data, "instance by reference has `trackEvents` property" );
+  plus();
+  equal( Object.prototype.toString.call( popObj.data.trackEvents ), "[object Object]", "instance by reference trackEvents property is an object" );
+  plus();
+
+  popObj.play();
+
+  methods.split( /\s+/g ).forEach(function ( k,v ) {
+
+    ok( k in popObj, "instance by reference has method: " + k );
+    plus();
+  });
+});
+
+test("Parser Support", function () {
+
+  var expects = 3,
+      count = 0,
+      timeOut = 0,
+      interval,
+      audiocorn = Popcorn( "#audio", { frameAnimation: true } );
+
+  function plus() {
+    if ( ++count === expects ) {
+      start();
+
+      Popcorn.removePlugin( "testAudioParser" );
+    }
+  }
+
+  expect(expects);
+  stop(5000);
+
+
+  Popcorn.plugin("testAudioParser", {
+
+    start: function() {
+      ok(true, "testAudioParser started: " + Math.round(this.currentTime()) );
+      plus();
+    },
+    end: function() {
+      ok(true, "testAudioParser ended: " + Math.round(this.currentTime()) );
+      plus();
+    }
+  });
+
+  Popcorn.parser( "parseAudio", function( data ){
+    ok( typeof data.json === "object", "data.json exists");
+    plus();
+    return data.json;
+  });
+
+  audiocorn.parseAudio("data/parserAudio.json", function() {
+
+    audiocorn.currentTime(4).play();
+
+  });
+});
+
+module("Popcorn Test Runner End");
+test("Last Check", function () {
+
+  //   ALWAYS RUN LAST
+  try {
+
+    equals( Setup.getGlobalSize(), Setup.globalSize + 1 , "Popcorn API did not leak");
+
+    if ( !Setup.globalDiff.length ) {
+      //console.log(Setup.globalDiff);
+    }
+
+  } catch (e) {};
+
+  //  Trigger follow-up tests to run in iframes
+  (function( $ ) {
+
+    $("iframe[data-src]").attr( "src", function() {
+      return $(this).data("src");
+    });
+
+  })( jQuery );
+
+});
+

From 0a1d5ab0657a49d64f6a44f580b4e5d73e41fe86 Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Tue, 6 Sep 2011 14:33:42 -0400
Subject: [PATCH 011/140] [#709] Revert pointless cache

---
 popcorn.js | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index 90f729efe..b4f070349 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -878,11 +878,6 @@
     var currentTime = obj.media.currentTime,
         previousTime = obj.data.trackEvents.previousUpdateTime,
         tracks = obj.data.trackEvents,
-        tracksBy = {
-          start: tracks.byStart,
-          end: tracks.byEnd
-        },
-
         end = tracks.endIndex,
         start = tracks.startIndex,
 
@@ -893,10 +888,10 @@
     //  Playbar advancing
     if ( previousTime < currentTime ) {
 
-      while ( tracksBy.end[ end ] && tracksBy.end[ end ].end <= currentTime ) {
+      while ( tracks.byEnd[ end ] && tracks.byEnd[ end ].end <= currentTime ) {
 
-				byEnd = tracksBy.end[ end ];
-				natives = byEnd._natives;
+        byEnd = tracks.byEnd[ end ];
+        natives = byEnd._natives;
         type = natives && natives.type;
 
         //  If plugin does not exist on this instance, remove it
@@ -917,9 +912,9 @@
         }
       }
 
-      while ( tracksBy.start[ start ] && tracksBy.start[ start ].start <= currentTime ) {
+      while ( tracks.byStart[ start ] && tracks.byStart[ start ].start <= currentTime ) {
 
-				byStart = tracksBy.start[ start ];
+        byStart = tracks.byStart[ start ];
         natives = byStart._natives;
         type = natives && natives.type;
 
@@ -946,9 +941,9 @@
     // Playbar receding
     } else if ( previousTime > currentTime ) {
 
-      while ( tracksBy.start[ start ] && tracksBy.start[ start ].start > currentTime ) {
+      while ( tracks.byStart[ start ] && tracks.byStart[ start ].start > currentTime ) {
 
-				byStart = tracksBy.start[ start ];
+        byStart = tracks.byStart[ start ];
         natives = byStart._natives;
         type = natives && natives.type;
 
@@ -969,9 +964,9 @@
         }
       }
 
-      while ( tracksBy.end[ end ] && tracksBy.end[ end ].end > currentTime ) {
+      while ( tracks.byEnd[ end ] && tracks.byEnd[ end ].end > currentTime ) {
 
-				byEnd = tracksBy.end[ end ];
+        byEnd = tracks.byEnd[ end ];
         natives = byEnd._natives;
         type = natives && natives.type;
 

From fee82a1d84205675cf4bf3ba43d6d09ce02dfca5 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Tue, 6 Sep 2011 14:47:19 -0400
Subject: [PATCH 012/140] Implemented a fix for if the previousTime ===
 currentTime in the timeUpdate function, also added in functionality to
 imediately call timeUpdate when a trackEvent is added

---
 popcorn.js           |  4 +++-
 test/popcorn.unit.js | 24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/popcorn.js b/popcorn.js
index 51659a728..9f6b0913d 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -755,6 +755,8 @@
         break;
       }
     }
+    
+    this.timeUpdate( obj, null );
 
     // Store references to user added trackevents in ref table
     if ( track._id ) {
@@ -882,7 +884,7 @@
         tracksByStart  = tracks.byStart;
 
     //  Playbar advancing
-    if ( previousTime < currentTime ) {
+    if ( previousTime <= currentTime ) {
 
       while ( tracksByEnd[ tracks.endIndex ] && tracksByEnd[ tracks.endIndex ].end <= currentTime ) {
         //  If plugin does not exist on this instance, remove it
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 605922ace..1fecb607a 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -2538,6 +2538,30 @@ test("getTrackEvent", function () {
 
 });
 
+test("timeUpdate functionality", function() {
+
+  var $pop = Popcorn( "#video" ),
+    count = 0,
+    expects = 5;
+
+  expect( expects );
+
+  function plus() {
+    if ( ++count === expects ) {
+      start();
+
+      Popcorn.removeInstance( $pop );
+    }
+  }
+
+  Popcorn.plugin("timeUpdateTester", function() {
+    return {
+      start: function(){},
+      end: function(){}
+    };
+  });
+});
+
 test("Index Integrity", function () {
 
 

From a3b2bf600027bb2bb45d1a82b89fd5441c39d360 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Tue, 6 Sep 2011 14:50:29 -0400
Subject: [PATCH 013/140] added webm source to all plugin and parser (and some
 other) unit test html files

---
 effects/applyclass/popcorn.applyclass.html            | 4 ++++
 parsers/parserJSON/popcorn.parserJSON.unit.html       | 4 ++++
 parsers/parserSBV/popcorn.parserSBV.unit.html         | 4 ++++
 parsers/parserSRT/popcorn.parserSRT.unit.html         | 4 ++++
 parsers/parserSSA/popcorn.parserSSA.unit.html         | 4 ++++
 parsers/parserTTML/popcorn.parserTTML.unit.html       | 4 ++++
 parsers/parserTTXT/popcorn.parserTTXT.unit.html       | 4 ++++
 parsers/parserVTT/popcorn.parserVTT.unit.html         | 4 ++++
 parsers/parserXML/popcorn.parserXML.unit.html         | 4 ++++
 players/baseplayer/popcorn.baseplayer.unit.html       | 4 ++++
 plugins/attribution/popcorn.attribution.unit.html     | 6 +++++-
 plugins/code/popcorn.code.unit.html                   | 4 ++++
 plugins/facebook/popcorn.facebook.unit.html           | 4 ++++
 plugins/flickr/popcorn.flickr.unit.html               | 4 ++++
 plugins/footnote/popcorn.footnote.unit.html           | 4 ++++
 plugins/gml/popcorn.gml.unit.html                     | 4 ++++
 plugins/googlefeed/popcorn.googlefeed.unit.html       | 4 ++++
 plugins/googlemap/popcorn.googlemap.unit.html         | 4 ++++
 plugins/image/popcorn.image.unit.html                 | 4 ++++
 plugins/lastfm/popcorn.lastfm.unit.html               | 4 ++++
 plugins/linkedin/popcorn.linkedin.unit.html           | 4 ++++
 plugins/lowerthird/popcorn.lowerthird.unit.html       | 4 ++++
 plugins/mustache/popcorn.mustache.unit.html           | 4 ++++
 plugins/openmap/popcorn.openmap.unit.html             | 4 ++++
 plugins/pause/popcorn.pause.unit.html                 | 4 ++++
 plugins/processing/popcorn.processing.unit.html       | 4 ++++
 plugins/subtitle/popcorn.subtitle.unit.html           | 4 ++++
 plugins/tagthisperson/popcorn.tagthisperson.unit.html | 4 ++++
 plugins/timeline/popcorn.timeline.unit.html           | 4 ++++
 plugins/twitter/popcorn.twitter.unit.html             | 4 ++++
 plugins/webpage/popcorn.webpage.unit.html             | 4 ++++
 plugins/wikipedia/popcorn.wikipedia.unit.html         | 4 ++++
 plugins/wordriver/popcorn.wordriver.unit.html         | 4 ++++
 test/index.html                                       | 4 ++++
 34 files changed, 137 insertions(+), 1 deletion(-)

diff --git a/effects/applyclass/popcorn.applyclass.html b/effects/applyclass/popcorn.applyclass.html
index 461ffdade..5ef71d2e8 100644
--- a/effects/applyclass/popcorn.applyclass.html
+++ b/effects/applyclass/popcorn.applyclass.html
@@ -49,6 +49,10 @@ <h1 id="qunit-header">Popcorn flash effect Demo</h1>
       <source id='ogv'
         src="../../test/trailer.ogv"
         type='video/ogg; codecs="theora, vorbis"'> 
+        
+      <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
       <p>Your user agent does not support the HTML5 Video element.</p> 
 
diff --git a/parsers/parserJSON/popcorn.parserJSON.unit.html b/parsers/parserJSON/popcorn.parserJSON.unit.html
index 548078a6f..10caa5e61 100644
--- a/parsers/parserJSON/popcorn.parserJSON.unit.html
+++ b/parsers/parserJSON/popcorn.parserJSON.unit.html
@@ -37,6 +37,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'> 
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p> 
 
diff --git a/parsers/parserSBV/popcorn.parserSBV.unit.html b/parsers/parserSBV/popcorn.parserSBV.unit.html
index 33bf622aa..b53d5ec31 100644
--- a/parsers/parserSBV/popcorn.parserSBV.unit.html
+++ b/parsers/parserSBV/popcorn.parserSBV.unit.html
@@ -35,6 +35,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'> 
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p> 
 
diff --git a/parsers/parserSRT/popcorn.parserSRT.unit.html b/parsers/parserSRT/popcorn.parserSRT.unit.html
index 3f75cec38..140cf450d 100644
--- a/parsers/parserSRT/popcorn.parserSRT.unit.html
+++ b/parsers/parserSRT/popcorn.parserSRT.unit.html
@@ -35,6 +35,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'>
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p>
 
diff --git a/parsers/parserSSA/popcorn.parserSSA.unit.html b/parsers/parserSSA/popcorn.parserSSA.unit.html
index c9e4c92c7..bb5511661 100644
--- a/parsers/parserSSA/popcorn.parserSSA.unit.html
+++ b/parsers/parserSSA/popcorn.parserSSA.unit.html
@@ -35,6 +35,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'> 
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p> 
   </video>
diff --git a/parsers/parserTTML/popcorn.parserTTML.unit.html b/parsers/parserTTML/popcorn.parserTTML.unit.html
index eb8c2cca4..1c7232147 100644
--- a/parsers/parserTTML/popcorn.parserTTML.unit.html
+++ b/parsers/parserTTML/popcorn.parserTTML.unit.html
@@ -35,6 +35,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'> 
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p> 
   </video>
diff --git a/parsers/parserTTXT/popcorn.parserTTXT.unit.html b/parsers/parserTTXT/popcorn.parserTTXT.unit.html
index e867e4a86..26dda37a8 100644
--- a/parsers/parserTTXT/popcorn.parserTTXT.unit.html
+++ b/parsers/parserTTXT/popcorn.parserTTXT.unit.html
@@ -35,6 +35,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'> 
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p> 
 
diff --git a/parsers/parserVTT/popcorn.parserVTT.unit.html b/parsers/parserVTT/popcorn.parserVTT.unit.html
index 3a23e37a4..945e97193 100644
--- a/parsers/parserVTT/popcorn.parserVTT.unit.html
+++ b/parsers/parserVTT/popcorn.parserVTT.unit.html
@@ -35,6 +35,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'>
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p>
 
diff --git a/parsers/parserXML/popcorn.parserXML.unit.html b/parsers/parserXML/popcorn.parserXML.unit.html
index bb71126f9..906b73b67 100644
--- a/parsers/parserXML/popcorn.parserXML.unit.html
+++ b/parsers/parserXML/popcorn.parserXML.unit.html
@@ -34,6 +34,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'> 
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p> 
 
diff --git a/players/baseplayer/popcorn.baseplayer.unit.html b/players/baseplayer/popcorn.baseplayer.unit.html
index d2161dcb7..a369ac0ed 100644
--- a/players/baseplayer/popcorn.baseplayer.unit.html
+++ b/players/baseplayer/popcorn.baseplayer.unit.html
@@ -65,6 +65,10 @@ <h2 id="qunit-userAgent"></h2>
       <source id='ogv'
         src="../../test/trailer.ogv"
         type='video/ogg; codecs="theora, vorbis"'>
+      
+      <source id='webm'
+        src="../../test/trailer.webm"
+        type='video/webm; codecs="vp8, vorbis"'>
 
       <p>Your user agent does not support the HTML5 Video element.</p>
 
diff --git a/plugins/attribution/popcorn.attribution.unit.html b/plugins/attribution/popcorn.attribution.unit.html
index 02b6f0320..0f6879dcc 100755
--- a/plugins/attribution/popcorn.attribution.unit.html
+++ b/plugins/attribution/popcorn.attribution.unit.html
@@ -33,7 +33,11 @@ <h2 id="qunit-userAgent"></h2>
 
     <source id='ogv'
       src="../../test/trailer.ogv"
-      type='video/ogg; codecs="theora, vorbis"'> 
+      type='video/ogg; codecs="theora, vorbis"'>
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p> 
 
diff --git a/plugins/code/popcorn.code.unit.html b/plugins/code/popcorn.code.unit.html
index d67e8dc24..0501e571a 100755
--- a/plugins/code/popcorn.code.unit.html
+++ b/plugins/code/popcorn.code.unit.html
@@ -38,6 +38,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'>
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p>
 
diff --git a/plugins/facebook/popcorn.facebook.unit.html b/plugins/facebook/popcorn.facebook.unit.html
index 73bd17b74..1176f9025 100755
--- a/plugins/facebook/popcorn.facebook.unit.html
+++ b/plugins/facebook/popcorn.facebook.unit.html
@@ -38,6 +38,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'> 
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p> 
   </video> 
diff --git a/plugins/flickr/popcorn.flickr.unit.html b/plugins/flickr/popcorn.flickr.unit.html
index 356b11d2b..219e19ae0 100755
--- a/plugins/flickr/popcorn.flickr.unit.html
+++ b/plugins/flickr/popcorn.flickr.unit.html
@@ -36,6 +36,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'> 
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p> 
 
diff --git a/plugins/footnote/popcorn.footnote.unit.html b/plugins/footnote/popcorn.footnote.unit.html
index ba39a85ff..cf15b499c 100755
--- a/plugins/footnote/popcorn.footnote.unit.html
+++ b/plugins/footnote/popcorn.footnote.unit.html
@@ -34,6 +34,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'>
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p>
 
diff --git a/plugins/gml/popcorn.gml.unit.html b/plugins/gml/popcorn.gml.unit.html
index c0761c53d..045816996 100755
--- a/plugins/gml/popcorn.gml.unit.html
+++ b/plugins/gml/popcorn.gml.unit.html
@@ -34,6 +34,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'> 
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p> 
 
diff --git a/plugins/googlefeed/popcorn.googlefeed.unit.html b/plugins/googlefeed/popcorn.googlefeed.unit.html
index 9bfc36b2e..14f8a7f81 100755
--- a/plugins/googlefeed/popcorn.googlefeed.unit.html
+++ b/plugins/googlefeed/popcorn.googlefeed.unit.html
@@ -33,6 +33,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'> 
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p> 
 
diff --git a/plugins/googlemap/popcorn.googlemap.unit.html b/plugins/googlemap/popcorn.googlemap.unit.html
index e37ab4f66..71e3a85c0 100755
--- a/plugins/googlemap/popcorn.googlemap.unit.html
+++ b/plugins/googlemap/popcorn.googlemap.unit.html
@@ -34,6 +34,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'> 
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p> 
 
diff --git a/plugins/image/popcorn.image.unit.html b/plugins/image/popcorn.image.unit.html
index d78a7d4ca..6b660a306 100755
--- a/plugins/image/popcorn.image.unit.html
+++ b/plugins/image/popcorn.image.unit.html
@@ -34,6 +34,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id="ogv"
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'> 
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p> 
 
diff --git a/plugins/lastfm/popcorn.lastfm.unit.html b/plugins/lastfm/popcorn.lastfm.unit.html
index f7bf0f0c6..7a98c9141 100755
--- a/plugins/lastfm/popcorn.lastfm.unit.html
+++ b/plugins/lastfm/popcorn.lastfm.unit.html
@@ -36,6 +36,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'> 
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p> 
 
diff --git a/plugins/linkedin/popcorn.linkedin.unit.html b/plugins/linkedin/popcorn.linkedin.unit.html
index f9caeb26d..53b2ca303 100755
--- a/plugins/linkedin/popcorn.linkedin.unit.html
+++ b/plugins/linkedin/popcorn.linkedin.unit.html
@@ -33,6 +33,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'> 
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p> 
 
diff --git a/plugins/lowerthird/popcorn.lowerthird.unit.html b/plugins/lowerthird/popcorn.lowerthird.unit.html
index c409b2b36..dbb8ae108 100755
--- a/plugins/lowerthird/popcorn.lowerthird.unit.html
+++ b/plugins/lowerthird/popcorn.lowerthird.unit.html
@@ -34,6 +34,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'> 
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p> 
 
diff --git a/plugins/mustache/popcorn.mustache.unit.html b/plugins/mustache/popcorn.mustache.unit.html
index 18a329f99..0d9e20d12 100755
--- a/plugins/mustache/popcorn.mustache.unit.html
+++ b/plugins/mustache/popcorn.mustache.unit.html
@@ -37,6 +37,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'>
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p>
 
diff --git a/plugins/openmap/popcorn.openmap.unit.html b/plugins/openmap/popcorn.openmap.unit.html
index aa9dc9a83..802df2e18 100755
--- a/plugins/openmap/popcorn.openmap.unit.html
+++ b/plugins/openmap/popcorn.openmap.unit.html
@@ -34,6 +34,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg;' codecs="theora, vorbis"'> 
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p> 
 
diff --git a/plugins/pause/popcorn.pause.unit.html b/plugins/pause/popcorn.pause.unit.html
index 6362277cd..d4423f773 100755
--- a/plugins/pause/popcorn.pause.unit.html
+++ b/plugins/pause/popcorn.pause.unit.html
@@ -37,6 +37,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"' />
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p>
   </video>
diff --git a/plugins/processing/popcorn.processing.unit.html b/plugins/processing/popcorn.processing.unit.html
index 6dd7ad75e..536eaede0 100644
--- a/plugins/processing/popcorn.processing.unit.html
+++ b/plugins/processing/popcorn.processing.unit.html
@@ -29,6 +29,10 @@ <h2 id="qunit-userAgent"></h2>
       <source id='ogv'
         src="../../test/trailer.ogv"
         type='video/ogg; codecs="theora, vorbis"'>
+        
+      <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
       <p>Your user agent does not support the HTML5 Video element.</p>
 
diff --git a/plugins/subtitle/popcorn.subtitle.unit.html b/plugins/subtitle/popcorn.subtitle.unit.html
index ff84ce35c..069fb2bc2 100755
--- a/plugins/subtitle/popcorn.subtitle.unit.html
+++ b/plugins/subtitle/popcorn.subtitle.unit.html
@@ -34,6 +34,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'> 
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p> 
 
diff --git a/plugins/tagthisperson/popcorn.tagthisperson.unit.html b/plugins/tagthisperson/popcorn.tagthisperson.unit.html
index f5c181245..397eae81f 100755
--- a/plugins/tagthisperson/popcorn.tagthisperson.unit.html
+++ b/plugins/tagthisperson/popcorn.tagthisperson.unit.html
@@ -34,6 +34,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'> 
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p> 
 
diff --git a/plugins/timeline/popcorn.timeline.unit.html b/plugins/timeline/popcorn.timeline.unit.html
index 488bf66b4..b2aafa1de 100644
--- a/plugins/timeline/popcorn.timeline.unit.html
+++ b/plugins/timeline/popcorn.timeline.unit.html
@@ -35,6 +35,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'> 
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p> 
 
diff --git a/plugins/twitter/popcorn.twitter.unit.html b/plugins/twitter/popcorn.twitter.unit.html
index e03f454ce..ebc749c52 100755
--- a/plugins/twitter/popcorn.twitter.unit.html
+++ b/plugins/twitter/popcorn.twitter.unit.html
@@ -36,6 +36,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'> 
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p> 
 
diff --git a/plugins/webpage/popcorn.webpage.unit.html b/plugins/webpage/popcorn.webpage.unit.html
index 238ff9d67..e6ba0a842 100755
--- a/plugins/webpage/popcorn.webpage.unit.html
+++ b/plugins/webpage/popcorn.webpage.unit.html
@@ -34,6 +34,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'> 
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p> 
 
diff --git a/plugins/wikipedia/popcorn.wikipedia.unit.html b/plugins/wikipedia/popcorn.wikipedia.unit.html
index 43cdc4b0d..299b2348e 100755
--- a/plugins/wikipedia/popcorn.wikipedia.unit.html
+++ b/plugins/wikipedia/popcorn.wikipedia.unit.html
@@ -34,6 +34,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'> 
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p> 
 
diff --git a/plugins/wordriver/popcorn.wordriver.unit.html b/plugins/wordriver/popcorn.wordriver.unit.html
index 532f3defa..e78e83d9b 100755
--- a/plugins/wordriver/popcorn.wordriver.unit.html
+++ b/plugins/wordriver/popcorn.wordriver.unit.html
@@ -34,6 +34,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'> 
+      
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p> 
 
diff --git a/test/index.html b/test/index.html
index b29fafa1a..ebd25a6d5 100644
--- a/test/index.html
+++ b/test/index.html
@@ -49,6 +49,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id='ogv'
       src="trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'>
+      
+    <source id='webm'
+      src="trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p>
 

From e24e1b6059add7b746b8e1c570759e456f0353f4 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Tue, 6 Sep 2011 14:53:11 -0400
Subject: [PATCH 014/140] fix spacing issues for webm source in applyclass.html

---
 effects/applyclass/popcorn.applyclass.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/effects/applyclass/popcorn.applyclass.html b/effects/applyclass/popcorn.applyclass.html
index 5ef71d2e8..d4e24e3a9 100644
--- a/effects/applyclass/popcorn.applyclass.html
+++ b/effects/applyclass/popcorn.applyclass.html
@@ -51,8 +51,8 @@ <h1 id="qunit-header">Popcorn flash effect Demo</h1>
         type='video/ogg; codecs="theora, vorbis"'> 
         
       <source id='webm'
-      src="../../test/trailer.webm"
-      type='video/webm; codecs="vp8, vorbis"'>
+        src="../../test/trailer.webm"
+        type='video/webm; codecs="vp8, vorbis"'>
 
       <p>Your user agent does not support the HTML5 Video element.</p> 
 

From 4081c0886238885f1711903db01a7a6896eff93f Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Tue, 6 Sep 2011 15:00:20 -0400
Subject: [PATCH 015/140] [#709] Removes empty block

---
 popcorn.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index b4f070349..55a820e24 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -989,9 +989,6 @@
           return;
         }
       }
-    // time bar is not moving ( video is paused )
-    } else if ( previousTime === currentTime ) {
-
     }
 
     tracks.endIndex = end;

From 70f405a1effedd351a6cb9caf4436a6e8e64f609 Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Tue, 6 Sep 2011 16:20:20 -0400
Subject: [PATCH 016/140] [#700] Remove unnec. comments

---
 test/popcorn.unit.setup.js | 50 +++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 30 deletions(-)

diff --git a/test/popcorn.unit.setup.js b/test/popcorn.unit.setup.js
index 4f2394846..268c61f9d 100644
--- a/test/popcorn.unit.setup.js
+++ b/test/popcorn.unit.setup.js
@@ -1,26 +1,16 @@
-//  suppress console log errors
-if ( !window['console'] ) {
-//  var console = {}, 
-//      methods = 'log debug info warn error exception assert dir dirxml trace group groupEnd groupCollapsed time timeEnd profile profileEnd count clear notifyFirebug getFirebugElement firebug element'.split(' ');
-//  
-//  for ( var m in methods ) {
-//    console[ methods[m] ] = function () {
-//      //Array.prototype.slice.call(arguments)
-//    };
-//  }
-
+if ( !window["console"] ) {
   jQuery.getScript("https://getfirebug.com/firebug-lite-debug.js");
 }
 
 
-(function (global) { 
-  
+(function (global) {
+
   //  Store the number of global properties that exist prior to Popcorn API definition
-  
+
   var Setup = {
-    hasRun: false, 
-    globalSize: 0, 
-    globalCache: [], 
+    hasRun: false,
+    globalSize: 0,
+    globalCache: [],
     globalDiff: []
   };
 
@@ -31,7 +21,7 @@ if ( !window['console'] ) {
     for( var p in window ) {
       if ( p !== "_firebug" ) {
         size++;
-        
+
         if ( !Setup.hasRun ) {
           Setup.globalCache.push( p );
         } else {
@@ -44,29 +34,29 @@ if ( !window['console'] ) {
 
     //  account for self
     size++;
-    
+
     //  Store the number of global properties internally
     if ( !Setup.globalSize ) {
       Setup.globalSize = size;
     }
-    
+
     if ( !Setup.hasRun ) {
       Setup.hasRun = true;
     }
-    
+
     return size;
   };
-  
-  
-  
-  Setup.eventset  = "loadstart progress suspend emptied stalled play pause " + 
-                          "loadedmetadata loadeddata waiting playing canplay canplaythrough " + 
+
+
+
+  Setup.eventset  = "loadstart progress suspend emptied stalled play pause " +
+                          "loadedmetadata loadeddata waiting playing canplay canplaythrough " +
                           "seeking seeked timeupdate ended ratechange durationchange volumechange";
-  
-  Setup.events = Setup.eventset.split(/\s+/g);                              
 
-  
-  
+  Setup.events = Setup.eventset.split(/\s+/g);
+
+
+
   global.Setup = Setup;
 
 })(window);

From 8382f1fe4285abb4d3081cfedcfc9a4c25334929 Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Tue, 6 Sep 2011 16:21:57 -0400
Subject: [PATCH 017/140] [#700] Fixes whitespace

---
 popcorn.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index 2b5ad2230..0c13d23b8 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -4,13 +4,13 @@
   if ( !document.addEventListener ) {
     global.Popcorn = {};
 
-    var methods = ( "removeInstance addInstance getInstanceById removeInstanceById " + 
-          "forEach extend effects error guid sizeOf isArray nop position disable enable " + 
-          "addTrackEvent removeTrackEvent getTrackEvents getTrackEvent getLastTrackEventId " + 
+    var methods = ( "removeInstance addInstance getInstanceById removeInstanceById " +
+          "forEach extend effects error guid sizeOf isArray nop position disable enable " +
+          "addTrackEvent removeTrackEvent getTrackEvents getTrackEvent getLastTrackEventId " +
           "timeUpdate plugin removePlugin compose effect parser xhr getJSONP getScript" ).split(/\s+/);
 
     while( methods.length ) {
-      global.Popcorn[ methods.shift() ] = function(){};
+      global.Popcorn[ methods.shift() ] = function() {};
     }
     return;
   }
@@ -1012,7 +1012,7 @@
 
     timeUpdate: function( event ) {
       Popcorn.timeUpdate.call( null, this, event );
-      return this; 
+      return this;
     }
   });
 

From f8838ffe6659695aaf15dab00d7a50fc9e023804 Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Tue, 6 Sep 2011 16:26:48 -0400
Subject: [PATCH 018/140] [#700] Removes unnec. whitespace

---
 test/popcorn.unit.setup.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/popcorn.unit.setup.js b/test/popcorn.unit.setup.js
index 268c61f9d..32de33db4 100644
--- a/test/popcorn.unit.setup.js
+++ b/test/popcorn.unit.setup.js
@@ -47,16 +47,12 @@ if ( !window["console"] ) {
     return size;
   };
 
-
-
   Setup.eventset  = "loadstart progress suspend emptied stalled play pause " +
                           "loadedmetadata loadeddata waiting playing canplay canplaythrough " +
                           "seeking seeked timeupdate ended ratechange durationchange volumechange";
 
   Setup.events = Setup.eventset.split(/\s+/g);
 
-
-
   global.Setup = Setup;
 
 })(window);

From 1255ae559b0bdf74ecfb8e823b303fb4fe9c9752 Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Tue, 6 Sep 2011 16:29:01 -0400
Subject: [PATCH 019/140] [#700] Style updates

---
 test/popcorn.unit.setup.js | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/test/popcorn.unit.setup.js b/test/popcorn.unit.setup.js
index 32de33db4..e69f3db60 100644
--- a/test/popcorn.unit.setup.js
+++ b/test/popcorn.unit.setup.js
@@ -1,12 +1,10 @@
-if ( !window["console"] ) {
-  jQuery.getScript("https://getfirebug.com/firebug-lite-debug.js");
+if ( !window[ "console" ] ) {
+  jQuery.getScript( "https://getfirebug.com/firebug-lite-debug.js" );
 }
 
-
-(function (global) {
+(function( global ) {
 
   //  Store the number of global properties that exist prior to Popcorn API definition
-
   var Setup = {
     hasRun: false,
     globalSize: 0,
@@ -16,17 +14,17 @@ if ( !window["console"] ) {
 
   Setup.getGlobalSize = function() {
 
-    var size = 0;
+    var size = 0, prop;
 
-    for( var p in window ) {
-      if ( p !== "_firebug" ) {
+    for ( prop in window ) {
+      if ( prop !== "_firebug" ) {
         size++;
 
         if ( !Setup.hasRun ) {
-          Setup.globalCache.push( p );
+          Setup.globalCache.push( prop );
         } else {
-          if ( Setup.globalCache.indexOf( p ) === -1 ) {
-            Setup.globalDiff.push( p );
+          if ( Setup.globalCache.indexOf( prop ) === -1 ) {
+            Setup.globalDiff.push( prop );
           }
         }
       }
@@ -47,16 +45,14 @@ if ( !window["console"] ) {
     return size;
   };
 
-  Setup.eventset  = "loadstart progress suspend emptied stalled play pause " +
-                          "loadedmetadata loadeddata waiting playing canplay canplaythrough " +
-                          "seeking seeked timeupdate ended ratechange durationchange volumechange";
+  Setup.eventset = "loadstart progress suspend emptied stalled play pause " +
+                   "loadedmetadata loadeddata waiting playing canplay canplaythrough " +
+                   "seeking seeked timeupdate ended ratechange durationchange volumechange";
 
   Setup.events = Setup.eventset.split(/\s+/g);
 
   global.Setup = Setup;
 
-})(window);
-
-
-Setup.getGlobalSize();
+})( window );
 
+Setup.getGlobalSize();
\ No newline at end of file

From 8d76b7f54984c0eed048f4514992d28f41781b8a Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Tue, 6 Sep 2011 16:38:18 -0400
Subject: [PATCH 020/140] Cheat jslint

---
 build/jslint-check.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build/jslint-check.js b/build/jslint-check.js
index 4d11dfca7..335efc78a 100644
--- a/build/jslint-check.js
+++ b/build/jslint-check.js
@@ -9,7 +9,8 @@ var ok = {
   "Use '!==' to compare with 'null'.": true,
   "Expected an assignment or function call and instead saw an expression.": true,
   "Expected a 'break' statement before 'case'.": true,
-  "'e' is already defined.": true
+  "'e' is already defined.": true,
+  "Don't make functions within a loop.": true
 };
 
 function check(src)
@@ -26,7 +27,7 @@ function check(src)
       print( "    Problem at line " + w.line + " character " + w.character + ": " + w.reason );
     }
   }
-  
+
   if ( found > 0 ) {
     print( "\n" + found + " Error(s) found." );
   } else {

From d19ef624262696c1c6c4eaafe8f4999a13db43f7 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Wed, 7 Sep 2011 11:04:40 -0400
Subject: [PATCH 021/140] Added === check for timeUpdate as well as added in
 code to addTrackEvent that calls timeUpdate right after the trackEvent is
 added

---
 popcorn.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/popcorn.js b/popcorn.js
index 9f6b0913d..2021603f4 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -756,7 +756,7 @@
       }
     }
     
-    this.timeUpdate( obj, null );
+    //this.timeUpdate( obj, null );
 
     // Store references to user added trackevents in ref table
     if ( track._id ) {

From 557127c0d42a6161abde708dfff8825d4ae76ce7 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Wed, 7 Sep 2011 11:35:19 -0400
Subject: [PATCH 022/140] More work on unit tests and such

---
 popcorn.js           | 2 +-
 test/popcorn.unit.js | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index 2021603f4..9f6b0913d 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -756,7 +756,7 @@
       }
     }
     
-    //this.timeUpdate( obj, null );
+    this.timeUpdate( obj, null );
 
     // Store references to user added trackevents in ref table
     if ( track._id ) {
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 1fecb607a..e618179ca 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -2597,8 +2597,8 @@ test("Index Integrity", function () {
 
   stop( 10000 );
 
-  equals(p.data.trackEvents.endIndex, 0, "p.data.trackEvents.endIndex is 0");
-  equals(p.data.trackEvents.startIndex, 0, "p.data.trackEvents.startIndex is 0");
+  equals(p.data.trackEvents.endIndex, 1, "p.data.trackEvents.endIndex is 1");
+  equals(p.data.trackEvents.startIndex, 1, "p.data.trackEvents.startIndex is 1");
   equals(p.data.trackEvents.byStart.length, 3, "p.data.trackEvents.byStart.length is 3 - before play" );
 
 
@@ -2658,6 +2658,8 @@ test("Popcorn.disable/enable/toggle", function() {
 
   expect( expects );
 
+  $pop.currentTime(39).play();
+
   function plus() {
     if ( ++count === expects ) {
       start();

From dd46e2019d2f5b86eba7919246b19aad419ac5a6 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Wed, 7 Sep 2011 12:58:27 -0400
Subject: [PATCH 023/140] Added tests for timeUpdate function and fixed other
 unit tests because of timing issues when trackEvents are added and timeUpdate
 is fired now

---
 popcorn.js           |  2 +-
 test/popcorn.unit.js | 67 ++++++++++++++++++++++++++++----------------
 2 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index 9f6b0913d..87aeeb321 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -410,7 +410,7 @@
 
       //  Creating a one second track event with an empty end
       Popcorn.addTrackEvent( this, {
-        start: time,
+        start: time + 0.25,
         end: time + 1,
         _running: false,
         _natives: {
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index e618179ca..a6ca94874 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -2538,30 +2538,6 @@ test("getTrackEvent", function () {
 
 });
 
-test("timeUpdate functionality", function() {
-
-  var $pop = Popcorn( "#video" ),
-    count = 0,
-    expects = 5;
-
-  expect( expects );
-
-  function plus() {
-    if ( ++count === expects ) {
-      start();
-
-      Popcorn.removeInstance( $pop );
-    }
-  }
-
-  Popcorn.plugin("timeUpdateTester", function() {
-    return {
-      start: function(){},
-      end: function(){}
-    };
-  });
-});
-
 test("Index Integrity", function () {
 
 
@@ -2649,6 +2625,49 @@ test("Index Integrity", function () {
 
 });
 
+test("timeUpdate functionality", function() {
+
+  var $pop = Popcorn( "#video" ),
+    count = 0,
+    expects = 4;
+
+  expect( expects );
+
+  Popcorn.plugin("timeUpdateTester", function() {
+    return {
+      start: function () {
+        var div = document.createElement("div");
+        div.id = "timeUpdate-test";
+
+        document.body.appendChild(div);
+      },
+      end: function () {
+        document.getElementById("timeUpdate-test").parentNode.removeChild(document.getElementById("timeUpdate-test"));
+      }
+    };
+  });
+
+  equals( typeof Popcorn.timeUpdate, "function", "timeUpdate is a function of Popcorn" );
+
+  $pop.currentTime(40).pause();
+
+  equals( $pop.getTrackEvents().length, 0, "Initially no trackEvents" );
+  
+  $pop.timeUpdateTester({
+    id:"timeUpdateID",
+    start:40,
+    end: 41
+  });
+
+  equals( $pop.getTrackEvents().length, 1, "trackEvent successfully added" );
+
+  ok( document.getElementById( "timeUpdate-test" ), "trackEvent successfully added, content was displayed while video was paused" );
+
+  $pop.removeTrackEvent( "timeUpdateID" );
+  Popcorn.removeInstance( $pop );
+
+});
+
 test("Popcorn.disable/enable/toggle", function() {
 
 

From 99fa0390028f728a62209c44d9022e2543d77f39 Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Wed, 7 Sep 2011 13:36:45 -0400
Subject: [PATCH 024/140] [#494] Adds initial set of tests for frameAnimation
 option

---
 popcorn.js           |  38 ++---
 test/popcorn.unit.js | 366 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 382 insertions(+), 22 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index 664acc327..e70d8db57 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -28,14 +28,15 @@
     }
   },
 
+  //  Non-public `requestAnimFrame`
+  //  http://paulirish.com/2011/requestanimationframe-for-smart-animating/
   requestAnimFrame = (function(){
-    // shim from http://paulirish.com/2011/requestanimationframe-for-smart-animating/
-    return global.requestAnimationFrame       || 
-      global.webkitRequestAnimationFrame || 
-      global.mozRequestAnimationFrame    || 
-      global.oRequestAnimationFrame      || 
-      global.msRequestAnimationFrame     || 
-      function( callback, element){
+    return global.requestAnimationFrame ||
+      global.webkitRequestAnimationFrame ||
+      global.mozRequestAnimationFrame ||
+      global.oRequestAnimationFrame ||
+      global.msRequestAnimationFrame ||
+      function( callback, element ) {
         global.setTimeout( callback, 16 );
       };
   }()),
@@ -212,13 +213,15 @@
       //  Wrap true ready check
       var isReady = function( that ) {
 
+        var duration, videoDurationPlus, animate;
+
         if ( that.media.readyState >= 2 ) {
           //  Adding padding to the front and end of the arrays
           //  this is so we do not fall off either end
 
-          var duration = that.media.duration,
-              //  Check for no duration info (NaN)
-              videoDurationPlus = duration != duration ? Number.MAX_VALUE : duration + 1;
+          duration = that.media.duration;
+          //  Check for no duration info (NaN)
+          videoDurationPlus = duration != duration ? Number.MAX_VALUE : duration + 1;
 
           Popcorn.addTrackEvent( that, {
             start: videoDurationPlus,
@@ -226,13 +229,14 @@
           });
 
           if ( that.options.frameAnimation ) {
-            // if Popcorn is created with frameAnimation option set to true,
-            // requestAnimFrame is used instead of "timeupdate" media event.
-            // This is for greater frame time accuracy, theoretically up to
-            // 60 frames per second as opposed to 4
+            //  if Popcorn is created with frameAnimation option set to true,
+            //  requestAnimFrame is used instead of "timeupdate" media event.
+            //  This is for greater frame time accuracy, theoretically up to
+            //  60 frames per second as opposed to ~4 ( ~every 15-250ms)
+            animate = function () {
 
-            var animate = function () {
               Popcorn.timeUpdate( that, event );
+
               that.trigger( "timeupdate" );
 
               requestAnimFrame( animate );
@@ -246,9 +250,7 @@
 
               Popcorn.timeUpdate( that, event );
             }, false );
-
           }
-
         } else {
           global.setTimeout(function() {
             isReady( that );
@@ -1088,7 +1090,7 @@
 
     timeUpdate: function( event ) {
       Popcorn.timeUpdate.call( null, this, event );
-      return this; 
+      return this;
     }
   });
 
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 605922ace..38f3b56d1 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -1479,7 +1479,7 @@ test("Start Zero Immediately", function () {
     end: 2
   });
 });
-test("Update Timer", function () {
+test("Update Timer (timeupdate)", function () {
 
   QUnit.reset();
 
@@ -1647,7 +1647,176 @@ test("Update Timer", function () {
 
 });
 
-test("Plugin Factory", function () {
+test("Update Timer (frameAnimation)", function () {
+
+  QUnit.reset();
+
+  var p2 = Popcorn("#video", { frameAnimation: true }),
+      expects = 12,
+      count   = 0,
+      execCount = 0,
+      // These make sure events are only fired once
+      // any second call will produce a failed test
+      forwardStart  = false,
+      forwardEnd    = false,
+      backwardStart = false,
+      backwardEnd   = false,
+      wrapperRunning = { one: false, two: false, };
+
+  function plus() {
+    if ( ++count === expects ) {
+      // clean up added events after tests
+      Popcorn.removePlugin( "forwards" );
+      Popcorn.removePlugin( "backwards" );
+      Popcorn.removePlugin( "wrapper" );
+      p2.removePlugin( "exec" );
+      start();
+    }
+  }
+
+  // These tests come close to 10 seconds on chrome, increasing to 15
+  stop( 15000 );
+
+  Popcorn.plugin( "forwards", function () {
+    return {
+      start: function ( event, options ) {
+
+        if ( !options.startFired ) {
+
+          options.startFired = true;
+          forwardStart = !forwardStart;
+          ok( forwardStart, "forward's start fired" );
+          plus();
+        }
+      },
+      end: function ( event, options ) {
+
+        if ( !options.endFired ) {
+
+          options.endFired = true;
+          forwardEnd = !forwardEnd;
+          p2.currentTime(1).play();
+          ok( forwardEnd, "forward's end fired" );
+          plus();
+        }
+      }
+    };
+  });
+
+  p2.forwards({
+    start: 3,
+    end: 4
+  });
+
+  Popcorn.plugin( "backwards", function () {
+    return {
+      start: function ( event, options ) {
+
+        if ( !options.startFired ) {
+
+          options.startFired = true;
+          backwardStart = !backwardStart;
+          p2.currentTime(0).play();
+          ok( true, "backward's start fired" );
+          plus();
+        }
+      },
+      end: function ( event, options ) {
+
+        if ( !options.endFired ) {
+
+          options.endFired = true;
+          backwardEnd = !backwardEnd;
+          ok( backwardEnd, "backward's end fired" );
+          plus();
+          p2.currentTime( 5 ).play();
+        }
+      }
+    };
+  });
+
+  p2.backwards({
+    start: 1,
+    end: 2
+  });
+
+  Popcorn.plugin( "wrapper", {
+    start: function ( event, options ) {
+
+      wrapperRunning[ options.wrapper ] = true;
+    },
+    end: function ( event, options ) {
+
+      wrapperRunning[ options.wrapper ] = false;
+    }
+  });
+
+  // second instance of wrapper is wrapping the first
+  p2.wrapper({
+    start: 6,
+    end: 7,
+    wrapper: "one"
+  })
+  .wrapper({
+    start: 5,
+    end: 8,
+    wrapper: "two"
+  })
+  // checking wrapper 2's start
+  .exec( 5, function() {
+
+    if ( execCount === 0 ) {
+
+      execCount++;
+      ok( wrapperRunning.two, "wrapper two is running at second 5" );
+      plus();
+      ok( !wrapperRunning.one, "wrapper one is stopped at second 5" );
+      plus();
+    }
+  })
+  // checking wrapper 1's start
+  .exec( 6, function() {
+
+    if ( execCount === 1 ) {
+
+      execCount++;
+      ok( wrapperRunning.two, "wrapper two is running at second 6" );
+      plus();
+      ok( wrapperRunning.one, "wrapper one is running at second 6" );
+      plus();
+    }
+  })
+  // checking wrapper 1's end
+  .exec( 7, function() {
+
+    if ( execCount === 2 ) {
+
+      execCount++;
+      ok( wrapperRunning.two, "wrapper two is running at second 7" );
+      plus();
+      ok( !wrapperRunning.one, "wrapper one is stopped at second 7" );
+      plus();
+    }
+  })
+  // checking wrapper 2's end
+  .exec( 8, function() {
+
+    if ( execCount === 3 ) {
+
+      execCount++;
+      ok( !wrapperRunning.two, "wrapper two is stopped at second 9" );
+      plus();
+      ok( !wrapperRunning.one, "wrapper one is stopped at second 9" );
+      plus();
+    }
+  });
+
+  p2.currentTime(3).play();
+
+});
+
+
+test("Plugin Factory (timeupdate)", function () {
 
   QUnit.reset();
 
@@ -1766,6 +1935,125 @@ test("Plugin Factory", function () {
 
 });
 
+test("Plugin Factory (frameAnimation)", function () {
+
+  QUnit.reset();
+
+  var popped = Popcorn("#video", { frameAnimation: true }),
+      methods = "load play pause currentTime mute volume roundTime exec removePlugin",
+      expects = 34, // 15*2+2+2. executor/complicator each do 15
+      count = 0;
+
+  function plus() {
+    if ( ++count == expects ) {
+      Popcorn.removePlugin("executor");
+      Popcorn.removePlugin("complicator");
+      start();
+    }
+  }
+
+  expect( expects );
+  stop( 15000 );
+
+  Popcorn.plugin("executor", function () {
+
+    return {
+
+      start: function () {
+        var self = this;
+
+        // These ensure that a popcorn instance is the value of `this` inside a plugin definition
+
+        methods.split(/\s+/g).forEach(function (k,v) {
+          ok( k in self, "executor instance has method: " + k );
+
+          plus();
+        });
+
+        ok( "video" in this, "executor instance has `video` property" );
+        plus();
+        ok( Object.prototype.toString.call(popped.video) === "[object HTMLVideoElement]", "video property is a HTMLVideoElement" );
+        plus();
+
+        ok( "data" in this, "executor instance has `data` property" );
+        plus();
+        ok( Object.prototype.toString.call(popped.data) === "[object Object]", "data property is an object" );
+        plus();
+
+        ok( "trackEvents" in this.data, "executor instance has `trackEvents` property" );
+        plus();
+        ok( Object.prototype.toString.call(popped.data.trackEvents) === "[object Object]", "executor trackEvents property is an object" )
+        plus();
+      },
+      end: function () {
+
+      }
+    };
+
+  });
+
+  ok( "executor" in popped, "executor plugin is now available to instance" );
+  plus();
+  equals( Popcorn.registry.length, 1, "One item in the registry");
+  plus();
+
+  popped.executor({
+    start: 1,
+    end: 2
+  });
+
+  Popcorn.plugin("complicator", {
+
+    start: function ( event ) {
+
+      var self = this;
+
+      // These ensure that a popcorn instance is the value of `this` inside a plugin definition
+
+      methods.split(/\s+/g).forEach(function (k,v) {
+        ok( k in self, "complicator instance has method: " + k );
+
+        plus();
+      });
+
+      ok( "video" in this, "complicator instance has `video` property" );
+      plus();
+      ok( Object.prototype.toString.call(popped.video) === "[object HTMLVideoElement]", "video property is a HTMLVideoElement" );
+      plus();
+
+      ok( "data" in this, "complicator instance has `data` property" );
+      plus();
+      ok( Object.prototype.toString.call(popped.data) === "[object Object]", "complicator data property is an object" );
+      plus();
+
+      ok( "trackEvents" in this.data, " complicatorinstance has `trackEvents` property" );
+      plus();
+      ok( Object.prototype.toString.call(popped.data.trackEvents) === "[object Object]", "complicator trackEvents property is an object" )
+      plus();
+    },
+    end: function () {
+
+      //start();
+
+    },
+    timeupdate: function () {
+    }
+  });
+
+  ok( "complicator" in popped, "complicator plugin is now available to instance" );
+  plus();
+  equals( Popcorn.registry.length, 2, "Two items in the registry");
+  plus();
+
+  popped.complicator({
+    start: 4,
+    end: 5
+  });
+
+  popped.currentTime(0).play();
+
+});
+
 test( "Popcorn Compose", function () {
 
   QUnit.reset();
@@ -2625,7 +2913,7 @@ test("Index Integrity", function () {
 
 });
 
-test("Popcorn.disable/enable/toggle", function() {
+test("Popcorn.disable/enable/toggle (timeupdate)", function() {
 
 
   var $pop = Popcorn( "#video" ),
@@ -2639,6 +2927,7 @@ test("Popcorn.disable/enable/toggle", function() {
       start();
 
       Popcorn.removeInstance( $pop );
+			Popcorn.removePlugin( "toggler" );
     }
   }
 
@@ -3239,7 +3528,7 @@ test("Parsing Handler - References unavailable plugin", function () {
 });
 
 module("Audio");
-test( "Basic Audio Support", function () {
+test( "Basic Audio Support (timeupdate)", function () {
 
   var popped = Popcorn( "#audio" ),
       popObj = Popcorn( document.getElementById( "audio" ) ),
@@ -3308,6 +3597,75 @@ test( "Basic Audio Support", function () {
   });
 });
 
+test( "Basic Audio Support (frameAnimation)", function () {
+
+  var popped = Popcorn( "#audio", { frameAnimation: true }),
+      popObj = Popcorn( document.getElementById( "audio" ), { frameAnimation: true }),
+      methods = "load play pause currentTime mute volume roundTime exec removePlugin",
+      count = 0,
+      expects = 30;
+
+  expect( expects );
+
+  function plus() {
+
+    if ( ++count === expects ) {
+
+      start();
+    }
+  }
+
+  stop( 10000 );
+
+  // testing element passed by id
+  ok( "audio" in popped, "instance by id has `media` property" );
+  plus();
+  equal( Object.prototype.toString.call( popped.media ), "[object HTMLAudioElement]", "instance by id media property is a HTMLAudioElement" );
+  plus();
+
+  ok( "data" in popped, "instance by id has `data` property" );
+  plus();
+  equal( Object.prototype.toString.call( popped.data ), "[object Object]", "instance by id data property is an object" );
+  plus();
+
+  ok( "trackEvents" in popped.data, "instance by id has `trackEvents` property" );
+  plus();
+  equal( Object.prototype.toString.call( popped.data.trackEvents ), "[object Object]", "instance by id trackEvents property is an object" );
+  plus();
+
+  popped.play();
+
+  methods.split( /\s+/g ).forEach(function ( k,v ) {
+
+    ok( k in popped, "instance by id has method: " + k );
+    plus();
+  });
+
+  // testing element passed by reference
+  ok( "media" in popObj, "instance by reference has `media` property" );
+  plus();
+  equal( Object.prototype.toString.call( popObj.media ), "[object HTMLAudioElement]", "instance by reference media property is a HTMLAudioElement" );
+  plus();
+
+  ok( "data" in popObj, "instance by reference has `data` property" );
+  plus();
+  equal( Object.prototype.toString.call( popObj.data ), "[object Object]", "instance by reference data property is an object" );
+  plus();
+
+  ok( "trackEvents" in popObj.data, "instance by reference has `trackEvents` property" );
+  plus();
+  equal( Object.prototype.toString.call( popObj.data.trackEvents ), "[object Object]", "instance by reference trackEvents property is an object" );
+  plus();
+
+  popObj.play();
+
+  methods.split( /\s+/g ).forEach(function ( k,v ) {
+
+    ok( k in popObj, "instance by reference has method: " + k );
+    plus();
+  });
+});
+
 test("Parser Support", function () {
 
   var expects = 3,

From 17d137cba8895419496a1506e24e1a34bdff494d Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Wed, 7 Sep 2011 13:41:06 -0400
Subject: [PATCH 025/140] [#494] Removes incorrect plugin factory tests. Adds
 Index Integrity tests. Full Pass.

---
 test/popcorn.unit.js | 208 ++++++++++++++++++-------------------------
 1 file changed, 88 insertions(+), 120 deletions(-)

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 38f3b56d1..9cbda2d50 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -1816,7 +1816,7 @@ test("Update Timer (frameAnimation)", function () {
 });
 
 
-test("Plugin Factory (timeupdate)", function () {
+test("Plugin Factory", function () {
 
   QUnit.reset();
 
@@ -1935,125 +1935,6 @@ test("Plugin Factory (timeupdate)", function () {
 
 });
 
-test("Plugin Factory (frameAnimation)", function () {
-
-  QUnit.reset();
-
-  var popped = Popcorn("#video", { frameAnimation: true }),
-      methods = "load play pause currentTime mute volume roundTime exec removePlugin",
-      expects = 34, // 15*2+2+2. executor/complicator each do 15
-      count = 0;
-
-  function plus() {
-    if ( ++count == expects ) {
-      Popcorn.removePlugin("executor");
-      Popcorn.removePlugin("complicator");
-      start();
-    }
-  }
-
-  expect( expects );
-  stop( 15000 );
-
-  Popcorn.plugin("executor", function () {
-
-    return {
-
-      start: function () {
-        var self = this;
-
-        // These ensure that a popcorn instance is the value of `this` inside a plugin definition
-
-        methods.split(/\s+/g).forEach(function (k,v) {
-          ok( k in self, "executor instance has method: " + k );
-
-          plus();
-        });
-
-        ok( "video" in this, "executor instance has `video` property" );
-        plus();
-        ok( Object.prototype.toString.call(popped.video) === "[object HTMLVideoElement]", "video property is a HTMLVideoElement" );
-        plus();
-
-        ok( "data" in this, "executor instance has `data` property" );
-        plus();
-        ok( Object.prototype.toString.call(popped.data) === "[object Object]", "data property is an object" );
-        plus();
-
-        ok( "trackEvents" in this.data, "executor instance has `trackEvents` property" );
-        plus();
-        ok( Object.prototype.toString.call(popped.data.trackEvents) === "[object Object]", "executor trackEvents property is an object" )
-        plus();
-      },
-      end: function () {
-
-      }
-    };
-
-  });
-
-  ok( "executor" in popped, "executor plugin is now available to instance" );
-  plus();
-  equals( Popcorn.registry.length, 1, "One item in the registry");
-  plus();
-
-  popped.executor({
-    start: 1,
-    end: 2
-  });
-
-  Popcorn.plugin("complicator", {
-
-    start: function ( event ) {
-
-      var self = this;
-
-      // These ensure that a popcorn instance is the value of `this` inside a plugin definition
-
-      methods.split(/\s+/g).forEach(function (k,v) {
-        ok( k in self, "complicator instance has method: " + k );
-
-        plus();
-      });
-
-      ok( "video" in this, "complicator instance has `video` property" );
-      plus();
-      ok( Object.prototype.toString.call(popped.video) === "[object HTMLVideoElement]", "video property is a HTMLVideoElement" );
-      plus();
-
-      ok( "data" in this, "complicator instance has `data` property" );
-      plus();
-      ok( Object.prototype.toString.call(popped.data) === "[object Object]", "complicator data property is an object" );
-      plus();
-
-      ok( "trackEvents" in this.data, " complicatorinstance has `trackEvents` property" );
-      plus();
-      ok( Object.prototype.toString.call(popped.data.trackEvents) === "[object Object]", "complicator trackEvents property is an object" )
-      plus();
-    },
-    end: function () {
-
-      //start();
-
-    },
-    timeupdate: function () {
-    }
-  });
-
-  ok( "complicator" in popped, "complicator plugin is now available to instance" );
-  plus();
-  equals( Popcorn.registry.length, 2, "Two items in the registry");
-  plus();
-
-  popped.complicator({
-    start: 4,
-    end: 5
-  });
-
-  popped.currentTime(0).play();
-
-});
-
 test( "Popcorn Compose", function () {
 
   QUnit.reset();
@@ -2868,6 +2749,93 @@ test("Index Integrity", function () {
 
 
 
+  p.listen("timeupdate", function () {
+
+    if ( p.roundTime() > 40 && p.roundTime() < 42 && !hasrun ) {
+    }
+
+    if ( p.roundTime() > 40 && p.roundTime() < 42 && hasrun && !lastrun ) {
+
+      lastrun = true;
+
+      equals( document.getElementById('index-test'), null, "document.getElementById('index-test') is null on second run - after removeTrackEvent" );
+
+      start();
+    }
+
+    if ( p.roundTime() >= 42 && !hasrun ) {
+
+      hasrun  = true;
+      p.pause();
+
+      equals(p.data.trackEvents.byStart.length, 3, "p.data.trackEvents.byStart.length is 3 - after play, before removeTrackEvent" );
+      equals(p.data.trackEvents.startIndex, 2, "p.data.trackEvents.startIndex is 2 - after play, before removeTrackEvent");
+      equals(p.data.trackEvents.endIndex, 2, "p.data.trackEvents.endIndex is 2 - after play, before removeTrackEvent");
+
+
+
+      p.removeTrackEvent("removeable-track-event");
+
+      equals(p.data.trackEvents.byStart.length, 2, "p.data.trackEvents.byStart.length is 2 - after removeTrackEvent" );
+      equals(p.data.trackEvents.startIndex, 1, "p.data.trackEvents.startIndex is 1 - after removeTrackEvent");
+      equals(p.data.trackEvents.endIndex, 1, "p.data.trackEvents.endIndex is 1 - after removeTrackEvent");
+
+
+
+      p.currentTime(40).play();
+
+
+
+    }
+  });
+
+  p.play();
+
+
+});
+
+test("Index Integrity (frameAnimation)", function () {
+
+
+
+  var trackLen, hasrun = false, lastrun = false;
+
+
+  Popcorn.plugin("ff", function () {
+    return {
+      start: function () {
+        var div = document.createElement('div');
+        div.id = "index-test";
+        div.innerHTML = "foo";
+
+        document.body.appendChild(div);
+      },
+      end: function () {
+        document.getElementById('index-test').parentNode.removeChild(document.getElementById('index-test'));
+      }
+    };
+  });
+
+
+  var p = Popcorn("#video", { frameAnimation: true });
+
+  p.ff({
+    id: "removeable-track-event",
+    start: 40,
+    end: 41
+  });
+
+  p.currentTime(40).pause();
+
+  stop( 10000 );
+
+  equals(p.data.trackEvents.endIndex, 0, "p.data.trackEvents.endIndex is 0");
+  equals(p.data.trackEvents.startIndex, 0, "p.data.trackEvents.startIndex is 0");
+  equals(p.data.trackEvents.byStart.length, 3, "p.data.trackEvents.byStart.length is 3 - before play" );
+
+
+
+
   p.listen("timeupdate", function () {
 
     if ( p.roundTime() > 40 && p.roundTime() < 42 && !hasrun ) {

From a9979bd544e87c485f0fb58d381a010d02c3480b Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Wed, 7 Sep 2011 13:55:56 -0400
Subject: [PATCH 026/140] Restore tests

---
 test/popcorn.unit.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 9cbda2d50..f5e28302b 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -3704,4 +3704,3 @@ test("Last Check", function () {
   })( jQuery );
 
 });
-

From bff3d8c207479225fda242ee855fb9a6a68a0e5a Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Wed, 7 Sep 2011 13:59:41 -0400
Subject: [PATCH 027/140] Minor cleanup

---
 popcorn.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index 0b76f9b86..6fc8ebbf6 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -936,8 +936,8 @@
         tracks = obj.data.trackEvents,
         tracksAnimating = tracks.animating,
         end = tracks.endIndex,
-        start = tracks.startIndex, 
-        animIndex = 0, 
+        start = tracks.startIndex,
+        animIndex = 0,
 
         registryByName = Popcorn.registryByName,
 

From 281bd2de31d88f269daed8f2f26342c4ff4236de Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Wed, 7 Sep 2011 17:55:44 -0400
Subject: [PATCH 028/140] Removed some hacky code adding 0.25 seconds to the
 exec start time

---
 popcorn.js           | 2 +-
 test/popcorn.unit.js | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/popcorn.js b/popcorn.js
index 87aeeb321..9f6b0913d 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -410,7 +410,7 @@
 
       //  Creating a one second track event with an empty end
       Popcorn.addTrackEvent( this, {
-        start: time + 0.25,
+        start: time,
         end: time + 1,
         _running: false,
         _natives: {
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index a6ca94874..14405220d 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -1890,6 +1890,8 @@ test( "Popcorn Compose", function () {
   equals( test.two.setup, 3, "three compose two setup" );
   plus();
 
+  popped.currentTime(0).pause();
+
   popped.exec( 0, function() {
     equals( test.one.running, 1, "one compose running" );
    plus();

From c285474ee88bc807b754f331566cbf4d0a616f49 Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Thu, 8 Sep 2011 09:57:01 -0400
Subject: [PATCH 029/140] [#494] Optimize optional frameAnimation logic, wraps
 logic in conditional blocks

---
 popcorn.js | 65 +++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 42 insertions(+), 23 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index 6fc8ebbf6..9d0ec84c9 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -847,13 +847,11 @@
 
         // Filter for user track events (vs system track events)
         if ( o._id ) {
-
           // Filter for the trackevent to remove
           if ( o._id !== trackId ) {
             animating.push( obj.data.trackEvents.animating[i] );
           }
         }
-
       });
     }
 
@@ -867,8 +865,8 @@
     }
 
     obj.data.trackEvents.byStart = byStart;
-    obj.data.trackEvents.byEnd  = byEnd;
-    obj.data.trackEvents.animating  = animating;
+    obj.data.trackEvents.byEnd = byEnd;
+    obj.data.trackEvents.animating = animating;
 
     for ( var i = 0; i < historyLen; i++ ) {
       if ( obj.data.history[ i ] !== trackId ) {
@@ -934,14 +932,14 @@
     var currentTime = obj.media.currentTime,
         previousTime = obj.data.trackEvents.previousUpdateTime,
         tracks = obj.data.trackEvents,
-        tracksAnimating = tracks.animating,
+        animating = tracks.animating,
         end = tracks.endIndex,
         start = tracks.startIndex,
         animIndex = 0,
 
         registryByName = Popcorn.registryByName,
 
-        byEnd, byStart, natives, type;
+        byEnd, byStart, byAnimate, natives, type;
 
     //  Playbar advancing
     if ( previousTime < currentTime ) {
@@ -988,8 +986,12 @@
             byStart._running = true;
             natives.start.call( obj, event, byStart );
 
-            if ( byStart && byStart._running && byStart._natives.frame ) {
-              tracksAnimating.push( byStart );
+            // If the `frameAnimation` option is used,
+            // push the current byStart object into the `animating` cue
+            if ( obj.options.frameAnimation &&
+                ( byStart && byStart._running && byStart._natives.frame ) ) {
+
+              animating.push( byStart );
             }
           }
           start++;
@@ -1000,12 +1002,19 @@
         }
       }
 
-      while ( animIndex < tracksAnimating.length ) {
-        if ( !tracksAnimating[ animIndex ]._running ) {
-          tracksAnimating.splice( animIndex, 1 );
-        } else {
-          tracksAnimating[ animIndex ]._natives.frame.call( obj, event, tracksAnimating[ animIndex ], currentTime );
-          animIndex++;
+      // If the `frameAnimation` option is used, iterate the animating track
+      // and execute the `frame` callback
+      if ( obj.options.frameAnimation ) {
+        while ( animIndex < animating.length ) {
+
+          byAnimate = animating[ animIndex ];
+
+          if ( !byAnimate._running ) {
+            animating.splice( animIndex, 1 );
+          } else {
+            byAnimate._natives.frame.call( obj, event, byAnimate, currentTime );
+            animIndex++;
+          }
         }
       }
 
@@ -1053,8 +1062,12 @@
             byEnd._running = true;
             natives.start.call( obj, event, byEnd );
 
-            if ( byEnd && byEnd._running && byEnd._natives.frame ) {
-              tracksAnimating.push( byEnd );
+            // If the `frameAnimation` option is used,
+            // push the current byEnd object into the `animating` cue
+            if ( obj.options.frameAnimation &&
+                  ( byEnd && byEnd._running && byEnd._natives.frame ) ) {
+
+              animating.push( byEnd );
             }
           }
           end--;
@@ -1065,15 +1078,21 @@
         }
       }
 
-      while ( animIndex < tracksAnimating.length ) {
-        if ( !tracksAnimating[ animIndex ]._running ) {
-          tracksAnimating.splice( animIndex, 1 );
-        } else {
-          tracksAnimating[ animIndex ]._natives.frame.call( obj, event, tracksAnimating[ animIndex ], currentTime );
-          animIndex++;
+      // If the `frameAnimation` option is used, iterate the animating track
+      // and execute the `frame` callback
+      if ( obj.options.frameAnimation ) {
+        while ( animIndex < animating.length ) {
+
+          byAnimate = animating[ animIndex ];
+
+          if ( !byAnimate._running ) {
+            animating.splice( animIndex, 1 );
+          } else {
+            byAnimate._natives.frame.call( obj, event, byAnimate, currentTime );
+            animIndex++;
+          }
         }
       }
-
     // time bar is not moving ( video is paused )
     }
 

From f167a8aa7dd44b1ee5d4bdc185f84c4b5be60391 Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Thu, 8 Sep 2011 10:59:52 -0400
Subject: [PATCH 030/140] [#494] Fixes missing/broken reference to event object

---
 popcorn.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/popcorn.js b/popcorn.js
index 9d0ec84c9..6933965f2 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -235,7 +235,7 @@
             //  60 frames per second as opposed to ~4 ( ~every 15-250ms)
             animate = function () {
 
-              Popcorn.timeUpdate( that, event );
+              Popcorn.timeUpdate( that, {} );
 
               that.trigger( "timeupdate" );
 

From 79c1b0f8eb51d90bdb6ff6c0076deb8e7f091435 Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Thu, 8 Sep 2011 13:30:56 -0400
Subject: [PATCH 031/140] [#494] Formatting and whitespace fixes

---
 test/popcorn.unit.js | 322 +++++++++++++++++++------------------------
 1 file changed, 144 insertions(+), 178 deletions(-)

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index f5e28302b..a1b1f01ff 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -1,5 +1,5 @@
 module("Popcorn API");
-test("API", function () {
+test("API", function() {
 
   var expects = 4,
       count = 0;
@@ -49,7 +49,7 @@ test("API", function () {
 
 });
 
-test("Popcorn.* Static Methods", function () {
+test("Popcorn.* Static Methods", function() {
 
   var statics = [ "forEach", "extend", "error", "guid", "sizeOf", "nop",
                   "addTrackEvent", "removeTrackEvent", "getTrackEvents", "getTrackEvent", "position", "disable", "enable" ],
@@ -100,7 +100,7 @@ test("Popcorn.forEach", function() {
   equal(count, Popcorn.sizeOf(object), Popcorn.sizeOf(object) + " properties in object");
 });
 
-test("Popcorn.util.toSeconds" , function () {
+test("Popcorn.util.toSeconds" , function() {
   var framerate = 24,
       storedStartTime,
       storedEndTime,
@@ -182,13 +182,13 @@ test("Popcorn.util.toSeconds" , function () {
     }
   ];
 
-  var equivalentTimes = function ( testedTime, correctTime ) {
+  var equivalentTimes = function( testedTime, correctTime ) {
     var tolerance = 0.0001;
     return ( testedTime < ( correctTime + tolerance ) ) &&
            ( testedTime > ( correctTime - tolerance ) );
   };
 
-  var logMessage = function ( timeStr, correctTime, incorrectTime ) {
+  var logMessage = function( timeStr, correctTime, incorrectTime ) {
     return "Time stored in seconds for '" + timeStr +
            "' should be " + correctTime +
            ". Time stored was " + incorrectTime ;
@@ -282,7 +282,7 @@ test("Instances", function() {
   plus();
 });
 
-test("guid", function () {
+test("guid", function() {
 
   expect(6);
 
@@ -354,7 +354,7 @@ test("isArray", function() {
 });
 
 
-test("Protected", function () {
+test("Protected", function() {
 
   expect(1);
   //  TODO: comprehensive tests for these utilities
@@ -364,7 +364,7 @@ test("Protected", function () {
 
 });
 
-test("Protected from removal", function () {
+test("Protected from removal", function() {
 
   expect( Popcorn.protect.natives.length * 2 );
 
@@ -386,7 +386,7 @@ test("Protected from removal", function () {
 
 
 
-test( "Object", function () {
+test( "Object", function() {
 
   var popped = Popcorn( "#video" ),
       popObj = Popcorn( document.getElementById( "video" ) ),
@@ -425,7 +425,7 @@ test( "Object", function () {
 
   popped.play();
 
-  methods.split( /\s+/g ).forEach(function ( k,v ) {
+  methods.split( /\s+/g ).forEach(function( k,v ) {
 
     ok( k in popped, "instance by id has method: " + k );
     plus();
@@ -449,7 +449,7 @@ test( "Object", function () {
 
   popObj.play();
 
-  methods.split( /\s+/g ).forEach(function ( k,v ) {
+  methods.split( /\s+/g ).forEach(function( k,v ) {
 
     ok( k in popObj, "instance by reference has method: " + k );
     plus();
@@ -487,7 +487,7 @@ module("Popcorn Prototype Methods");
 
 
 
-test("roundTime", function () {
+test("roundTime", function() {
 
   QUnit.reset();
 
@@ -501,7 +501,7 @@ test("roundTime", function () {
 });
 
 
-test("exec", function () {
+test("exec", function() {
 
   QUnit.reset();
 
@@ -528,7 +528,7 @@ test("exec", function () {
 
   stop( 10000 );
 
-  popped.exec( 4, function () {
+  popped.exec( 4, function() {
     ok( loop < 2, "exec callback fired " + ++loop );
     plus();
 
@@ -542,7 +542,7 @@ test("exec", function () {
 
 });
 
-test("mute", function () {
+test("mute", function() {
 
   var video = Popcorn("#video"),
       audio = Popcorn("#audio"),
@@ -597,7 +597,7 @@ test("mute", function () {
 
 module("Popcorn Static Methods");
 
-test( "Popcorn.extend", function () {
+test( "Popcorn.extend", function() {
 
   QUnit.reset();
 
@@ -673,7 +673,7 @@ test( "Popcorn.events", function() {
   equals( typeof Popcorn.Events.Natives, "string", "Popcorn.Events.Natives is a string" );
   equals( typeof Popcorn.events, "object", "Popcorn.events is an object" );
 
-  Popcorn.forEach( eventsReturned, function ( e ) {
+  Popcorn.forEach( eventsReturned, function( e ) {
     ok( Popcorn.events.isNative ( e ), e + " is a native event" );
   });
 
@@ -870,7 +870,7 @@ test( "Popcorn.locale object", function() {
 
 
 module("Popcorn Position");
-test("position", function () {
+test("position", function() {
 
   expect(25);
 
@@ -939,7 +939,7 @@ test("position", function () {
   $("#position-tests").hide();
 });
 
-test("position called from plugin", function () {
+test("position called from plugin", function() {
 
   var $pop = Popcorn("#video"),
       expects = 3,
@@ -1007,7 +1007,7 @@ test("Determine event api interface", function() {
   });
 });
 
-test("Stored By Type", function () {
+test("Stored By Type", function() {
 
   QUnit.reset();
 
@@ -1035,28 +1035,28 @@ test("Stored By Type", function () {
   stop( 10000 );
 
 
-  p.listen("play", function () {
+  p.listen("play", function() {
     fired++;
 
     ok(true, "Play fired " + fired);
     plus();
   });
 
-  p.listen("play", function () {
+  p.listen("play", function() {
     fired++;
 
     ok(true, "Play fired " + fired);
     plus();
   });
 
-  p.listen("play", function () {
+  p.listen("play", function() {
     fired++;
 
     ok(true, "Play fired " + fired);
     plus();
   });
 
-  p.listen("play", function () {
+  p.listen("play", function() {
     fired++;
 
     ok(true, "Play fired " + fired);
@@ -1074,7 +1074,7 @@ test("Stored By Type", function () {
 });
 
 
-test("Simulated", function () {
+test("Simulated", function() {
 
   QUnit.reset();
 
@@ -1094,8 +1094,8 @@ test("Simulated", function () {
   stop( 10000 );
 
 
-  Setup.events.forEach(function ( name ) {
-    p.listen( name, function (event) {
+  Setup.events.forEach(function( name ) {
+    p.listen( name, function(event) {
 
       if ( completed.indexOf(name) === -1 ) {
         ok( true, name + " fired" );
@@ -1108,7 +1108,7 @@ test("Simulated", function () {
     });
   });
 
-  Setup.events.forEach(function ( name ) {
+  Setup.events.forEach(function( name ) {
     p.trigger( name );
   });
 
@@ -1116,7 +1116,7 @@ test("Simulated", function () {
 });
 
 
-test("Real", function () {
+test("Real", function() {
 
   QUnit.reset();
 
@@ -1135,9 +1135,9 @@ test("Real", function () {
   stop( 10000 );
 
 
-  [ "play", "pause", "volumechange", "seeking", "seeked" ].forEach(function ( name ) {
+  [ "play", "pause", "volumechange", "seeking", "seeked" ].forEach(function( name ) {
 
-    p.listen( name, function (event) {
+    p.listen( name, function(event) {
 
       if ( completed.indexOf(name) === -1 ) {
         ok( true, name + " fired" );
@@ -1164,7 +1164,7 @@ test("Real", function () {
 
 });
 
-test("Custom", function () {
+test("Custom", function() {
 
   var expects = 1,
       count = 0;
@@ -1178,7 +1178,7 @@ test("Custom", function () {
   var p = Popcorn("#video");
 
 
-  p.listen("eventz0rz", function ( event ) {
+  p.listen("eventz0rz", function( event ) {
 
     ok( true, "Custom event fired" );
     plus();
@@ -1192,7 +1192,7 @@ test("Custom", function () {
 });
 
 
-test("UI/Mouse", function () {
+test("UI/Mouse", function() {
 
   var expects = 1,
       count = 0;
@@ -1206,7 +1206,7 @@ test("UI/Mouse", function () {
   var p = Popcorn("#video");
 
 
-  p.listen("click", function ( event ) {
+  p.listen("click", function( event ) {
 
     ok( true, "click event fired" );
     plus();
@@ -1220,7 +1220,7 @@ test("UI/Mouse", function () {
 });
 
 module("Popcorn Plugin")
-test("Manifest", function () {
+test("Manifest", function() {
 
 
 
@@ -1298,7 +1298,7 @@ test("Manifest", function () {
 
 });
 
-test("Configurable Defaults", function () {
+test("Configurable Defaults", function() {
 
   var expects = 13,
       count   = 0;
@@ -1317,7 +1317,7 @@ test("Configurable Defaults", function () {
 
   stop();
 
-  Popcorn.plugin( "configurable", function () {
+  Popcorn.plugin( "configurable", function() {
     return {
       _setup: function( options ) {
 
@@ -1358,7 +1358,7 @@ test("Configurable Defaults", function () {
     }
   });
 
-  Popcorn.plugin( "multiconfig", function () {
+  Popcorn.plugin( "multiconfig", function() {
     return {
       start: function( event, options ) {
         equal( options.target, "quux", 'options.target, "quux" in multiconfig start');
@@ -1371,7 +1371,7 @@ test("Configurable Defaults", function () {
     };
   });
 
-  Popcorn.plugin( "overridden", function () {
+  Popcorn.plugin( "overridden", function() {
     return {
       _setup: function( options ) {
         equal( options.text, "hello!", 'options.text, overriden with "hello!" in overridden _setup');
@@ -1448,7 +1448,7 @@ test("Configurable Defaults", function () {
 
 });
 
-test("Start Zero Immediately", function () {
+test("Start Zero Immediately", function() {
 
   var $pop = Popcorn("#video"),
       expects = 1,
@@ -1479,7 +1479,7 @@ test("Start Zero Immediately", function () {
     end: 2
   });
 });
-test("Update Timer (timeupdate)", function () {
+test("Update Timer (timeupdate)", function() {
 
   QUnit.reset();
 
@@ -1509,9 +1509,9 @@ test("Update Timer (timeupdate)", function () {
   // These tests come close to 10 seconds on chrome, increasing to 15
   stop( 15000 );
 
-  Popcorn.plugin( "forwards", function () {
+  Popcorn.plugin( "forwards", function() {
     return {
-      start: function ( event, options ) {
+      start: function( event, options ) {
 
         if ( !options.startFired ) {
 
@@ -1521,7 +1521,7 @@ test("Update Timer (timeupdate)", function () {
           plus();
         }
       },
-      end: function ( event, options ) {
+      end: function( event, options ) {
 
         if ( !options.endFired ) {
 
@@ -1540,9 +1540,9 @@ test("Update Timer (timeupdate)", function () {
     end: 4
   });
 
-  Popcorn.plugin( "backwards", function () {
+  Popcorn.plugin( "backwards", function() {
     return {
-      start: function ( event, options ) {
+      start: function( event, options ) {
 
         if ( !options.startFired ) {
 
@@ -1553,7 +1553,7 @@ test("Update Timer (timeupdate)", function () {
           plus();
         }
       },
-      end: function ( event, options ) {
+      end: function( event, options ) {
 
         if ( !options.endFired ) {
 
@@ -1573,11 +1573,11 @@ test("Update Timer (timeupdate)", function () {
   });
 
   Popcorn.plugin( "wrapper", {
-    start: function ( event, options ) {
+    start: function( event, options ) {
 
       wrapperRunning[ options.wrapper ] = true;
     },
-    end: function ( event, options ) {
+    end: function( event, options ) {
 
       wrapperRunning[ options.wrapper ] = false;
     }
@@ -1647,7 +1647,7 @@ test("Update Timer (timeupdate)", function () {
 
 });
 
-test("Update Timer (frameAnimation)", function () {
+test("Update Timer (frameAnimation)", function() {
 
   QUnit.reset();
 
@@ -1677,9 +1677,9 @@ test("Update Timer (frameAnimation)", function () {
   // These tests come close to 10 seconds on chrome, increasing to 15
   stop( 15000 );
 
-  Popcorn.plugin( "forwards", function () {
+  Popcorn.plugin( "forwards", function() {
     return {
-      start: function ( event, options ) {
+      start: function( event, options ) {
 
         if ( !options.startFired ) {
 
@@ -1689,7 +1689,7 @@ test("Update Timer (frameAnimation)", function () {
           plus();
         }
       },
-      end: function ( event, options ) {
+      end: function( event, options ) {
 
         if ( !options.endFired ) {
 
@@ -1708,9 +1708,9 @@ test("Update Timer (frameAnimation)", function () {
     end: 4
   });
 
-  Popcorn.plugin( "backwards", function () {
+  Popcorn.plugin( "backwards", function() {
     return {
-      start: function ( event, options ) {
+      start: function( event, options ) {
 
         if ( !options.startFired ) {
 
@@ -1721,7 +1721,7 @@ test("Update Timer (frameAnimation)", function () {
           plus();
         }
       },
-      end: function ( event, options ) {
+      end: function( event, options ) {
 
         if ( !options.endFired ) {
 
@@ -1741,11 +1741,11 @@ test("Update Timer (frameAnimation)", function () {
   });
 
   Popcorn.plugin( "wrapper", {
-    start: function ( event, options ) {
+    start: function( event, options ) {
 
       wrapperRunning[ options.wrapper ] = true;
     },
-    end: function ( event, options ) {
+    end: function( event, options ) {
 
       wrapperRunning[ options.wrapper ] = false;
     }
@@ -1816,7 +1816,7 @@ test("Update Timer (frameAnimation)", function () {
 });
 
 
-test("Plugin Factory", function () {
+test("Plugin Factory", function() {
 
   QUnit.reset();
 
@@ -1836,16 +1836,16 @@ test("Plugin Factory", function () {
   expect( expects );
   stop( 15000 );
 
-  Popcorn.plugin("executor", function () {
+  Popcorn.plugin("executor", function() {
 
     return {
 
-      start: function () {
+      start: function() {
         var self = this;
 
         // These ensure that a popcorn instance is the value of `this` inside a plugin definition
 
-        methods.split(/\s+/g).forEach(function (k,v) {
+        methods.split(/\s+/g).forEach(function(k,v) {
           ok( k in self, "executor instance has method: " + k );
 
           plus();
@@ -1866,7 +1866,7 @@ test("Plugin Factory", function () {
         ok( Object.prototype.toString.call(popped.data.trackEvents) === "[object Object]", "executor trackEvents property is an object" )
         plus();
       },
-      end: function () {
+      end: function() {
 
       }
     };
@@ -1885,13 +1885,13 @@ test("Plugin Factory", function () {
 
   Popcorn.plugin("complicator", {
 
-    start: function ( event ) {
+    start: function( event ) {
 
       var self = this;
 
       // These ensure that a popcorn instance is the value of `this` inside a plugin definition
 
-      methods.split(/\s+/g).forEach(function (k,v) {
+      methods.split(/\s+/g).forEach(function(k,v) {
         ok( k in self, "complicator instance has method: " + k );
 
         plus();
@@ -1912,12 +1912,12 @@ test("Plugin Factory", function () {
       ok( Object.prototype.toString.call(popped.data.trackEvents) === "[object Object]", "complicator trackEvents property is an object" )
       plus();
     },
-    end: function () {
+    end: function() {
 
       //start();
 
     },
-    timeupdate: function () {
+    timeupdate: function() {
     }
   });
 
@@ -1935,7 +1935,7 @@ test("Plugin Factory", function () {
 
 });
 
-test( "Popcorn Compose", function () {
+test( "Popcorn Compose", function() {
 
   QUnit.reset();
 
@@ -2187,7 +2187,7 @@ test( "Popcorn Compose", function () {
   popped.currentTime( 0 ).play();
 });
 
-test("Plugin Breaker", function () {
+test("Plugin Breaker", function() {
 
   QUnit.reset();
 
@@ -2214,14 +2214,14 @@ test("Plugin Breaker", function () {
 
   Popcorn.plugin("breaker", {
 
-    start: function () {
+    start: function() {
 
       breaker.start++;
 
       ok(true, "breaker started");
       plus();
     },
-    end: function () {
+    end: function() {
 
       breaker.end++;
 
@@ -2252,7 +2252,7 @@ test("Plugin Breaker", function () {
 
 });
 
-test("Plugin Empty", function () {
+test("Plugin Empty", function() {
 
   QUnit.reset();
 
@@ -2288,7 +2288,7 @@ test("Plugin Empty", function () {
 
 });
 
-test("Plugin Closure", function () {
+test("Plugin Closure", function() {
 
   QUnit.reset();
 
@@ -2318,12 +2318,12 @@ test("Plugin Closure", function () {
         options.startCount = 0;
         options.endCount = 0;
       },
-      start: function ( event, options ) {
+      start: function( event, options ) {
         // called once for each instance; the test will fail if startCount is not actually unique per instance
         equals( startCount++, options.startCount++, options.nick + " has correct start counts" );
         plus();
       },
-      end: function ( event, options ) {
+      end: function( event, options ) {
         // likewise for endCount
         equals( endCount++, options.endCount++, options.nick + " has correct end counts" );
         plus();
@@ -2349,7 +2349,7 @@ test("Plugin Closure", function () {
 
 });
 
-test("Remove Plugin", function () {
+test("Remove Plugin", function() {
 
   var p = Popcorn("#video"),
       p2 = Popcorn("#video"),
@@ -2378,10 +2378,10 @@ test("Remove Plugin", function () {
 
   Popcorn.plugin("removeme", {
 
-    start: function () {
+    start: function() {
 
     },
-    end: function () {
+    end: function() {
 
     },
     _teardown: function( options ) {
@@ -2483,14 +2483,14 @@ test("Remove Plugin", function () {
 
 
 
-test("Protected Names", function () {
+test("Protected Names", function() {
   //QUnit.reset();
 
   expect(8);
 
   var popped = Popcorn("#video");
 
-  $.each( "load play pause currentTime playbackRate mute volume duration".split(/\s+/), function (k, name) {
+  $.each( "load play pause currentTime playbackRate mute volume duration".split(/\s+/), function(k, name) {
     try {
 
       Popcorn.plugin( name, {});
@@ -2536,7 +2536,7 @@ test("Defaulting Empty End Values", function() {
 });
 
 module("Popcorn TrackEvents");
-test("Functions", function () {
+test("Functions", function() {
 
   //  TODO: break this into sep. units per function
   expect(19);
@@ -2544,10 +2544,10 @@ test("Functions", function () {
   var popped = Popcorn("#video"), ffTrackId, rwTrackId, rw2TrackId, rw3TrackId, historyRef, trackEvents;
 
 
-  Popcorn.plugin("ff", function () {
+  Popcorn.plugin("ff", function() {
     return {
-      start: function () {},
-      end: function () {}
+      start: function() {},
+      end: function() {}
     };
   });
 
@@ -2561,10 +2561,10 @@ test("Functions", function () {
 
 
 
-  Popcorn.plugin("rw", function () {
+  Popcorn.plugin("rw", function() {
     return {
-      start: function () {},
-      end: function () {}
+      start: function() {},
+      end: function() {}
     };
   });
 
@@ -2646,7 +2646,7 @@ test("Functions", function () {
 
 });
 
-test("getTrackEvent", function () {
+test("getTrackEvent", function() {
 
   //  TODO: break this into sep. units per function
   expect(5);
@@ -2654,10 +2654,10 @@ test("getTrackEvent", function () {
   var popped = Popcorn("#video"),
     trackIds = [], obj, oldId;
 
-  Popcorn.plugin("ff", function () {
+  Popcorn.plugin("ff", function() {
     return {
-      start: function () {},
-      end: function () {}
+      start: function() {},
+      end: function() {}
     };
   });
 
@@ -2668,10 +2668,10 @@ test("getTrackEvent", function () {
 
   trackIds.push( popped.getLastTrackEventId() );
 
-  Popcorn.plugin("rw", function () {
+  Popcorn.plugin("rw", function() {
     return {
-      start: function () {},
-      end: function () {}
+      start: function() {},
+      end: function() {}
     };
   });
 
@@ -2707,29 +2707,27 @@ test("getTrackEvent", function () {
 
 });
 
-test("Index Integrity", function () {
+test("Index Integrity (timeupdate)", function() {
 
+  var trackLen,
+    hasrun = false,
+    lastrun = false;
 
-
-  var trackLen, hasrun = false, lastrun = false;
-
-
-  Popcorn.plugin("ff", function () {
+  Popcorn.plugin("ff", function() {
     return {
-      start: function () {
-        var div = document.createElement('div');
+      start: function() {
+        var div = document.createElement("div");
         div.id = "index-test";
         div.innerHTML = "foo";
 
         document.body.appendChild(div);
       },
-      end: function () {
-        document.getElementById('index-test').parentNode.removeChild(document.getElementById('index-test'));
+      end: function() {
+        document.getElementById("index-test").parentNode.removeChild(document.getElementById("index-test"));
       }
     };
   });
 
-
   var p = Popcorn("#video");
 
   p.ff({
@@ -2746,19 +2744,13 @@ test("Index Integrity", function () {
   equals(p.data.trackEvents.startIndex, 0, "p.data.trackEvents.startIndex is 0");
   equals(p.data.trackEvents.byStart.length, 3, "p.data.trackEvents.byStart.length is 3 - before play" );
 
-
-
-
-  p.listen("timeupdate", function () {
-
-    if ( p.roundTime() > 40 && p.roundTime() < 42 && !hasrun ) {
-    }
+  p.listen("timeupdate", function() {
 
     if ( p.roundTime() > 40 && p.roundTime() < 42 && hasrun && !lastrun ) {
 
       lastrun = true;
 
-      equals( document.getElementById('index-test'), null, "document.getElementById('index-test') is null on second run - after removeTrackEvent" );
+      equals( document.getElementById("index-test"), null, "document.getElementById('index-test') is null on second run - after removeTrackEvent" );
 
       start();
     }
@@ -2772,51 +2764,41 @@ test("Index Integrity", function () {
       equals(p.data.trackEvents.startIndex, 2, "p.data.trackEvents.startIndex is 2 - after play, before removeTrackEvent");
       equals(p.data.trackEvents.endIndex, 2, "p.data.trackEvents.endIndex is 2 - after play, before removeTrackEvent");
 
-
-
       p.removeTrackEvent("removeable-track-event");
 
       equals(p.data.trackEvents.byStart.length, 2, "p.data.trackEvents.byStart.length is 2 - after removeTrackEvent" );
       equals(p.data.trackEvents.startIndex, 1, "p.data.trackEvents.startIndex is 1 - after removeTrackEvent");
       equals(p.data.trackEvents.endIndex, 1, "p.data.trackEvents.endIndex is 1 - after removeTrackEvent");
 
-
-
       p.currentTime(40).play();
 
-
-
     }
   });
 
   p.play();
-
-
 });
 
-test("Index Integrity (frameAnimation)", function () {
-
+test("Index Integrity (frameAnimation)", function() {
 
+  var trackLen,
+    hasrun = false,
+    lastrun = false;
 
-  var trackLen, hasrun = false, lastrun = false;
-
-
-  Popcorn.plugin("ff", function () {
+  Popcorn.plugin("ff", function() {
     return {
-      start: function () {
-        var div = document.createElement('div');
+      start: function() {
+        var div = document.createElement("div");
         div.id = "index-test";
         div.innerHTML = "foo";
 
         document.body.appendChild(div);
       },
-      end: function () {
-        document.getElementById('index-test').parentNode.removeChild(document.getElementById('index-test'));
+      end: function() {
+        document.getElementById("index-test").parentNode.removeChild(document.getElementById("index-test"));
       }
     };
   });
 
-
   var p = Popcorn("#video", { frameAnimation: true });
 
   p.ff({
@@ -2833,19 +2815,13 @@ test("Index Integrity (frameAnimation)", function () {
   equals(p.data.trackEvents.startIndex, 0, "p.data.trackEvents.startIndex is 0");
   equals(p.data.trackEvents.byStart.length, 3, "p.data.trackEvents.byStart.length is 3 - before play" );
 
-
-
-
-  p.listen("timeupdate", function () {
-
-    if ( p.roundTime() > 40 && p.roundTime() < 42 && !hasrun ) {
-    }
+  p.listen("timeupdate", function() {
 
     if ( p.roundTime() > 40 && p.roundTime() < 42 && hasrun && !lastrun ) {
 
       lastrun = true;
 
-      equals( document.getElementById('index-test'), null, "document.getElementById('index-test') is null on second run - after removeTrackEvent" );
+      equals( document.getElementById("index-test"), null, "document.getElementById('index-test') is null on second run - after removeTrackEvent" );
 
       start();
     }
@@ -2859,31 +2835,21 @@ test("Index Integrity (frameAnimation)", function () {
       equals(p.data.trackEvents.startIndex, 2, "p.data.trackEvents.startIndex is 2 - after play, before removeTrackEvent");
       equals(p.data.trackEvents.endIndex, 2, "p.data.trackEvents.endIndex is 2 - after play, before removeTrackEvent");
 
-
-
       p.removeTrackEvent("removeable-track-event");
 
       equals(p.data.trackEvents.byStart.length, 2, "p.data.trackEvents.byStart.length is 2 - after removeTrackEvent" );
       equals(p.data.trackEvents.startIndex, 1, "p.data.trackEvents.startIndex is 1 - after removeTrackEvent");
       equals(p.data.trackEvents.endIndex, 1, "p.data.trackEvents.endIndex is 1 - after removeTrackEvent");
 
-
-
       p.currentTime(40).play();
-
-
-
     }
   });
 
   p.play();
-
-
 });
 
 test("Popcorn.disable/enable/toggle (timeupdate)", function() {
 
-
   var $pop = Popcorn( "#video" ),
       count = 0,
       expects = 5;
@@ -2895,20 +2861,20 @@ test("Popcorn.disable/enable/toggle (timeupdate)", function() {
       start();
 
       Popcorn.removeInstance( $pop );
-			Popcorn.removePlugin( "toggler" );
+      Popcorn.removePlugin( "toggler" );
     }
   }
 
-  Popcorn.plugin("toggler", function () {
+  Popcorn.plugin("toggler", function() {
     return {
-      start: function () {
+      start: function() {
         var div = document.createElement("div");
         div.id = "toggler-test";
         div.innerHTML = "foo";
 
         document.body.appendChild(div);
       },
-      end: function () {
+      end: function() {
         document.getElementById("toggler-test").parentNode.removeChild(document.getElementById("toggler-test"));
       }
     };
@@ -2957,7 +2923,7 @@ test("Popcorn.disable/enable/toggle (timeupdate)", function() {
 });
 
 module("Popcorn XHR");
-test("Basic", function () {
+test("Basic", function() {
 
   expect(2);
 
@@ -2967,7 +2933,7 @@ test("Basic", function () {
 
 });
 
-test("Text Response", function () {
+test("Text Response", function() {
 
   var expects = 2,
       count = 0;
@@ -2996,7 +2962,7 @@ test("Text Response", function () {
   });
 });
 
-test("dataType: Text Response", function () {
+test("dataType: Text Response", function() {
 
   var expects = 2,
       count = 0;
@@ -3027,7 +2993,7 @@ test("dataType: Text Response", function () {
 });
 
 
-test("JSON Response", function () {
+test("JSON Response", function() {
 
   var expects = 2,
       count = 0;
@@ -3061,7 +3027,7 @@ test("JSON Response", function () {
 
 });
 
-test("dataType: JSON Response", function () {
+test("dataType: JSON Response", function() {
 
   var expects = 2,
       count = 0;
@@ -3099,7 +3065,7 @@ test("dataType: JSON Response", function () {
 
 if ( !/file/.test( location.protocol ) ) {
 
-  test("JSONP Response", function () {
+  test("JSONP Response", function() {
 
     var expects = 8,
         count = 0;
@@ -3184,7 +3150,7 @@ if ( !/file/.test( location.protocol ) ) {
   });
 
 } else {
-  test("JSONP Response", function () {
+  test("JSONP Response", function() {
 
     expect(1);
 
@@ -3195,7 +3161,7 @@ if ( !/file/.test( location.protocol ) ) {
   });
 }
 
-test("Popcorn.getScript()", function () {
+test("Popcorn.getScript()", function() {
 
   var expects = 8,
       count = 0;
@@ -3296,7 +3262,7 @@ test("Popcorn.getScript()", function () {
 });
 
 
-test("XML Response", function () {
+test("XML Response", function() {
 
   var expects = 2,
       count = 0;
@@ -3331,7 +3297,7 @@ test("XML Response", function () {
 
 });
 
-test("dataType: XML Response", function () {
+test("dataType: XML Response", function() {
 
   var expects = 2,
       count = 0;
@@ -3371,7 +3337,7 @@ test("dataType: XML Response", function () {
 
 module("Popcorn Parser");
 
-test("Parsing Functions", function () {
+test("Parsing Functions", function() {
 
   var expects = 3,
       count = 0,
@@ -3402,7 +3368,7 @@ test("Parsing Functions", function () {
 
 });
 
-test("Parsing Integrity", function () {
+test("Parsing Integrity", function() {
 
   var expects = 6,
       count = 0,
@@ -3435,11 +3401,11 @@ test("Parsing Integrity", function () {
 
   Popcorn.plugin("parserTest", {
 
-    start: function () {
+    start: function() {
       ok(true, "parserTest started");
       plus();
     },
-    end: function () {
+    end: function() {
       ok(true, "parserTest ended");
       plus();
     }
@@ -3456,7 +3422,7 @@ test("Parsing Integrity", function () {
 });
 
 
-test("Parsing Handler - References unavailable plugin", function () {
+test("Parsing Handler - References unavailable plugin", function() {
 
   var expects = 1,
       count = 0,
@@ -3496,7 +3462,7 @@ test("Parsing Handler - References unavailable plugin", function () {
 });
 
 module("Audio");
-test( "Basic Audio Support (timeupdate)", function () {
+test( "Basic Audio Support (timeupdate)", function() {
 
   var popped = Popcorn( "#audio" ),
       popObj = Popcorn( document.getElementById( "audio" ) ),
@@ -3534,7 +3500,7 @@ test( "Basic Audio Support (timeupdate)", function () {
 
   popped.play();
 
-  methods.split( /\s+/g ).forEach(function ( k,v ) {
+  methods.split( /\s+/g ).forEach(function( k,v ) {
 
     ok( k in popped, "instance by id has method: " + k );
     plus();
@@ -3558,14 +3524,14 @@ test( "Basic Audio Support (timeupdate)", function () {
 
   popObj.play();
 
-  methods.split( /\s+/g ).forEach(function ( k,v ) {
+  methods.split( /\s+/g ).forEach(function( k,v ) {
 
     ok( k in popObj, "instance by reference has method: " + k );
     plus();
   });
 });
 
-test( "Basic Audio Support (frameAnimation)", function () {
+test( "Basic Audio Support (frameAnimation)", function() {
 
   var popped = Popcorn( "#audio", { frameAnimation: true }),
       popObj = Popcorn( document.getElementById( "audio" ), { frameAnimation: true }),
@@ -3603,7 +3569,7 @@ test( "Basic Audio Support (frameAnimation)", function () {
 
   popped.play();
 
-  methods.split( /\s+/g ).forEach(function ( k,v ) {
+  methods.split( /\s+/g ).forEach(function( k,v ) {
 
     ok( k in popped, "instance by id has method: " + k );
     plus();
@@ -3627,14 +3593,14 @@ test( "Basic Audio Support (frameAnimation)", function () {
 
   popObj.play();
 
-  methods.split( /\s+/g ).forEach(function ( k,v ) {
+  methods.split( /\s+/g ).forEach(function( k,v ) {
 
     ok( k in popObj, "instance by reference has method: " + k );
     plus();
   });
 });
 
-test("Parser Support", function () {
+test("Parser Support", function() {
 
   var expects = 3,
       count = 0,
@@ -3681,7 +3647,7 @@ test("Parser Support", function () {
 
 
 module("Popcorn Test Runner End");
-test("Last Check", function () {
+test("Last Check", function() {
 
   //   ALWAYS RUN LAST
   try {

From 155ac81b257b6a6c89325849f266b55c1068f2bc Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Thu, 8 Sep 2011 13:44:40 -0400
Subject: [PATCH 032/140] [#494] Adds a test for frame function

---
 test/popcorn.unit.js | 45 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index a1b1f01ff..89855e7d5 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -1452,7 +1452,9 @@ test("Start Zero Immediately", function() {
 
   var $pop = Popcorn("#video"),
       expects = 1,
-      count   = 0;
+      count = 0;
+
+  expect(expects);
 
   function plus() {
     if ( ++count === expects ) {
@@ -1479,6 +1481,47 @@ test("Start Zero Immediately", function() {
     end: 2
   });
 });
+
+test("frame function (frameAnimation)", function() {
+
+  var $pop = Popcorn("#video", { frameAnimation: true }),
+      fired = 0,
+      expects = 1,
+      count = 0;
+
+  expect(expects);
+
+  function plus() {
+    if ( ++count === expects ) {
+      // clean up added events after tests
+      Popcorn.removePlugin("frameFn");
+      start();
+    }
+  }
+
+  stop();
+
+  $pop.pause().currentTime( 1 );
+
+  Popcorn.plugin( "frameFn", {
+    start: function() {
+    },
+    frame: function() {
+      fired++;
+    },
+    end: function() {
+      // if `frame` fired, then it will have value > 0
+      ok( fired, "frame fired. (actual: " + fired + ")" );
+      plus();
+    }
+  });
+
+  $pop.frameFn({
+    start: 1,
+    end: 3
+  }).play();
+});
+
 test("Update Timer (timeupdate)", function() {
 
   QUnit.reset();

From e41e3398b0dbb6a873e83b99c9b5b6c199b4d659 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Thu, 8 Sep 2011 16:59:23 -0400
Subject: [PATCH 033/140] fixed unit test issue where setting the medias
 current time in the parserXML unit test would not automatically start
 playback and the tests would time out because no events would fire.

---
 parsers/parserXML/popcorn.parserXML.unit.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/parsers/parserXML/popcorn.parserXML.unit.js b/parsers/parserXML/popcorn.parserXML.unit.js
index 9b4a96369..04c85cae7 100644
--- a/parsers/parserXML/popcorn.parserXML.unit.js
+++ b/parsers/parserXML/popcorn.parserXML.unit.js
@@ -11,6 +11,7 @@ test("Popcorn 0.1 XML Parser Plugin", function () {
       start();
       // clean up added events after tests
       clearInterval( interval );
+      poppercorn.pause();
     }
   }
   
@@ -55,7 +56,7 @@ test("Popcorn 0.1 XML Parser Plugin", function () {
 
   poppercorn.parseXML( "data/unit.XML", function() {
 
-    poppercorn.currentTime(5);
+    poppercorn.currentTime(5).play();
   });  
 });
 

From e8c6faee94fd75c1451c6702ce551cdee0c5c455 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Fri, 9 Sep 2011 09:42:50 -0400
Subject: [PATCH 034/140] Early work on style fixes for plugin files

---
 plugins/attribution/popcorn.attribution.html  | 38 ++++---
 plugins/attribution/popcorn.attribution.js    | 94 ++++++++++++------
 .../attribution/popcorn.attribution.unit.html | 30 +++---
 .../attribution/popcorn.attribution.unit.js   | 65 ++++++------
 plugins/flickr/popcorn.flickr.html            | 12 +--
 plugins/flickr/popcorn.flickr.js              |  9 +-
 plugins/flickr/popcorn.flickr.unit.html       | 30 +++---
 plugins/flickr/popcorn.flickr.unit.js         | 32 +++---
 plugins/googlefeed/popcorn.googlefeed.html    | 40 ++++----
 plugins/googlefeed/popcorn.googlefeed.js      | 48 ++++-----
 .../googlefeed/popcorn.googlefeed.unit.html   | 30 +++---
 plugins/googlefeed/popcorn.googlefeed.unit.js | 58 +++++------
 plugins/lowerthird/popcorn.lowerthird.html    | 42 ++++----
 plugins/lowerthird/popcorn.lowerthird.js      | 55 +++++++----
 .../lowerthird/popcorn.lowerthird.unit.html   | 28 +++---
 plugins/lowerthird/popcorn.lowerthird.unit.js | 40 ++++----
 plugins/pause/popcorn.pause.html              | 22 +++--
 plugins/pause/popcorn.pause.unit.html         | 22 ++---
 plugins/pause/popcorn.pause.unit.js           | 99 ++++++++++---------
 .../tagthisperson/popcorn.tagthisperson.html  | 60 +++++------
 .../tagthisperson/popcorn.tagthisperson.js    | 68 ++++++++-----
 .../popcorn.tagthisperson.unit.html           | 33 +++----
 .../popcorn.tagthisperson.unit.js             | 70 ++++++-------
 plugins/webpage/popcorn.webpage.html          | 50 +++++-----
 plugins/webpage/popcorn.webpage.js            | 14 +--
 25 files changed, 585 insertions(+), 504 deletions(-)

diff --git a/plugins/attribution/popcorn.attribution.html b/plugins/attribution/popcorn.attribution.html
index 1e7d3fa1c..6b509e247 100755
--- a/plugins/attribution/popcorn.attribution.html
+++ b/plugins/attribution/popcorn.attribution.html
@@ -2,13 +2,13 @@
 <html>
 <head>
   <title>Popcorn attribution Plug-in Demo</title>
-  
+
   <script src="../../popcorn.js"></script>
   <script src="popcorn.attribution.js"></script>
   <script>
-    document.addEventListener('DOMContentLoaded', function () {
-      var p = Popcorn('#video')
-      .play() 
+    document.addEventListener("DOMContentLoaded", function () {
+      var p = Popcorn("#video")
+      .play()
       .volume(0)
       .attribution({
         start: 0, // seconds
@@ -17,8 +17,8 @@
         copyrightholder:"Jesse Dylan",
         license: "CC-BY-N6",
         licenseurl: "http://creativecommons.org/licenses/by-nc/2.0/",
-        target: 'attribdiv'
-      } )
+        target: "attribdiv"
+      })
       .attribution({
         start: 5, // seconds
         end: 15, // seconds
@@ -27,11 +27,9 @@
         copyrightholder:"The Computer Chronicles",
         license:"CC-BY-NC-ND",
         licenseurl: "http://creativecommons.org/licenses/by-nc-nd/2.0/",
-        target: 'attribdiv'
-      } )
-
+        target: "attribdiv"
+      })
     }, false);
-      
   </script>
 </head>
 <body>
@@ -39,22 +37,22 @@ <h1 id="qunit-header">Popcorn Attribution Plug-in Demo</h1>
   <p> A attribution displaying 'A Shared Culture, Jesse Dylan, license: CC-BY-N6' will appear at 0 seconds and disappear at 10 seconds.</p>
   <p> A attribution displaying 'Internet, The Computer Chronicles' will appear at 5 seconds and disappear at 15 seconds.</p>
   <div>
-    <video id='video' 
-      controls preload='none' 
-      width= '250px'
-      poster="../../test/poster.png"> 
+    <video id="video"
+      controls preload="none"
+      width= "250px"
+      poster="../../test/poster.png">
 
-      <source id='mp4'
+      <source id="mp4"
         src="../../test/trailer.mp4"
-        type='video/mp4; codecs="avc1, mp4a"'> 
+        type="viden/mp4; codecs='avc1, mp4a'">
 
-      <source id='ogv'
+      <source id="ogv"
         src="../../test/trailer.ogv"
-        type='video/ogg; codecs="theora, vorbis"'> 
+        type="video/ogg; codecs='theora, vorbis'">
 
-      <p>Your user agent does not support the HTML5 Video element.</p> 
+      <p>Your user agent does not support the HTML5 Video element.</p>
 
-    </video> 
+    </video>
   </div>
   <div id="attribdiv" width="50%" height="50%">
   </div>
diff --git a/plugins/attribution/popcorn.attribution.js b/plugins/attribution/popcorn.attribution.js
index db24c7185..ab56fc5b7 100755
--- a/plugins/attribution/popcorn.attribution.js
+++ b/plugins/attribution/popcorn.attribution.js
@@ -1,23 +1,23 @@
 // PLUGIN: Attribution
 
 (function( Popcorn ) {
-  
+
   /**
-   * Attribution popcorn plug-in 
+   * Attribution popcorn plug-in
    * Adds text to an element on the page.
    * Options parameter will need a mandatory start, end, target.
    * Optional parameters include nameofwork, NameOfWorkUrl, CopyrightHolder, CopyrightHolderUrl, license & licenseUrl.
    * Start is the time that you want this plug-in to execute
-   * End is the time that you want this plug-in to stop executing 
+   * End is the time that you want this plug-in to stop executing
    * Target is the id of the document element that the text needs to be attached to, this target element must exist on the DOM
-   * nameofwork is the title of the attribution 
+   * nameofwork is the title of the attribution
    * NameOfWorkUrl is a url that provides more details about the attribution
    * CopyrightHolder is the name of the person/institution that holds the rights to the attribution
    * CopyrightHolderUrl is the url that provides more details about the copyrightholder
    * license is the type of license that the work is copyrighted under
    * LicenseUrl is the url that provides more details about the ticense type
    * @param {Object} options
-   * 
+   *
    * Example:
      var p = Popcorn('#video')
         .attribution({
@@ -27,9 +27,9 @@
         } )
    *
    */
-  Popcorn.plugin( "attribution" , (function(){ 
-    
-    var 
+  Popcorn.plugin( "attribution" , (function() {
+
+    var
     common = "data:image/png;base64,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",
     licenses = {
       "cc-by": common + "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",
@@ -38,16 +38,16 @@
       "cc-by-nc": common + "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",
       "cc-by-nc-sa": common + "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",
       "cc-by-nc-nd": common + "m8SURBVHja7FpdcBvVFf52pXgGplH11mbkDPbQdqy8oIQmMZRiufwMxRivJiHtFChyZwqUlMoiiWlaO5JCfkBNKqvhp30oUsswMCVMlL9CHRqt4xTLkmKtE7D8UMZisIf2pZLltDO1Vnv6sNprrS1bsgNDGjgz17vW3fvt3W/PPfe75y5HRCaO46bxhX3iRkQcB4AA4HT/KfA8D57nYTAYwPMGGHgevKF05HlwHA+e48BxHMBxGgoIBFIICilQFLUUi0X1qBRRLCpQlCKrU0hh1xOR1hl2fi3YAx3bAAAcANLINRgMauENc+cGg1rHG0okc+A4vpzfEjklYhWVzGKxVMrPi3qSFUVhxJYTfS2RbASgJ9dghFF3VMvJ46cQjUYRj8cxk5/RAa02rcamTZvQ+p1WtN9/H4qKATwvqy+kyIMDV3qXZcNHIXUkoDSGOJXckUQKkTcjSKfTuuutViuELQI2bFxf08NdLTgcAPrL2bdhNBoZqUajUS0GIwbEc/A/68fU1FRNHbJYLOje3Y2WltshF4soFmXIcqkUZchykXl4uSd/PPUxjvQ9j/H0OADAbrfDZrMBACRJgiiKAIAmaxO2u7bjq2u+UvH+//j4n3gh+MJVgfNAxzaV4HcGzsBoMM4Ra1yFVUYjPL1eRI5FWAOz2QxBENDQ0ICWlhYAwMDAADKZDCKRCHK5HLtWcAjY2b0D111/HWRZRkGWIcsFyLKsDxmkYDo7jZ8+/iTy+TwEQUAgEEBDQ4Ous5lMBm63G5FIBCaTCfv9+xc81OX8Zbi2d101OFocprODZ2lw6BwNJYYoKSVo9D2JBIdApcFLZrOZvF4vZbNZWspCoRCZzWbWrsnaROeHBikpJSmWHKLBoXMUHTxLZ8R+evuvb9Hp/lN04q3jZLVaCQA5nU4dnoYz/x4a9hvH/6QrTdamijjBQIB+8L3vXzHOYs+8GA4A4gHAUIrBRoMBRoPec202G1KpFDweD8xm85Lhwel0YmJigg2l8fQ4DvkP62I5zxSJqkYSsQTS6TQEQUD3rl1VQ5DT6YQgCBhPj2MkkdLFyvH0ODasX49bm29hv/+mrw/P+v04efo0nt65C5OTkzXhXGl/dPPNYGyQYskYjYxeoOCRIPMcm81W1WsrWTabJZvNxnCCzwdp5OIIDV+I0fnYIEXPq1781jt/Jus61XsnJiZqxp+YmCAAZLVambdoo6Dp69+gG29ooJZv3UaP//hRAkBer5cOHjhIAOjoG2/UhHOl/angwaoX+5/1s3gbCoWqem0lM5vNiEajrK3/oL+kpUsezJU0Nc8jPZaG3W5fEOM6OzuZl3d2durqGhoaYLfbdTN7Oq3itLe344Ft2zA5OYkz/f248YYG/GfmMh56+CGMvf8+tmzdWhNOeX++1tBYsSyFoxmvyTSeV6WYpha6urrYUF+Jmc1mBAIBAMDU1BROnjjFFiwqyRyTaZXuEw6HK55rVqmNzWaD//AhHPQ/h1dffw1btm7FBx9m4D98CGvXrkX45RDSY2M14ZTbXffcU7FUwwGg6mDNm6LRKCPH5XKxi0RRRDAYZCrBbrfD4/FUrOvo6EBXVxeLT263G7lcDtGzUdzX3lbyXg4cz4FTuE9N5G9ubsbm5mY82eXCkb4gzvT3482jR/Hm0aPY3NwM5486cdfdd9eE9dJvX1pxP9SFBseB5zjE43FVYgkCG96iKKK1tVXXSBRFiKIIl8sFh8OxoG50dBShUIhhhcNhxONxdQXIc2zoa4sPSZIqTh6a5zqdzgX1ldrM/y2fz+NMfz+eO/QrOMc60X5vGwBgOBbDcCyG+vp6cKuMVXHKw0G5/T0zsWR/yjxYfWBthXbTTTexC9xuN4sz0WgUmUwGnZ2deOSRR+Dz+djwOHbsGCRJgtvtZhoZAFpaWhAOhzGTn1HvA67sCKxbtw6iKCKTyejiXigUYgRrL6tcg4qiCKvVqltZzcf5yaOPYTgWw5G+IADggw8z6N6xE5uaN+OiNIo/hMP4cGqyKs4dd925pJdW6o9ORSSlBF0au8hm/Wg0ukCLer3eBbPnUnWaRaNRdt2lsYuUlJL0bvxdGvibSO8MnCGPbw8BIEEQFsWfb4KgavTdPbvZjL27Z/cCnI8++oj2+fbSmjVraPWXVlMwEKDp6ell41SzSjg6FfFZ2i233QLrOisikcgCtVDJtNVTk7VJlwfYsHE9mqxNOpz6+nr8ck8vdrifQntbG37W1QWTybRsnJX0R6ciQPosVnk80WbHcDiMXC4HSZLQ2NgIn8/H6rRlcnld+fCZy4+yP7pO9Hp7YTKZEA6H4XA4WJvyLFsmk4HD4UBfXx9MJhO2u7YveJinf9FdEWfHrp149fXXrhhnfliohsOSPYmROOrq6nDbrd/GTH4GTqeTxb1IJLJgItMmno6OjkXrtPZutxt9fX1YbVqN8+8OYnZ2FrOFWRTkAgoFWU0GFWVk/5XDAd8BpiVtNhtsNhvMZjNEUWQvvVqS5nL+Mp474GdJms8ShyV7hi8Mo66uDr49PkSORWA2m5HNZmuSaZFIBMFgkF1bXgcAjY2NyGQyuOPOO3A4cAj/nZ1FYR7BWt5YKSpIDCdw7Oi1ka5kBMeSQ1i1qg7nz52H60lV/wYCAaZnV2rhcJjFsX0H9uHetu9itjCL2UIBcqGAgjyP4AoJ+P/3hDsPgG3p2FtbYLFYAAA+n69i7KnVcrkck3gWi6WUiC/tYigKlFIsptKW07VqPAAopKBYVPfRntm/lxHkcDh0Od7lkNva2sradv+8u5RgL86RXLZlxCZZura2jNjkDoB6PD2UGImTdClFD//wYV1GLZVKLSuzVJ5JExwCSZdSlBiJ0979e9nvn6My90/XUy5KphIkrSDhns1myev16hLuGzdtpNH3JEpKCerx9HweySVuvijt9fSgwyHAaDTisP8wXvnjKyveMvI944UsyxgejuOJx56o5TuCOf1YyrQRlW2OVvh/MZzF2mj3qIaxFE6lflYNEeWl19OjevKlFL0c/j1ZLJaa35jFYqHgkSBJl1KUlBL04u9erLnt/OXx/PPy36rhVGtfC9YngbPAgzXresqFBx96kG31iNEBnDh+Yslt+/uF+2G3t7ANzePHT2Cfb99yvoRZ1DNq8dxKnlbpuJz+VMOphrkowQCw4eb16PXsQf1aS9luRHm6ETrdqn14MjU5iV8fCuDcwLnlfmp0RaGhWkhYDjGfFM6SBGt2e8vtaGtvw83fvBlfNplKn07NBRgiwnQ+jwvJCzh98vSyif20PPhqiME1EfyFrdw4Irqe47h/f0HFp7DAIOL+NwDFrtvhh4x87AAAAABJRU5ErkJggg=="
-    }, 
+    },
     target;
-    
+
     return {
-    
+
       _setup: function( options ) {
 
-        var attrib = "", 
+        var attrib = "",
         license = options.license && licenses[ options.license.toLowerCase() ],
-        tar = "target=_blank"; 
+        tar = "target=_blank";
 
         // make a div to put the information into
         options._container = document.createElement( "div" );
@@ -89,17 +89,17 @@
             }
           } else {
             attrib += ", license: ";
-            
+
             if ( options.licenseurl ) {
               attrib += "<a href='" + options.licenseurl + "' " + tar + ">" + options.license + "</a> ";
             } else {
               attrib += options.license;
             }
-          } 
+          }
         } else if ( options.licenseurl ) {
           attrib += ", <a href='" + options.licenseurl + "' " + tar + ">license</a> ";
         }
-        
+
         options._container.innerHTML  = attrib;
 
         if ( !target && Popcorn.plugin.debug ) {
@@ -108,18 +108,18 @@
         target && target.appendChild( options._container );
       },
       /**
-       * @member attribution 
-       * The start function will be executed when the currentTime 
-       * of the video  reaches the start time provided by the 
+       * @member attribution
+       * The start function will be executed when the currentTime
+       * of the video  reaches the start time provided by the
        * options variable
        */
       start: function( event, options ) {
         options._container.style.display = "inline";
       },
       /**
-       * @member attribution 
-       * The end function will be executed when the currentTime 
-       * of the video  reaches the end time provided by the 
+       * @member attribution
+       * The end function will be executed when the currentTime
+       * of the video  reaches the end time provided by the
        * options variable
        */
       end: function( event, options ) {
@@ -142,15 +142,47 @@
       website: "github.com/rwldrn"
     },
     options:{
-      start: { elem:"input", type:"text", label:"In" },
-      end: { elem:"input", type:"text", label:"Out" },
-      nameofwork: { elem:"input", type:"text", label:"Name of Work" },
-      nameofworkurl: { elem:"input", type:"text", label:"Url of Work" },
-      copyrightholder: { elem:"input", type:"text", label:"Copyright Holder" },
-      copyrightholderurl: { elem:"input", type:"text", label:"Copyright Holder Url" },
-      license: { elem:"input", type:"text", label:"License type" },
-      licenseurl: { elem:"input", type:"text", label:"License URL" },
+      start: {
+       elem: "input",
+       type: "text",
+       label: "In"
+      },
+      end: {
+        elem: "input",
+        type: "text",
+        label: "Out"
+      },
+      nameofwork: {
+        elem: "input",
+        type: "text",
+        label: "Name of Work"
+      },
+      nameofworkurl: {
+        elem: "input",
+        type: "text",
+        label: "Url of Work"
+      },
+      copyrightholder: {
+        elem: "input",
+        type: "text",
+        label: "Copyright Holder"
+      },
+      copyrightholderurl: {
+        elem: "input",
+        type: "text",
+        label: "Copyright Holder Url"
+      },
+      license: {
+        elem: "input",
+        type: "text",
+        label: "License type"
+       },
+      licenseurl: {
+        elem: "input",
+        type: "text",
+        label: "License URL"
+      },
       target: "attribution-container"
-    } 
+    }
   });
 })( Popcorn );
diff --git a/plugins/attribution/popcorn.attribution.unit.html b/plugins/attribution/popcorn.attribution.unit.html
index 02b6f0320..52592b3d9 100755
--- a/plugins/attribution/popcorn.attribution.unit.html
+++ b/plugins/attribution/popcorn.attribution.unit.html
@@ -4,11 +4,11 @@
   <title>Popcorn Attribution Plugin</title>
   <link rel="stylesheet" href="../../test/qunit/qunit.css" type="text/css" media="screen">
   <script src="../../test/qunit/qunit.js"></script>
-  <!-- 
-    do not move - this must be called immediately prior to 
+  <!--
+    do not move - this must be called immediately prior to
     popcorn-api-draft.js
   -->
-  
+
   <script src="../../popcorn.js"></script>
   <script src="popcorn.attribution.js"></script>
 
@@ -21,23 +21,23 @@ <h2 id="qunit-banner"></h2>
   <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
   <div id="qunit-fixture">  </div>
-  
-  <video id='video' 
-    controls preload='none' 
-    width= '250px'
-    poster="../../test/poster.png"> 
 
-    <source id='mp4'
+  <video id="video"
+    controls preload="none"
+    width= "250px"
+    poster="../../test/poster.png">
+
+    <source id="mp4"
       src="../../test/trailer.mp4"
-      type='video/mp4; codecs="avc1, mp4a"'> 
+      type="video/mp4; codecs='avc1, mp4a'">
 
-    <source id='ogv'
+    <source id="ogv"
       src="../../test/trailer.ogv"
-      type='video/ogg; codecs="theora, vorbis"'> 
+      type="video/ogg; codecs='theora, vorbis'">
 
-    <p>Your user agent does not support the HTML5 Video element.</p> 
+    <p>Your user agent does not support the HTML5 Video element.</p>
 
-  </video> 
-  <div id="attribdiv"></div>  
+  </video>
+  <div id="attribdiv"></div>
 </body>
 </html>
diff --git a/plugins/attribution/popcorn.attribution.unit.js b/plugins/attribution/popcorn.attribution.unit.js
index 7a40e22b0..81359cec3 100755
--- a/plugins/attribution/popcorn.attribution.unit.js
+++ b/plugins/attribution/popcorn.attribution.unit.js
@@ -1,80 +1,79 @@
 test("Popcorn attribution Plugin", function () {
-  
+
   var popped = Popcorn("#video"),
-      expects = 10, 
+      expects = 10,
       count = 0,
       setupId,
-      attributiondiv = document.getElementById('attribdiv');
+      attributiondiv = document.getElementById( "attribdiv" );
+
+  expect( expects );
 
-  expect(expects);
-  
   function plus() {
-    if ( ++count===expects) {
+    if ( ++count===expects ) {
       start();
     }
   }
-  
+
   stop();
-   
-  ok ('attribution' in popped, "attribution is a method of the popped instance");
+
+  ok ( "attribution" in popped, "attribution is a method of the popped instance" );
   plus();
-  
+
   equals ( attributiondiv.childElementCount, 0, "initially, there is nothing inside the attributiondiv" );
   plus();
-  
-  
+
   popped.attribution({
-      start: 0, // seconds
-      end: 2, // seconds
+      start: 0,
+      end: 2,
       nameofwork: "A Shared Culture",
-      copyrightholder:"Jesse Dylan",
+      copyrightholder: "Jesse Dylan",
       licenseurl: "http://creativecommons.org/licenses/by-nc/2.0/",
-      target: 'attribdiv'
-    } )
+      target: "attribdiv"
+    })
     .attribution({
-      start: 2, // seconds
-      end: 4, // seconds
+      start: 2,
+      end: 4,
       nameofwork: "Internet",
-      nameofworkurl:"http://www.archive.org/details/CC1232_internet",
-      copyrightholder:"The Computer Chronicles",
-      license:"CC-BY-NC-ND",
+      nameofworkurl: "http://www.archive.org/details/CC1232_internet",
+      copyrightholder: "The Computer Chronicles",
+      license: "CC-BY-NC-ND",
       licenseurl: "http://creativecommons.org/licenses/by-nc-nd/2.0/",
-      target: 'attribdiv'
-    } )
-    .volume(0);
+      target: "attribdiv"
+    })
+    .volume( 0 );
 
   setupId = popped.getLastTrackEventId();
 
   popped.exec( 0, function() {
     equals ( attributiondiv.childElementCount, 2, "attributiondiv now has two inner elements" );
     plus();
-    equals (attributiondiv.children[0].style.display , "inline", "attribution is visible on the page" );
+    equals ( attributiondiv.children[ 0 ].style.display , "inline", "attribution is visible on the page" );
     plus();
   });
-  
+
   popped.exec( 2, function() {
 
     ok( /target="_blank"/.test( attributiondiv.innerHTML ), "attributions create anchors that target=_blank" );
     plus();
 
-    equals (attributiondiv.children[1].style.display , "inline", "second attribution is visible on the page" );
+    equals ( attributiondiv.children[ 1 ].style.display , "inline", "second attribution is visible on the page" );
     plus();
 
     equals ( typeof popped.data.trackEvents.byStart[ 1 ]._license, "undefined", "undefined license is properly being handled" );
     plus();
   });
-  
+
   popped.exec( 4, function() {
-    equals(attributiondiv.children[1].style.display , "none", "second attribution is no longer visible on the page" );
+    equals( attributiondiv.children[ 1 ].style.display , "none", "second attribution is no longer visible on the page" );
     plus();
-    equals(attributiondiv.children[0].style.display , "none", "first attribution is no longer visible on the page" );
+    equals( attributiondiv.children[ 0 ].style.display , "none", "first attribution is no longer visible on the page" );
     plus();
 
     popped.pause().removeTrackEvent( setupId );
-    ok( !attributiondiv.children[1], "removed attribution was properly destroyed"  );
+    ok( !attributiondiv.children[ 1 ], "removed attribution was properly destroyed" );
     plus();
   });
-  
+
   popped.play();
 
 });
diff --git a/plugins/flickr/popcorn.flickr.html b/plugins/flickr/popcorn.flickr.html
index 31d220859..c71e0387e 100755
--- a/plugins/flickr/popcorn.flickr.html
+++ b/plugins/flickr/popcorn.flickr.html
@@ -4,7 +4,7 @@
   <title>Popcorn Flickr Plug-in Demo</title>
   <!--
     ATTENTION
-  
+
     This demo uses an API key obtained for testing the Flickr Popcorn.js
     plugin. Please do not use it for other purposes.
   -->
@@ -57,19 +57,19 @@ <h1 id="qunit-header">Popcorn Flickr Plug-in Demo</h1>
     <video id="video"
       controls
       width= "250px"
-      poster="../../test/poster.png"> 
+      poster="../../test/poster.png">
 
       <source id="mp4"
         src="../../test/trailer.mp4"
-        type='video/mp4; codecs="avc1, mp4a"'> 
+        type="video/mp4; codecs='avc1, mp4a'">
 
       <source id="ogv"
         src="../../test/trailer.ogv"
-        type='video/ogg; codecs="theora, vorbis"'> 
+        type="video/ogg; codecs='theora, vorbis'">
 
-      <p>Your user agent does not support the HTML5 Video element.</p> 
+      <p>Your user agent does not support the HTML5 Video element.</p>
 
-    </video> 
+    </video>
   </div>
   <div id="flickrdiv"></div>
 </body>
diff --git a/plugins/flickr/popcorn.flickr.js b/plugins/flickr/popcorn.flickr.js
index a4d973814..b231c602d 100755
--- a/plugins/flickr/popcorn.flickr.js
+++ b/plugins/flickr/popcorn.flickr.js
@@ -50,7 +50,7 @@
         _uri,
         _link,
         _image,
-        _count = options.numberofimages || 4 ,
+        _count = options.numberofimages || 4,
         _height = options.height || "50px",
         _width = options.width || "50px",
         _padding = options.padding || "5px",
@@ -66,10 +66,10 @@
     idx++;
 
     // ensure the target container the user chose exists
-
     if ( !target && Popcorn.plugin.debug ) {
       throw new Error( "flickr target container doesn't exist" );
     }
+
     target && target.appendChild( containerDiv );
 
     // get the userid from Flickr API by using the username and apikey
@@ -90,16 +90,21 @@
         }, 5 );
       }
     };
+
     // get the photos from Flickr API by using the user_id and/or tags
     var getFlickrData = function() {
+
       _uri  = "http://api.flickr.com/services/feeds/photos_public.gne?";
+
       if ( _userid ) {
         _uri += "id=" + _userid + "&";
       }
       if ( options.tags ) {
         _uri += "tags=" + options.tags + "&";
       }
+
       _uri += "lang=en-us&format=json&jsoncallback=flickr";
+
       Popcorn.xhr.getJSONP( _uri, function( data ) {
 
         var fragment = document.createElement( "p" );
diff --git a/plugins/flickr/popcorn.flickr.unit.html b/plugins/flickr/popcorn.flickr.unit.html
index 356b11d2b..f810b6000 100755
--- a/plugins/flickr/popcorn.flickr.unit.html
+++ b/plugins/flickr/popcorn.flickr.unit.html
@@ -4,11 +4,11 @@
   <title>Popcorn Flickr</title>
   <link rel="stylesheet" href="../../test/qunit/qunit.css" type="text/css" media="screen">
   <script src="../../test/qunit/qunit.js"></script>
-  <!-- 
-    do not move - this must be called immediately prior to 
+  <!--
+    do not move - this must be called immediately prior to
     popcorn-api-draft.js
   -->
-  
+
   <script src="../../popcorn.js"></script>
   <script src="../../test/jquery.js"></script>
   <script src="popcorn.flickr.js"></script>
@@ -23,23 +23,23 @@ <h2 id="qunit-banner"></h2>
   <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
   <div id="qunit-fixture">  </div>
-  
-  <video id='video' 
-    controls 
-    width= '250px'
-    poster="../../test/poster.png"> 
 
-    <source id='mp4'
+  <video id="video"
+    controls
+    width= "250px"
+    poster="../../test/poster.png">
+
+    <source id="mp4"
       src="../../test/trailer.mp4"
-      type='video/mp4; codecs="avc1, mp4a"'> 
+      type="video/mp4; codecs='avc1, mp4a'">
 
-    <source id='ogv'
+    <source id="ogv"
       src="../../test/trailer.ogv"
-      type='video/ogg; codecs="theora, vorbis"'> 
+      type="video/ogg; codecs='theora, vorbis'">
 
-    <p>Your user agent does not support the HTML5 Video element.</p> 
+    <p>Your user agent does not support the HTML5 Video element.</p>
 
-  </video> 
-  <div id="flickrdiv"></div>  
+  </video>
+  <div id="flickrdiv"></div>
 </body>
 </html>
diff --git a/plugins/flickr/popcorn.flickr.unit.js b/plugins/flickr/popcorn.flickr.unit.js
index e9688fc0b..2e2c7adbb 100755
--- a/plugins/flickr/popcorn.flickr.unit.js
+++ b/plugins/flickr/popcorn.flickr.unit.js
@@ -1,27 +1,27 @@
 test("Popcorn Flickr Plugin", function () {
-  
+
   var popped = Popcorn( "#video" ),
-      expects = 11, 
+      expects = 11,
       count = 0,
       setupId,
       flickrdiv = document.getElementById( "flickrdiv" );
-  
+
   expect( expects );
-  
+
   function plus() {
     if ( ++count === expects ) {
       start();
     }
   }
 
-  stop();   
- 
+  stop();
+
   ok( "flickr" in popped, "flickr is a method of the popped instance" );
   plus();
 
   equals ( flickrdiv.innerHTML, "", "initially, there is nothing inside the flickrdiv" );
   plus();
-  
+
   popped.flickr({
     start: 0,
     end: 3,
@@ -57,28 +57,28 @@ test("Popcorn Flickr Plugin", function () {
 
   popped.exec( 5, function() {
 
-    var numberOfImages = document.getElementById( "flickrdiv" ).childNodes[1].getElementsByTagName( "a" ).length;
+    var numberOfImages = document.getElementById( "flickrdiv" ).childNodes[ 1 ].getElementsByTagName( "a" ).length;
 
     ok( /display: inline;/.test( flickrdiv.innerHTML ), "Div contents are displayed" );
     plus();
-    
+
     ok( /img/.test( flickrdiv.innerHTML ), "An image exists" );
     plus();
-    
+
     ok( /display: inline;/.test( flickrdiv.innerHTML ), "Images tagged 'georgia' are displayed in div" );
     plus();
-    
+
     equal( numberOfImages, 8, "There are 8 images tagged 'georgia' being displayed" );
     plus();
   });
-  
+
   popped.exec( 11, function() {
 
     ok( /display: none;/.test( flickrdiv.innerHTML ), "Div contents are hidden again" );
     plus();
 
     popped.pause().removeTrackEvent( setupId );
-    ok( !flickrdiv.children[2], "Removed flickr was properly destroyed"  );
+    ok( !flickrdiv.children[ 2 ], "Removed flickr was properly destroyed"  );
     plus();
   });
 
@@ -90,10 +90,10 @@ test("Popcorn Flickr Plugin", function () {
   try {
     popped.flickr({});
   } catch( e ) {
-    ok(true, 'empty event was caught by debug');
+    ok( true, "empty event was caught by debug" );
     plus();
   }
 
-  popped.volume(0).play();
-  
+  popped.volume( 0 ).play();
+
 });
diff --git a/plugins/googlefeed/popcorn.googlefeed.html b/plugins/googlefeed/popcorn.googlefeed.html
index 72bc9a195..e426303f8 100755
--- a/plugins/googlefeed/popcorn.googlefeed.html
+++ b/plugins/googlefeed/popcorn.googlefeed.html
@@ -2,30 +2,30 @@
 <html>
 <head>
   <title>Popcorn Google Feed Plug-in Demo</title>
-  
+
   <script src="../../popcorn.js"></script>
   <script src="popcorn.googlefeed.js"></script>
   <script>
-    document.addEventListener('DOMContentLoaded', function () {
-      var p = Popcorn('#video')
-      .volume(0)
+    document.addEventListener("DOMContentLoaded", function () {
+      var p = Popcorn("#video")
+      .volume( 0 )
       .play()
       .googlefeed({
-        start: 0, // seconds
-        end: 15, // seconds
+        start: 0,
+        end: 15,
         target: "feed",
         url: "http://zenit.senecac.on.ca/~chris.tyler/planet/rss20.xml",
         title: "Planet Feed",
         orientation: "Vertical"
-	  } )
+	  })
 	  .googlefeed({
-        start: 5, // seconds
-        end: 20, // seconds
+        start: 5,
+        end: 20,
         target: "feed1",
         url: "http://blog.pikimal.com/geek/feed/",
         title: "pikiGeek",
         orientation: "Horizontal"
-      } );
+      });
     }, false);
   </script>
 </head>
@@ -34,26 +34,30 @@ <h1 id="qunit-header">Popcorn Google Feed Plug-in Demo</h1>
   <p>A Blog feed of Seneca's Planet Feed will be displayed from 0 seconds to 15 seconds</p>
   <p> A Blog feed of pikiGeek's feed will be displayed from 5 seconds to 20 seconds</p>
   <div>
-    <video id='video'
+    <video id="video"
       controls
-      width= '250px'
+      width= "250px"
       poster="../../test/poster.png">
 
-      <source id='mp4'
+      <source id="mp4"
         src="../../test/trailer.mp4"
-        type='video/mp4; codecs="avc1, mp4a"'>
+        type="video/mp4; codecs='avc1, mp4a'">
 
-      <source id='ogv'
+      <source id="ogv"
         src="../../test/trailer.ogv"
-        type='video/ogg; codecs="theora, vorbis"'>
+        type="video/ogg; codecs='theora, vorbis'">
 
       <p>Your user agent does not support the HTML5 Video element.</p>
 
     </video>
   </div>
   <div style="width:1000px">
-    <div id="feed" style="position:relative;float:left;width:400px;height:600px"><p>Vertical Feed:</p></div>
-    <div id="feed1" style="position:relative;float:left;width:600px;height:200px"><p>Horizontal Feed:</p></div>
+    <div id="feed" style="position:relative;float:left;width:400px;height:600px">
+      <p>Vertical Feed:</p>
+    </div>
+    <div id="feed1" style="position:relative;float:left;width:600px;height:200px">
+      <p>Horizontal Feed:</p>
+    </div>
   </div>
 </body>
 </html>
diff --git a/plugins/googlefeed/popcorn.googlefeed.js b/plugins/googlefeed/popcorn.googlefeed.js
index 1a6d1cd4f..1d84f6be9 100755
--- a/plugins/googlefeed/popcorn.googlefeed.js
+++ b/plugins/googlefeed/popcorn.googlefeed.js
@@ -46,7 +46,7 @@
 
         callback: function () {
 
-          dynamicFeedLoad();              
+          dynamicFeedLoad();
         }
       });
     });
@@ -80,6 +80,7 @@
   */
 
   Popcorn.plugin( "googlefeed" , function( options ) {
+
     // create a new div and append it to the parent div so nothing
     // that already exists in the parent div gets overwritten
     var newdiv = document.createElement( "div" ),
@@ -88,7 +89,7 @@
       //ensure that the script has been loaded
       if ( !scriptLoaded ) {
         setTimeout( function () {
-          initialize(); 
+          initialize();
         }, 5 );
       } else {
         // Create the feed control using the user entered url and title
@@ -118,7 +119,7 @@
     target && target.appendChild( newdiv );
 
     initialize();
-    
+
     return {
       /**
        * @member webpage
@@ -146,39 +147,38 @@
   },
   {
     about: {
-      name:    "Popcorn Google Feed Plugin",
+      name: "Popcorn Google Feed Plugin",
       version: "0.1",
-      author:  "David Seifried",
+      author: "David Seifried",
       website: "dseifried.wordpress.com"
     },
     options: {
       start: {
-        elem: "input", 
-        type: "text", 
-        label: "In" 
+        elem: "input",
+        type: "text",
+        label: "In"
       },
-      end: { 
-        elem: "input", 
-        type: "text", 
-        label: "Out" 
+      end: {
+        elem: "input",
+        type: "text",
+        label: "Out"
       },
       target: "feed-container",
-      url: { 
-        elem: "input", 
-        type: "text", 
-        label: "url" 
+      url: {
+        elem: "input",
+        type: "text",
+        label: "url"
       },
-      title: { 
-        elem: "input", 
-        type: "text", 
-        label: "title" 
+      title: {
+        elem: "input",
+        type: "text",
+        label: "title"
       },
       orientation: {
-        elem: "select", 
-        options: [ "Vertical","Horizontal" ], 
-        label: "orientation" 
+        elem: "select",
+        options: [ "Vertical","Horizontal" ],
+        label: "orientation"
       }
     }
   });
-  
 })( Popcorn );
diff --git a/plugins/googlefeed/popcorn.googlefeed.unit.html b/plugins/googlefeed/popcorn.googlefeed.unit.html
index 9bfc36b2e..59e2029c3 100755
--- a/plugins/googlefeed/popcorn.googlefeed.unit.html
+++ b/plugins/googlefeed/popcorn.googlefeed.unit.html
@@ -4,8 +4,8 @@
   <title>Popcorn API</title>
   <link rel="stylesheet" href="../../test/qunit/qunit.css" type="text/css" media="screen">
   <script src="../../test/qunit/qunit.js"></script>
-  <!-- 
-    do not move - this must be called immediately prior to 
+  <!--
+    do not move - this must be called immediately prior to
     popcorn-api-draft.js
   -->
   <script src="../../popcorn.js"></script>
@@ -20,24 +20,24 @@ <h2 id="qunit-banner"></h2>
   <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
   <div id="qunit-fixture">  </div>
-  
-  <video id='video' 
-    controls preload='none' 
-    width= '250px'
-    poster="../../test/poster.png"> 
 
-    <source id='mp4'
+  <video id="video"
+    controls preload="none"
+    width= "250px"
+    poster="../../test/poster.png">
+
+    <source id="mp4"
       src="../../test/trailer.mp4"
-      type='video/mp4; codecs="avc1, mp4a"'> 
+      type="video/mp4; codecs='avc1, mp4a'">
 
-    <source id='ogv'
+    <source id="ogv"
       src="../../test/trailer.ogv"
-      type='video/ogg; codecs="theora, vorbis"'> 
+      type="video/ogg; codecs='theora, vorbis'">
 
-    <p>Your user agent does not support the HTML5 Video element.</p> 
+    <p>Your user agent does not support the HTML5 Video element.</p>
 
-  </video> 
-  <div id="feed" style="position:relative;float:left;width:400px;height:600px"></div> 
-  <div id="feed1" style="position:relative;float:left;width:600px;height:200px"></div>   
+  </video>
+  <div id="feed" style="position:relative;float:left;width:400px;height:600px"></div>
+  <div id="feed1" style="position:relative;float:left;width:600px;height:200px"></div>
 </body>
 </html>
diff --git a/plugins/googlefeed/popcorn.googlefeed.unit.js b/plugins/googlefeed/popcorn.googlefeed.unit.js
index 06aff4af5..0ae174369 100755
--- a/plugins/googlefeed/popcorn.googlefeed.unit.js
+++ b/plugins/googlefeed/popcorn.googlefeed.unit.js
@@ -1,71 +1,71 @@
 test("Popcorn Google Feed Plugin", function () {
-  
+
   var popped = Popcorn( "#video" ),
       expects = 13,
-      setupId, 
+      setupId,
       count = 0;
-  
-  expect(expects);
-  
+
+  expect( expects );
+
   function plus() {
     if ( ++count === expects) {
       start();
     }
   }
-  
+
   stop();
 
-    ok ( 'googlefeed' in popped, "googlefeed is a method of the popped instance" );
+    ok ( "googlefeed" in popped, "googlefeed is a method of the popped instance" );
     plus();
-    ok ( document.getElementById('feed').innerHTML === "", "initially, there is nothing inside the feed" );
+    ok ( document.getElementById( "feed" ).innerHTML === "", "initially, there is nothing inside the feed" );
     plus();
-    ok ( document.getElementById('feed1').innerHTML === "", "initially, there is nothing inside the feed1" );
+    ok ( document.getElementById( "feed1" ).innerHTML === "", "initially, there is nothing inside the feed1" );
     plus();
-  
+
   popped.googlefeed({
-    start: 1, // seconds
-    end: 2, // seconds
+    start: 1,
+    end: 2,
     target: "feed",
     url: "http://zenit.senecac.on.ca/~chris.tyler/planet/rss20.xml",
     title: "Planet Feed",
 	})
 	.googlefeed({
-    start: 2, // seconds
-    end: 3, // seconds
+    start: 2,
+    end: 3,
     target: "feed1",
     url: "http://blog.pikimal.com/geek/feed/",
     title: "pikiGeek",
     orientation: "Horizontal"
   })
-  .volume(0);
+  .volume( 0 );
 
   setupId = popped.getLastTrackEventId();
-  
+
   popped.exec( 1, function() {
-    ok( google.load, "Google Feed is available");
+    ok( google.load, "Google Feed is available" );
     plus();
-    ok( GFdynamicFeedControl, "Dynamic Feed Control Available");
+    ok( GFdynamicFeedControl, "Dynamic Feed Control Available" );
     plus();
-    ok ( document.getElementById('_feed1'), "First feed is on the page" );
+    ok ( document.getElementById( "_feed1" ), "First feed is on the page" );
     plus();
-    equals ( document.getElementById('_feed1').offsetParent.id, "feed", "First feed is inside the 'feed' div" );
+    equals ( document.getElementById( "_feed1" ).offsetParent.id, "feed", "First feed is inside the 'feed' div" );
     plus();
-    equals( popped.data.trackEvents.byStart[1].orientation, "vertical", "Defaulting to vertical orientation" );
+    equals( popped.data.trackEvents.byStart[ 1 ].orientation, "vertical", "Defaulting to vertical orientation" );
     plus();
   });
   popped.exec( 2, function() {
-    ok ( document.getElementById('_feed2'), "Second feed is on the page" );
+    ok ( document.getElementById( "_feed2" ), "Second feed is on the page" );
     plus();
-    equals ( document.getElementById('_feed2').offsetParent.id, "feed1", "Second feed is inside the 'feed2' div" );
+    equals ( document.getElementById( "_feed2" ).offsetParent.id, "feed1", "Second feed is inside the 'feed2' div" );
     plus();
   });
   popped.exec( 3, function() {
-    ok ( document.getElementById('_feed2').style.display === "none" && 
-        document.getElementById('_feed1').style.display === "none", "Both feeds are no lnger visible" );
+    ok ( document.getElementById( "_feed2" ).style.display === "none" &&
+        document.getElementById( "_feed1" ).style.display === "none", "Both feeds are no lnger visible" );
 	  plus();
 
     popped.pause().removeTrackEvent( setupId );
-    ok( !document.getElementById('feed1').children[0], "removed feed was properly destroyed"  );
+    ok( !document.getElementById( "feed1" ).children[ 0 ], "removed feed was properly destroyed"  );
     plus();
   });
 
@@ -77,10 +77,10 @@ test("Popcorn Google Feed Plugin", function () {
   try {
     popped.googlefeed({});
   } catch( e ) {
-    ok(true, 'empty event was caught by debug');
+    ok( true, "empty event was caught by debug" );
     plus();
-  }  
+  }
 
   popped.play();
-  
+
 });
diff --git a/plugins/lowerthird/popcorn.lowerthird.html b/plugins/lowerthird/popcorn.lowerthird.html
index 7fb234f61..c3cb77468 100755
--- a/plugins/lowerthird/popcorn.lowerthird.html
+++ b/plugins/lowerthird/popcorn.lowerthird.html
@@ -2,32 +2,30 @@
 <html>
 <head>
   <title>Popcorn Lower Third Plug-in Demo</title>
-  
+
   <script src="../../popcorn.js"></script>
 
   <script src="popcorn.lowerthird.js"></script>
   <script>
-    document.addEventListener('DOMContentLoaded', function () {
+    document.addEventListener("DOMContentLoaded", function () {
 
-      var p = Popcorn('#video')
+      var p = Popcorn("#video")
       .play()
       .lowerthird({
-        start: 5, // seconds
-        end: 15, // seconds
-        salutation: 'Mr',
-        name: 'Hyde',
-        role: 'Monster'
-      } )
+        start: 5,
+        end: 15,
+        salutation: "Mr",
+        name: "Hyde",
+        role: "Monster"
+      })
       .lowerthird({
-        start: 20, // seconds
-        end: 45, // seconds
-        salutation: 'Dr',
-        name: 'Jekyll',
-        role: 'Person'
-      } )
-
+        start: 20,
+        end: 45,
+        salutation: "Dr",
+        name: "Jekyll",
+        role: "Person"
+      })
     }, false);
-
   </script>
 </head>
 <body>
@@ -36,17 +34,17 @@ <h1 id="qunit-header">Popcorn Lower Third Plug-in Demo</h1>
   <p> At 20 seconds info will appear in the lower third of the video and disappear at 45 seconds.</p>
   <div>
 
-    <video id='video'
+    <video id="video"
       controls height="480" width="854"
       poster="../../test/poster.png">
 
-      <source id='mp4'
+      <source id="mp4"
         src="../../test/trailer.mp4"
-        type='video/mp4; codecs="avc1, mp4a"'>
+        type="video/mp4; codecs='avc1, mp4a'">
 
-      <source id='ogv'
+      <source id="ogv"
         src="../../test/trailer.ogv"
-        type='video/ogg; codecs="theora, vorbis"'>
+        type="video/ogg; codecs='theora, vorbis'">
 
       <p>Your user agent does not support the HTML5 Video element.</p>
 
diff --git a/plugins/lowerthird/popcorn.lowerthird.js b/plugins/lowerthird/popcorn.lowerthird.js
index 0e6277c16..429a6dc03 100755
--- a/plugins/lowerthird/popcorn.lowerthird.js
+++ b/plugins/lowerthird/popcorn.lowerthird.js
@@ -1,9 +1,8 @@
 // PLUGIN: lowerthird
+(function ( Popcorn ) {
 
-(function (Popcorn) {
-  
   /**
-   * Lower Third popcorn plug-in 
+   * Lower Third popcorn plug-in
    * Displays information about a speaker over the video, or in the target div
    * Options parameter will need a start, and end.
    * Optional parameters are target, salutation, name and role.
@@ -14,9 +13,9 @@
    * salutation is the speaker's Mr. Ms. Dr. etc.
    * name is the speaker's name.
    * role is information about the speaker, example Engineer.
-   * 
+   *
    * @param {Object} options
-   * 
+   *
    * Example:
      var p = Popcorn('#video')
         .lowerthird({
@@ -31,7 +30,7 @@
    */
 
   Popcorn.plugin( "lowerthird" , {
-    
+
       manifest: {
         about:{
           name: "Popcorn lowerthird Plugin",
@@ -40,12 +39,32 @@
           website: "http://scottdowne.wordpress.com/"
         },
         options:{
-          start : {elem:'input', type:'text', label:'In'},
-          end : {elem:'input', type:'text', label:'Out'},
-          target : 'lowerthird-container',
-          salutation : {elem:'input', type:'text', label:'Text'},
-          name : {elem:'input', type:'text', label:'Text'},
-          role : {elem:'input', type:'text', label:'Text'}
+          start: {
+            elem: "input",
+            type: "text",
+            label: "In"
+          },
+          end: {
+            elem: "input",
+            type: "text",
+            label: "Out"
+          },
+          target: "lowerthird-container",
+          salutation : {
+            elem: "input",
+            type: "text",
+            label: "Text"
+          },
+          name: {
+            elem: "input",
+            type: "text",
+            label: "Text"
+          },
+          role : {
+            elem: "input",
+            type: "text",
+            label: "Text"
+          }
         }
       },
 
@@ -55,7 +74,7 @@
 
         // Creates a div for all Lower Thirds to use
         if ( !this.container ) {
-          this.container = document.createElement('div');
+          this.container = document.createElement( "div" );
 
           this.container.style.position = "absolute";
           this.container.style.color = "white";
@@ -72,13 +91,14 @@
         }
 
         // if a target is specified, use that
-        if ( options.target && options.target !== "lowerthird-container") {
+        if ( options.target && options.target !== "lowerthird-container" ) {
           options.container = document.createElement( "div" );
           if ( !target && Popcorn.plugin.debug ) {
             throw new Error( "target container doesn't exist" );
           }
           target && target.appendChild( options.container );
-        } else { // use shared default container
+        // use shared default container
+        } else {
           options.container = this.container;
         }
 
@@ -99,10 +119,9 @@
        * of the video reaches the end time provided by the
        * options variable
        */
-      end: function(event, options){
+      end: function(event, options) {
         options.container.innerHTML = "";
       }
-   
-  } );
 
+  } );
 })( Popcorn );
diff --git a/plugins/lowerthird/popcorn.lowerthird.unit.html b/plugins/lowerthird/popcorn.lowerthird.unit.html
index c409b2b36..1d549003b 100755
--- a/plugins/lowerthird/popcorn.lowerthird.unit.html
+++ b/plugins/lowerthird/popcorn.lowerthird.unit.html
@@ -4,13 +4,13 @@
   <title>Popcorn Lower Third Plug-in Test</title>
   <link rel="stylesheet" href="../../test/qunit/qunit.css" type="text/css" media="screen">
   <script src="../../test/qunit/qunit.js"></script>
-  <!-- 
-    do not move - this must be called immediately prior to 
+  <!--
+    do not move - this must be called immediately prior to
     popcorn-api-draft.js
   -->
-  
+
   <script src="../../popcorn.js"></script>
-  
+
   <script src="popcorn.lowerthird.js"></script>
   <script src="popcorn.lowerthird.unit.js"></script>
 </head>
@@ -21,21 +21,21 @@ <h2 id="qunit-banner"></h2>
   <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
   <div id="qunit-fixture">  </div>
-  
-  <video id='video' 
-    controls preload='none' 
-    width= '250px'
-    poster="../../test/poster.png"> 
 
-    <source id='mp4'
+  <video id="video"
+    controls preload"none"
+    width= "250px"
+    poster="../../test/poster.png">
+
+    <source id="mp4"
       src="../../test/trailer.mp4"
-      type='video/mp4; codecs="avc1, mp4a"'> 
+      type="video/mp4; codecs='avc1, mp4a'">
 
-    <source id='ogv'
+    <source id="ogv"
       src="../../test/trailer.ogv"
-      type='video/ogg; codecs="theora, vorbis"'> 
+      type="video/ogg; codecs='theora, vorbis'">
 
-    <p>Your user agent does not support the HTML5 Video element.</p> 
+    <p>Your user agent does not support the HTML5 Video element.</p>
 
   </video>
   <div id="lowerthirddiv"></div>
diff --git a/plugins/lowerthird/popcorn.lowerthird.unit.js b/plugins/lowerthird/popcorn.lowerthird.unit.js
index fc81db04b..29fa1c82a 100755
--- a/plugins/lowerthird/popcorn.lowerthird.unit.js
+++ b/plugins/lowerthird/popcorn.lowerthird.unit.js
@@ -1,29 +1,29 @@
 test( "Popcorn lower third Plugin", function () {
-  
+
   var popped = Popcorn( "#video" ),
-      expects = 8, 
+      expects = 8,
       count = 0,
       lowerthirddiv = document.getElementById( "lowerthirddiv" );
 
-  expect(expects);
-  
+  expect( expects );
+
   function plus() {
     if ( ++count===expects ) {
       start();
     }
   }
-  
+
   stop();
-   
+
   ok ( "lowerthird" in popped, "lowerthird is a method of the popped instance" );
   plus();
-  
+
   equals ( lowerthirddiv.innerHTML, "", "initially, there is nothing inside the lowerthirddiv" );
   plus();
 
   ok( !popped.container, "initially, there is no default div" );
   plus();
-  
+
   // empty track events should be safe
   popped.lowerthird({});
 
@@ -34,44 +34,44 @@ test( "Popcorn lower third Plugin", function () {
       target: "does not exist"
     });
   } catch( e ) {
-    ok(true, 'invalid target event was caught by debug');
+    ok( true, "invalid target event was caught by debug" );
     plus();
   }
 
   popped.lowerthird({
-      start: 0, // seconds
-      end: 2, // seconds
+      start: 0,
+      end: 2,
       salutation: "Mr",
       name: "Hyde",
       role: "Monster"
-    } )
+    })
     .lowerthird({
-      start: 2, // seconds
-      end: 4, // seconds
+      start: 2,
+      end: 4,
       target: "lowerthirddiv",
       salutation: "Dr",
       name: "Jekyll",
       role: "Person"
-    } )
-    .volume(0);
-    
+    })
+    .volume( 0 );
+
   popped.exec( 1, function() {
     equals ( popped.container.innerHTML, "Mr Hyde<br>Monster", "first lowerthird is visible" );
     plus();
   });
-  
+
   popped.exec( 3, function() {
     equals ( lowerthirddiv.innerHTML, "<div>Dr Jekyll<br>Person</div>", "second lowerthird is visible" );
     plus();
   });
-  
+
   popped.exec( 5, function() {
     equals ( popped.container.innerHTML, "", "first lowerthird is empty" );
     plus();
     equals ( lowerthirddiv.innerHTML, "<div></div>", "second lowerthird is empty" );
     plus();
   });
-  
+
   popped.play();
 
 });
diff --git a/plugins/pause/popcorn.pause.html b/plugins/pause/popcorn.pause.html
index 14a058316..0eafa020d 100755
--- a/plugins/pause/popcorn.pause.html
+++ b/plugins/pause/popcorn.pause.html
@@ -6,11 +6,13 @@
   <script src="../../popcorn.js"></script>
   <script src="popcorn.pause.js"></script>
   <script>
-   var output;
+    var output;
 
-   document.addEventListener('DOMContentLoaded', function () {
-     var p = Popcorn( '#video' , { pauseOnLinkClicked : true } )
-         .play();
+    document.addEventListener( "DOMContentLoaded", function () {
+      var p = Popcorn( "#video" , {
+        pauseOnLinkClicked: true
+      })
+      .play();
     }, false);
   </script>
 </head>
@@ -19,19 +21,19 @@ <h1 id="qunit-header">Popcorn Code Plugin Demo</h1>
   <p>The video pauses when links (anchor elements) are clicked</p>
   <div>
     <video id="video"
-      autobuffer="autobuffer"
+      autobuffer = "autobuffer"
       preload="auto"
       controls="controls"
-      width= '250px'
+      width="250px"
       poster="../../test/poster.png">
 
-      <source id='mp4'
+      <source id="mp4"
         src="../../test/trailer.mp4"
-        type='video/mp4; codecs="avc1, mp4a"' />
+        type="video/mp4; codecs='avc1, mp4a'" />
 
-      <source id='ogv'
+      <source id="ogv"
         src="../../test/trailer.ogv"
-        type='video/ogg; codecs="theora, vorbis"' />
+        type="video/ogg; codecs='theora, vorbis'" />
 
       <p>Your user agent does not support the HTML5 Video element.</p>
 
diff --git a/plugins/pause/popcorn.pause.unit.html b/plugins/pause/popcorn.pause.unit.html
index 6362277cd..90b301476 100755
--- a/plugins/pause/popcorn.pause.unit.html
+++ b/plugins/pause/popcorn.pause.unit.html
@@ -23,20 +23,20 @@ <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
   <div id="qunit-fixture">  </div>
 
-  <video id='video'
+  <video id="video"
     autobuffer="autobuffer"
     preload="auto"
     controls="controls"
-    width= '250px'
+    width= "250px"
     poster="../../test/poster.png">
 
-    <source id='mp4'
+    <source id="mp4"
       src="../../test/trailer.mp4"
-      type='video/mp4; codecs="avc1, mp4a"' />
+      type="video/mp4; codecs='avc1, mp4a'" />
 
-    <source id='ogv'
+    <source id="ogv"
       src="../../test/trailer.ogv"
-      type='video/ogg; codecs="theora, vorbis"' />
+      type="video/ogg; codecs='theora, vorbis'" />
 
     <p>Your user agent does not support the HTML5 Video element.</p>
   </video>
@@ -44,16 +44,16 @@ <h2 id="qunit-userAgent"></h2>
     autobuffer="autobuffer"
     preload="auto"
     controls="controls"
-    width= '250px'
+    width= "250px"
     poster="../../test/poster.png">
 
-    <source id='mp4'
+    <source id="mp4"
       src="../../test/trailer.mp4"
-      type='video/mp4; codecs="avc1, mp4a"'>
+      type="video/mp4; codecs='avc1, mp4a'">
 
-    <source id='ogv'
+    <source id="ogv"
       src="../../test/trailer.ogv"
-      type='video/ogg; codecs="theora, vorbis"'>
+      type="video/ogg; codecs='theora, vorbis'">
 
     <p>Your user agent does not support the HTML5 Video element.</p>
   </video>
diff --git a/plugins/pause/popcorn.pause.unit.js b/plugins/pause/popcorn.pause.unit.js
index 0a9937ef0..8a5997c9a 100755
--- a/plugins/pause/popcorn.pause.unit.js
+++ b/plugins/pause/popcorn.pause.unit.js
@@ -1,61 +1,66 @@
-test('Popcorn Pause Plugin', function () {
+test( "Popcorn Pause Plugin", function () {
 
   var expectedTests = 3 ,
-      anchorA = document.getElementById( 'anchorA' ),
-      anchorB = document.getElementById( 'anchorB' ),
-      tolerance = 0.250 ;
-      
+      anchorA = document.getElementById( "anchorA" ),
+      anchorB = document.getElementById( "anchorB" ),
+      tolerance = 0.250;
+
   var simulateClickOn = function ( paramElement ) {
-    
+
     if ( typeof paramElement.click == "Function" ) {
       paramElement.click() ;
       return ;
     }
-      
-    var evt = document.createEvent("MouseEvents");
-    
+
+    var evt = document.createEvent( "MouseEvents" );
+
     evt.initMouseEvent(
-      "click", true, true, window, 
+      "click", true, true, window,
       0, 0, 0, 0, 0, false, false,
       false, false, 0, null
-    ); 
-        
-    paramElement.dispatchEvent(evt);
+    );
+
+    paramElement.dispatchEvent( evt );
   };
-  
-  var otherVideo = Popcorn('#video2' , { pauseOnLinkClicked : true } )
-    .play() ;
-  
-  var popped = Popcorn('#video' , { pauseOnLinkClicked : true } )
-    .code ({
-      start: 2.000,
-      end: 4,
-      onStart: function ( options ) {
-        var currentTime = popped.currentTime() ;
-        simulateClickOn( anchorA ) ;
-        ok (
-          ( currentTime + tolerance >= 2 ) && ( currentTime - tolerance <= 2 ) ,
-          'Video successfully stopped with a click on an anchor at ' +
-          'second 2 approximately (' + currentTime + ')'
-        ) ;
-        //Continue playing
-        popped.play() ;
-      }
-    })
-    .code ({
-      start: 5.561,
-      end : 7,
-      onStart: function ( options ) {
-        var currentTime = popped.currentTime() ;
-        simulateClickOn( anchorB ) ;
-        ok (
-          ( currentTime + tolerance >= 5.561 ) && ( currentTime - tolerance <= 5.561 ) ,
-          'Video successfully stopped with a click on an anchor at ' +
-          'second 5.561 approximately (' + currentTime + ')'
-        ) ;
-        start() ;
-      }
-    });
+
+  var otherVideo = Popcorn( "#video2" , {
+        pauseOnLinkClicked: true
+      });
+  otherVideo.play() ;
+
+  var popped = Popcorn( "#video" , {
+        pauseOnLinkClicked: true
+      });
+
+  popped.code ({
+    start: 2.000,
+    end: 4,
+    onStart: function ( options ) {
+      var currentTime = popped.currentTime() ;
+      simulateClickOn( anchorA ) ;
+      ok (
+        ( currentTime + tolerance >= 2 ) && ( currentTime - tolerance <= 2 ) ,
+        "Video successfully stopped with a click on an anchor at " +
+        "second 2 approximately (" + currentTime + ")"
+      );
+      //Continue playing
+      popped.play() ;
+    }
+  })
+  .code ({
+    start: 5.561,
+    end : 7,
+    onStart: function ( options ) {
+      var currentTime = popped.currentTime() ;
+      simulateClickOn( anchorB ) ;
+      ok (
+        ( currentTime + tolerance >= 5.561 ) && ( currentTime - tolerance <= 5.561 ) ,
+        'Video successfully stopped with a click on an anchor at ' +
+        'second 5.561 approximately (' + currentTime + ')'
+      );
+    start() ;
+    }
+  });
 
   popped.volume(0);
   popped.play();
diff --git a/plugins/tagthisperson/popcorn.tagthisperson.html b/plugins/tagthisperson/popcorn.tagthisperson.html
index bc5afee05..3b2ff517d 100755
--- a/plugins/tagthisperson/popcorn.tagthisperson.html
+++ b/plugins/tagthisperson/popcorn.tagthisperson.html
@@ -2,35 +2,35 @@
 <html>
 <head>
   <title>Popcorn tagthisperson Plug-in Demo</title>
-  
+
   <script src="../../popcorn.js"></script>
   <script src="popcorn.tagthisperson.js"></script>
   <script>
-    document.addEventListener('DOMContentLoaded', function () {
-      var p = Popcorn('#video')
+    document.addEventListener( "DOMContentLoaded", function () {
+      var p = Popcorn( "#video" )
       .play() 
-      .volume(0)
+      .volume( 0 )
       .tagthisperson({
-        start: 0, // seconds
-        end: 10, // seconds
-        person: 'Anna Sob',
-        image: 'http://newshour.s3.amazonaws.com/photos%2Fspeeches%2Fguests%2FRichardNSmith_thumbnail.jpg',
-        href: 'http://annasob.wordpress.com',   
-        target: 'tagdiv'
-      } )
+        start: 0,
+        end: 10,
+        person: "Anna Sob",
+        image: "http://newshour.s3.amazonaws.com/photos%2Fspeeches%2Fguests%2FRichardNSmith_thumbnail.jpg",
+        href: "http://annasob.wordpress.com",
+        target: "tagdiv"
+      })
       .tagthisperson({
-        start: 5, // seconds
-        end: 15, // seconds
-        person: 'Scott',
-        href: 'http://scottdowne.wordpress.com/',
-        target: 'tagdiv'
-      } )
+        start: 5,
+        end: 15,
+        person: "Scott",
+        href: "http://scottdowne.wordpress.com/",
+        target: "tagdiv"
+      })
       .tagthisperson({
-        start: 0, // seconds
-        end: 15, // seconds
-        person: 'Mike',
-        target: 'tagdiv2'
-      } )
+        start: 0,
+        end: 15,
+        person: "Mike",
+        target: "tagdiv2"
+      })
     }, false);
 
   </script>
@@ -41,18 +41,18 @@ <h1 id="qunit-header">Popcorn tagthisperson Plug-in Demo</h1>
   <p> A separate tag displaying Anna Sob  with an image and a URL attached will appear at 0 seconds and disappear at 10 seconds.</p>
   <p> At 5 seconds Scott with a URL attached will be appended to this tag and disappear at 15 seconds.</p>
   <div>
-    <video id='video' 
-      controls preload='none' 
-      width= '250px'
-      poster="../../test/poster.png"> 
+    <video id="video"
+      controls preload="none"
+      width= "250px"
+      poster="../../test/poster.png">
 
-      <source id='mp4'
+      <source id="mp4"
         src="../../test/trailer.mp4"
-        type='video/mp4; codecs="avc1, mp4a"'> 
+        type="video/mp4; codecs='avc1, mp4a'">
 
-      <source id='ogv'
+      <source id="ogv"
         src="../../test/trailer.ogv"
-        type='video/ogg; codecs="theora, vorbis"'> 
+        type="video/ogg; codecs='theora, vorbis'">
 
       <p>Your user agent does not support the HTML5 Video element.</p> 
 
diff --git a/plugins/tagthisperson/popcorn.tagthisperson.js b/plugins/tagthisperson/popcorn.tagthisperson.js
index c0db64a3c..d517466f5 100755
--- a/plugins/tagthisperson/popcorn.tagthisperson.js
+++ b/plugins/tagthisperson/popcorn.tagthisperson.js
@@ -1,7 +1,7 @@
 // PLUGIN: tagthisperson
 
-(function (Popcorn) {
-    
+(function ( Popcorn ) {
+
   var peopleArray = [];
   // one People object per options.target
   var People = function() {
@@ -17,21 +17,21 @@
       return r.toString();
     };
   };
-  
+
   /**
-   * tagthisperson popcorn plug-in 
+   * tagthisperson popcorn plug-in
    * Adds people's names to an element on the page.
    * Options parameter will need a start, end, target, image and person.
    * Start is the time that you want this plug-in to execute
-   * End is the time that you want this plug-in to stop executing 
+   * End is the time that you want this plug-in to stop executing
    * Person is the name of the person who you want to tag
    * Image is the url to the image of the person - optional
-   * href is the url to the webpage of the person - optional   
-   * Target is the id of the document element that the text needs to be 
+   * href is the url to the webpage of the person - optional
+   * Target is the id of the document element that the text needs to be
    * attached to, this target element must exist on the DOM
-   * 
+   *
    * @param {Object} options
-   * 
+   *
    * Example:
      var p = Popcorn('#video')
         .tagthisperson({
@@ -45,9 +45,9 @@
    *
    */
   Popcorn.plugin( "tagthisperson" , ( function() {
-    
+
     return {
-    
+
       _setup: function( options ) {
         var exists = false,
             target = document.getElementById( options.target );
@@ -60,7 +60,7 @@
         // the idea here is to have one object per unique options.target
         for ( var i = 0; i < peopleArray.length; i++ ) {
           if ( peopleArray[ i ].name === options.target ) {
-            options._p = peopleArray[ i ];  
+            options._p = peopleArray[ i ];
             exists = true;
             break;
           }
@@ -72,9 +72,9 @@
         }
       },
       /**
-       * @member tagthisperson 
-       * The start function will be executed when the currentTime 
-       * of the video  reaches the start time provided by the 
+       * @member tagthisperson
+       * The start function will be executed when the currentTime
+       * of the video  reaches the start time provided by the
        * options variable
        */
       start: function( event, options ){
@@ -84,9 +84,9 @@
         document.getElementById( options.target ).innerHTML = options._p.toString();
       },
       /**
-       * @member tagthisperson 
-       * The end function will be executed when the currentTime 
-       * of the video  reaches the end time provided by the 
+       * @member tagthisperson
+       * The end function will be executed when the currentTime
+       * of the video  reaches the end time provided by the
        * options variable
        */
       end: function( event, options ){
@@ -104,12 +104,32 @@
       website: "annasob.wordpress.com"
     },
     options:{
-      start    : {elem:'input', type:'text', label:'In'},
-      end      : {elem:'input', type:'text', label:'Out'},
-      target   : 'tagthisperson-container',
-      person   : {elem:'input', type:'text', label:'Name'},
-      image    : {elem:'input', type:'text', label:'Image Src'},
-      href     : {elem:'input', type:'text', label:'URL'}   
+      start: {
+        elem: "input",
+        type: "text",
+        label: "In"
+      },
+      end: {
+        elem: "input",
+        type: "text",
+        label: "Out"
+      },
+      target : "tagthisperson-container",
+      person: {
+        elem: "input",
+        type: "text",
+        label: "Name"
+      },
+      image: {
+        elem: "input",
+        type: "text",
+        label: "Image Src"
+      },
+      href: {
+        elem: "input",
+        type: "text",
+        label: "URL"
+      }
     }
   });
 
diff --git a/plugins/tagthisperson/popcorn.tagthisperson.unit.html b/plugins/tagthisperson/popcorn.tagthisperson.unit.html
index f5c181245..d18dae78d 100755
--- a/plugins/tagthisperson/popcorn.tagthisperson.unit.html
+++ b/plugins/tagthisperson/popcorn.tagthisperson.unit.html
@@ -4,14 +4,13 @@
   <title>Popcorn tagthisperson test</title>
   <link rel="stylesheet" href="../../test/qunit/qunit.css" type="text/css" media="screen">
   <script src="../../test/qunit/qunit.js"></script>
-  <!-- 
-    do not move - this must be called immediately prior to 
+  <!--
+    do not move - this must be called immediately prior to
     popcorn-api-draft.js
   -->
-  
+
   <script src="../../popcorn.js"></script>
   <script src="popcorn.tagthisperson.js"></script>
-
   <script src="popcorn.tagthisperson.unit.js"></script>
 </head>
 <body>
@@ -21,24 +20,24 @@ <h2 id="qunit-banner"></h2>
   <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
   <div id="qunit-fixture">  </div>
-  
-  <video id='video' 
-    controls preload='none' 
-    width= '250px'
-    poster="../../test/poster.png"> 
 
-    <source id='mp4'
+  <video id="video"
+    controls preload="none"
+    width= "250px"
+    poster="../../test/poster.png">
+
+    <source id="mp4"
       src="../../test/trailer.mp4"
-      type='video/mp4; codecs="avc1, mp4a"'> 
+      type="video/mp4; codecs='avc1, mp4a'">
 
-    <source id='ogv'
+    <source id="ogv"
       src="../../test/trailer.ogv"
-      type='video/ogg; codecs="theora, vorbis"'> 
+      type="video/ogg; codecs='theora, vorbis'">
 
-    <p>Your user agent does not support the HTML5 Video element.</p> 
+    <p>Your user agent does not support the HTML5 Video element.</p>
 
-  </video> 
-  <div id="tagdiv"></div>  
-  <div id="tagdiv2"></div>    
+  </video>
+  <div id="tagdiv"></div>
+  <div id="tagdiv2"></div>
 </body>
 </html>
diff --git a/plugins/tagthisperson/popcorn.tagthisperson.unit.js b/plugins/tagthisperson/popcorn.tagthisperson.unit.js
index fad01cc8d..da2f20701 100755
--- a/plugins/tagthisperson/popcorn.tagthisperson.unit.js
+++ b/plugins/tagthisperson/popcorn.tagthisperson.unit.js
@@ -1,55 +1,55 @@
-test("Popcorn tagthisperson Plugin", function () {
-  
+test( "Popcorn tagthisperson Plugin", function () {
+
   var popped = Popcorn( "#video" ),
-      expects = 8, 
+      expects = 8,
       count = 0,
-      tagdiv = document.getElementById( 'tagdiv' );
-      tagdiv2 = document.getElementById( 'tagdiv2' );
-  
-  expect(expects);
-  
+      tagdiv = document.getElementById( "tagdiv" );
+      tagdiv2 = document.getElementById( "tagdiv2" );
+
+  expect( expects );
+
   function plus() {
     if ( ++count === expects ) {
       start();
     }
   }
-  
+
   stop();
-   
-  ok( 'tagthisperson' in popped, "tagthisperson is a method of the popped instance" );
+
+  ok( "tagthisperson" in popped, "tagthisperson is a method of the popped instance" );
   plus();
-  
+
   equals( tagdiv.innerHTML, "", "initially, there is nothing inside the tagdiv" );
   plus();
-  
+
   popped.tagthisperson({
-    start: 0, // seconds
-    end: 1, // seconds
-    person: 'Anna Sob',
-    image: 'http://newshour.s3.amazonaws.com/photos%2Fspeeches%2Fguests%2FRichardNSmith_thumbnail.jpg',
-    href: 'http://annasob.wordpress.com',           
-    target: 'tagdiv'
+    start: 0,
+    end: 1,
+    person: "Anna Sob",
+    image: "http://newshour.s3.amazonaws.com/photos%2Fspeeches%2Fguests%2FRichardNSmith_thumbnail.jpg",
+    href: "http://annasob.wordpress.com",
+    target: "tagdiv"
   })
   .tagthisperson({
-    start: 1, // seconds
-    end: 2, // seconds
-    person: 'Scott',
-    href: 'http://scottdowne.wordpress.com/',
-    target: 'tagdiv'
+    start: 1,
+    end: 2,
+    person: "Scott",
+    href: "http://scottdowne.wordpress.com/",
+    target: "tagdiv"
   })
   .tagthisperson({
-    start: 1, // seconds
-    end: 2, // seconds
-    person: 'Mike',
-    target: 'tagdiv2'
-  })    
+    start: 1,
+    end: 2,
+    person: "Mike",
+    target: "tagdiv2"
+  })
   .tagthisperson({
-    start: 1, // seconds
-    end: 2, // seconds
-    person: 'Daniel',
-    target: 'tagdiv2'
-  })     
-  .volume(0);
+    start: 1,
+    end: 2,
+    person: "Daniel",
+    target: "tagdiv2"
+  })
+  .volume( 0 );
 
   popped.exec( 0, function() {
     equals( tagdiv.childElementCount, 2, "tagdiv now contains two child elements" );
diff --git a/plugins/webpage/popcorn.webpage.html b/plugins/webpage/popcorn.webpage.html
index 563272cba..5f0ce0663 100644
--- a/plugins/webpage/popcorn.webpage.html
+++ b/plugins/webpage/popcorn.webpage.html
@@ -2,28 +2,28 @@
 <html>
 <head>
   <title>Popcorn WebPage Plug-in Demo</title>
-  
+
   <script src="../../popcorn.js"></script>
   <script src="popcorn.webpage.js"></script>
   <script>
     document.addEventListener('DOMContentLoaded', function () {
       var p = Popcorn('#video')
-      .volume(0)
-      .play() 
+      .volume( 0 )
+      .play()
       .webpage({
-        id: "webpages-a", 
-        start: 0, // seconds
-        end: 5, // seconds
-        src: 'http://webmademovies.org/',
-        target: 'webpagediv'
-      } )
+        id: "webpages-a",
+        start: 0,
+        end: 5,
+        src: "http://webmademovies.org/",
+        target: "webpagediv"
+      })
       .webpage({
-        id: "webpages-b", 
-        start: 0, // seconds
-        end: 10, // seconds
-        src: 'http://zenit.senecac.on.ca/wiki/index.php/Processing.js',
-        target: 'webpagediv2'
-      } );
+        id: "webpages-b",
+        start: 0,
+        end: 10,
+        src: "http://zenit.senecac.on.ca/wiki/index.php/Processing.js",
+        target: "webpagediv2"
+      });
 
     }, false);
 
@@ -34,22 +34,22 @@ <h1 id="qunit-header">Popcorn WebPage Plug-in Demo</h1>
   <p> A Webpage displaying webmademovies.org will appear at 0 seconds and disappear at 5 seconds.</p>
   <p> A Webpage displaying zenit Processing.js wiki will appear at 0 seconds and disappear at 15 seconds.</p>
   <div>
-    <video id='video' 
-      controls preload='none' 
-      width= '250px'
-      poster="../../test/poster.png"> 
+    <video id="video"
+      controls preload="none"
+      width= "250px"
+      poster="../../test/poster.png">
 
-      <source id='mp4'
+      <source id="mp4"
         src="../../test/trailer.mp4"
-        type='video/mp4; codecs="avc1, mp4a"'> 
+        type="video/mp4; codecs='avc1, mp4a'">
 
-      <source id='ogv'
+      <source id="ogv"
         src="../../test/trailer.ogv"
-        type='video/ogg; codecs="theora, vorbis"'> 
+        type="video/ogg; codecs='theora, vorbis'">
 
-      <p>Your user agent does not support the HTML5 Video element.</p> 
+      <p>Your user agent does not support the HTML5 Video element.</p>
 
-    </video> 
+    </video>
   </div>
   <div id="webpagediv" width="50%" height="50%">
   <div id="webpagediv2">
diff --git a/plugins/webpage/popcorn.webpage.js b/plugins/webpage/popcorn.webpage.js
index 1ac06a641..7bd2feb5c 100755
--- a/plugins/webpage/popcorn.webpage.js
+++ b/plugins/webpage/popcorn.webpage.js
@@ -1,24 +1,24 @@
 // PLUGIN: WEBPAGE
 
-(function (Popcorn) {
-  
+(function ( Popcorn ) {
+
   /**
-   * Webpages popcorn plug-in 
+   * Webpages popcorn plug-in
    * Creates an iframe showing a website specified by the user
    * Options parameter will need a start, end, id, target and src.
    * Start is the time that you want this plug-in to execute
-   * End is the time that you want this plug-in to stop executing 
+   * End is the time that you want this plug-in to stop executing
    * Id is the id that you want assigned to the iframe
-   * Target is the id of the document element that the iframe needs to be attached to, 
+   * Target is the id of the document element that the iframe needs to be attached to,
    * this target element must exist on the DOM
    * Src is the url of the website that you want the iframe to display
    *
    * @param {Object} options
-   * 
+   *
    * Example:
      var p = Popcorn('#video')
         .webpage({
-          id: "webpages-a", 
+          id: "webpages-a",
           start: 5, // seconds
           end: 15, // seconds
           src: 'http://www.webmademovies.org',

From ded6de9a0c3958f5002e633010e270bfbaec34af Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Mon, 12 Sep 2011 14:11:47 -0400
Subject: [PATCH 035/140] added Popcorn.p.cue as an alias for exec [#715]

---
 popcorn.js           | 4 +++-
 test/popcorn.unit.js | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index a17798293..8ce92f606 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1794,7 +1794,9 @@
       }
     }
   };
-
+  
+  // alias for exec function
+  Popcorn.p.cue = Popcorn.p.exec;
 
   //  Exposes Popcorn to global context
   global.Popcorn = Popcorn;
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 89855e7d5..5d8c188ef 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -511,7 +511,7 @@ test("exec", function() {
       hasLooped = false,
       loop = 0;
 
-  expect( expects + 1 );
+  expect( expects + 4 );
 
   function plus(){
     if ( ++count == expects ) {
@@ -519,6 +519,9 @@ test("exec", function() {
       setTimeout( function() {
 
         equals( loop, expects, "exec callback repeat check, only called twice" );
+        ok( Popcorn.p.cue, "Popcorn.p.cue exists" );
+				equal( typeof Popcorn.p.cue, "function", "Popcorn.p.cue is a function" );
+				deepEqual( Popcorn.p.cue, Popcorn.p.exec, "Popcorn.p.cue equals Popcorn.p.exec" );
         Popcorn.removePlugin( popped, "exec" );
         start();
 

From b2f8ed4e07166c34bbffe67768b8f422ecc7ae42 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Mon, 12 Sep 2011 20:14:48 -0400
Subject: [PATCH 036/140] Fixed styling in all files in all unit tests

---
 plugins/attribution/popcorn.attribution.html  |  18 +--
 .../attribution/popcorn.attribution.unit.html |   4 +-
 plugins/code/popcorn.code.html                |  28 ++--
 plugins/code/popcorn.code.js                  |  76 +++++----
 plugins/code/popcorn.code.unit.html           |   8 +-
 plugins/code/popcorn.code.unit.js             |  38 ++---
 plugins/facebook/popcorn.facebook.html        |  95 +++++------
 plugins/facebook/popcorn.facebook.js          | 152 +++++++++++++-----
 plugins/facebook/popcorn.facebook.unit.html   |  29 ++--
 plugins/facebook/popcorn.facebook.unit.js     |  85 +++++-----
 plugins/flickr/popcorn.flickr.html            |   4 +-
 plugins/flickr/popcorn.flickr.unit.html       |   4 +-
 plugins/footnote/popcorn.footnote.html        |  46 +++---
 plugins/footnote/popcorn.footnote.js          |  40 +++--
 plugins/footnote/popcorn.footnote.unit.html   |  10 +-
 plugins/footnote/popcorn.footnote.unit.js     |  46 +++---
 plugins/gml/popcorn.gml.html                  |  56 ++++---
 plugins/gml/popcorn.gml.js                    |  32 ++--
 plugins/gml/popcorn.gml.unit.html             |  30 ++--
 plugins/gml/popcorn.gml.unit.js               |  58 +++----
 plugins/googlefeed/.swp                       | Bin 0 -> 12288 bytes
 plugins/googlefeed/popcorn.googlefeed.html    |   4 +-
 .../googlefeed/popcorn.googlefeed.unit.html   |   4 +-
 plugins/googlemap/popcorn.googlemap.html      | 125 ++++++++------
 plugins/googlemap/popcorn.googlemap.js        |  84 +++++-----
 plugins/googlemap/popcorn.googlemap.unit.html |  32 ++--
 plugins/googlemap/popcorn.googlemap.unit.js   |  77 +++++----
 plugins/image/popcorn.image.html              |  17 +-
 plugins/image/popcorn.image.js                |  40 ++---
 plugins/image/popcorn.image.unit.html         |  22 ++-
 plugins/image/popcorn.image.unit.js           |  32 ++--
 plugins/lastfm/popcorn.lastfm.html            |  94 +++++------
 plugins/lastfm/popcorn.lastfm.js              |  88 +++++-----
 plugins/lastfm/popcorn.lastfm.unit.html       |  30 ++--
 plugins/lastfm/popcorn.lastfm.unit.js         |  70 ++++----
 plugins/linkedin/popcorn.linkedin.html        |  31 ++--
 plugins/linkedin/popcorn.linkedin.js          |  54 +++----
 plugins/linkedin/popcorn.linkedin.unit.html   |  29 ++--
 plugins/linkedin/popcorn.linkedin.unit.js     |  80 ++++-----
 plugins/lowerthird/popcorn.lowerthird.html    |   4 +-
 .../lowerthird/popcorn.lowerthird.unit.html   |   4 +-
 plugins/mustache/popcorn.mustache.js          |  66 +++++---
 plugins/mustache/popcorn.mustache.unit.html   |   8 +-
 plugins/mustache/popcorn.mustache.unit.js     |  80 ++++-----
 plugins/openmap/popcorn.openmap.html          |  44 ++---
 plugins/openmap/popcorn.openmap.js            | 114 ++++++++-----
 plugins/openmap/popcorn.openmap.unit.html     |  30 ++--
 plugins/openmap/popcorn.openmap.unit.js       |  90 +++++------
 plugins/pause/popcorn.pause.html              |   4 +-
 plugins/pause/popcorn.pause.unit.html         |   8 +-
 plugins/processing/popcorn.processing.html    |  14 +-
 plugins/processing/popcorn.processing.js      |  60 ++++---
 .../processing/popcorn.processing.unit.html   |  14 +-
 plugins/processing/popcorn.processing.unit.js |  32 ++--
 plugins/subtitle/popcorn.subtitle.html        |  44 +++--
 plugins/subtitle/popcorn.subtitle.js          |  36 ++---
 plugins/subtitle/popcorn.subtitle.unit.html   |  46 +++---
 plugins/subtitle/popcorn.subtitle.unit.js     |  78 +++++----
 .../tagthisperson/popcorn.tagthisperson.html  |   4 +-
 .../popcorn.tagthisperson.unit.html           |   4 +-
 plugins/timeline/popcorn.timeline.html        |  36 ++---
 plugins/timeline/popcorn.timeline.js          |  36 ++---
 plugins/timeline/popcorn.timeline.unit.html   |  28 ++--
 plugins/timeline/popcorn.timeline.unit.js     |  66 ++++----
 plugins/twitter/popcorn.twitter.html          |  49 +++---
 plugins/twitter/popcorn.twitter.js            |  89 ++++++----
 plugins/twitter/popcorn.twitter.unit.html     |  30 ++--
 plugins/twitter/popcorn.twitter.unit.js       |  48 +++---
 plugins/webpage/popcorn.webpage.html          |   8 +-
 plugins/webpage/popcorn.webpage.js            |  64 +++++---
 plugins/webpage/popcorn.webpage.unit.html     |  30 ++--
 plugins/wikipedia/popcorn.wikipedia.html      |  33 ++--
 plugins/wikipedia/popcorn.wikipedia.js        |   2 +-
 plugins/wikipedia/popcorn.wikipedia.unit.html |   8 +-
 plugins/wikipedia/popcorn.wikipedia.unit.js   |  26 +--
 plugins/wordriver/popcorn.wordriver.html      |  42 +++--
 plugins/wordriver/popcorn.wordriver.js        |  46 ++++--
 plugins/wordriver/popcorn.wordriver.unit.html |  30 ++--
 plugins/wordriver/popcorn.wordriver.unit.js   |  67 ++++----
 79 files changed, 1770 insertions(+), 1524 deletions(-)
 create mode 100644 plugins/googlefeed/.swp

diff --git a/plugins/attribution/popcorn.attribution.html b/plugins/attribution/popcorn.attribution.html
index 6b509e247..14ccbf892 100755
--- a/plugins/attribution/popcorn.attribution.html
+++ b/plugins/attribution/popcorn.attribution.html
@@ -6,13 +6,13 @@
   <script src="../../popcorn.js"></script>
   <script src="popcorn.attribution.js"></script>
   <script>
-    document.addEventListener("DOMContentLoaded", function () {
-      var p = Popcorn("#video")
+    document.addEventListener( "DOMContentLoaded", function () {
+      var p = Popcorn( "#video" )
       .play()
-      .volume(0)
+      .volume( 0 )
       .attribution({
-        start: 0, // seconds
-        end: 10, // seconds
+        start: 0,
+        end: 10,
         nameofwork: "A Shared Culture",
         copyrightholder:"Jesse Dylan",
         license: "CC-BY-N6",
@@ -20,8 +20,8 @@
         target: "attribdiv"
       })
       .attribution({
-        start: 5, // seconds
-        end: 15, // seconds
+        start: 5,
+        end: 15,
         nameofwork: "Internet",
         nameofworkurl:"http://www.archive.org/details/CC1232_internet",
         copyrightholder:"The Computer Chronicles",
@@ -44,11 +44,11 @@ <h1 id="qunit-header">Popcorn Attribution Plug-in Demo</h1>
 
       <source id="mp4"
         src="../../test/trailer.mp4"
-        type="viden/mp4; codecs='avc1, mp4a'">
+        type='viden/mp4; codecs="avc1, mp4a"'>
 
       <source id="ogv"
         src="../../test/trailer.ogv"
-        type="video/ogg; codecs='theora, vorbis'">
+        type='video/ogg; codecs="theora, vorbis"'>
 
       <p>Your user agent does not support the HTML5 Video element.</p>
 
diff --git a/plugins/attribution/popcorn.attribution.unit.html b/plugins/attribution/popcorn.attribution.unit.html
index 52592b3d9..92524a88a 100755
--- a/plugins/attribution/popcorn.attribution.unit.html
+++ b/plugins/attribution/popcorn.attribution.unit.html
@@ -29,11 +29,11 @@ <h2 id="qunit-userAgent"></h2>
 
     <source id="mp4"
       src="../../test/trailer.mp4"
-      type="video/mp4; codecs='avc1, mp4a'">
+      type='video/mp4; codecs="avc1, mp4a"'>
 
     <source id="ogv"
       src="../../test/trailer.ogv"
-      type="video/ogg; codecs='theora, vorbis'">
+      type='video/ogg; codecs="theora, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p>
 
diff --git a/plugins/code/popcorn.code.html b/plugins/code/popcorn.code.html
index 0b6932b0f..fe0b1b0a2 100755
--- a/plugins/code/popcorn.code.html
+++ b/plugins/code/popcorn.code.html
@@ -8,19 +8,19 @@
   <script>
    var output;
 
-   document.addEventListener('DOMContentLoaded', function () {
-     output = document.getElementById('output');
+   document.addEventListener( "DOMContentLoaded", function () {
+     output = document.getElementById( "output" );
      var $ = function( id ) {
        return document.getElementById( id.substring( 1 ) );
      };
 
-     var p = Popcorn('#video')
+     var p = Popcorn( "#video" )
 
      .code({
         start: 1,
         end: 3,
         onStart: function( options ) {
-          $('#test1').innerHTML = 'Yes';
+          $( "#test1" ).innerHTML = "Yes";
         }
      })
 
@@ -28,10 +28,10 @@
         start: 5,
         end: 8,
         onStart: function( options ) {
-          $('#test2a').innerHTML = 'Yes';
+          $( "#test2a" ).innerHTML = "Yes";
         },
         onEnd: function ( options ) {
-          $('#test2b').innerHTML = 'Yes';
+          $( "#test2b" ).innerHTML = "Yes";
         }
       })
 
@@ -39,20 +39,20 @@
         start: 10,
         end: 14,
         onStart: function( options ) {
-          $('#test3a').innerHTML = 'Yes';
+          $( "#test3a" ).innerHTML = "Yes";
         },
         onFrame: (function() {
           var count = 0;
           return function ( options ) {
-            $('#test3b').innerHTML = 'Yes (count = ' + ++count + ')';
+            $( "#test3b" ).innerHTML = "Yes (count = " + ++count + ")";
           }
         })(),
         onEnd: function ( options ) {
-          $('#test3c').innerHTML = 'Yes';
+          $( "#test3c" ).innerHTML = "Yes";
         }
       })
 
-      .volume(0)
+      .volume( 0 )
       .play();
     }, false);
   </script>
@@ -61,18 +61,18 @@
   <h1 id="qunit-header">Popcorn Code Plugin Demo</h1>
   <p>Arbitrary JavaScript functions are run.</p>
   <div>
-    <video id='video'
+    <video id="video"
       autobuffer
       preload="auto"
       controls
-      width= '250px'
+      width= "250px"
       poster="../../test/poster.png">
 
-      <source id='mp4'
+      <source id="mp4"
         src="../../test/trailer.mp4"
         type='video/mp4; codecs="avc1, mp4a"'>
 
-      <source id='ogv'
+      <source id="ogv"
         src="../../test/trailer.ogv"
         type='video/ogg; codecs="theora, vorbis"'>
 
diff --git a/plugins/code/popcorn.code.js b/plugins/code/popcorn.code.js
index 98c5d167e..214185fb8 100755
--- a/plugins/code/popcorn.code.js
+++ b/plugins/code/popcorn.code.js
@@ -1,6 +1,6 @@
 // PLUGIN: Code
 
-(function (Popcorn) {
+(function ( Popcorn ) {
 
   /**
    * Code Popcorn Plug-in
@@ -68,26 +68,26 @@
   *
   */
 
-  Popcorn.plugin( 'code' , function(options) {
+  Popcorn.plugin( "code" , function( options ) {
     var running = false;
-  
+
     // Setup a proper frame interval function (60fps), favouring paint events.
-    var step = ( function() {
-    
+    var step = (function() {
+
       var buildFrameRunner = function( runner ) {
         return function( f, options ) {
-    
+
           var _f = function() {
             f();
             if ( running ) {
               runner( _f );
             }
           };
-    
+
           _f();
         };
       };
-    
+
       // Figure out which level of browser support we have for this
       if ( window.webkitRequestAnimationFrame ) {
         return buildFrameRunner( window.webkitRequestAnimationFrame );
@@ -96,31 +96,31 @@
       } else {
         return buildFrameRunner( function( f ) {
           window.setTimeout( f, 16 );
-        } );
+        });
       }
-    
-    } )();
 
-    if ( !options.onStart || typeof options.onStart !== 'function' ) {
+    })();
+
+    if ( !options.onStart || typeof options.onStart !== "function" ) {
 
       if ( Popcorn.plugin.debug ) {
-        throw new Error( 'Popcorn Code Plugin Error: onStart must be a function.' );
+        throw new Error( "Popcorn Code Plugin Error: onStart must be a function." );
       }
       options.onStart = Popcorn.nop;
     }
 
-    if ( options.onEnd && typeof options.onEnd !== 'function' ) {
+    if ( options.onEnd && typeof options.onEnd !== "function" ) {
 
       if ( Popcorn.plugin.debug ) {
-        throw new Error( 'Popcorn Code Plugin Error: onEnd  must be a function.' );
+        throw new Error( "Popcorn Code Plugin Error: onEnd  must be a function." );
       }
       options.onEnd = undefined;
     }
 
-    if ( options.onFrame && typeof options.onFrame !== 'function' ) {
+    if ( options.onFrame && typeof options.onFrame !== "function" ) {
 
       if ( Popcorn.plugin.debug ) {
-        throw new Error( 'Popcorn Code Plugin Error: onFrame  must be a function.' );
+        throw new Error( "Popcorn Code Plugin Error: onFrame  must be a function." );
       }
       options.onFrame = undefined;
     }
@@ -145,20 +145,40 @@
         }
       }
     };
-  }, 
-  { 
+  },
+  {
     about: {
-      name: 'Popcorn Code Plugin',
-      version: '0.1',
-      author: 'David Humphrey (@humphd)',
-      website: 'http://vocamus.net/dave'
+      name: "Popcorn Code Plugin",
+      version: "0.1",
+      author: "David Humphrey (@humphd)",
+      website: "http://vocamus.net/dave"
     },
     options: {
-      start: {elem:'input', type:'text', label:'In'},
-      end: {elem:'input', type:'text', label:'Out'},
-      onStart: {elem:'input', type:'function', label:'onStart'},
-      onFrame: {elem:'input', type:'function', label:'onFrame'},
-      onEnd: {elem:'input', type:'function', label:'onEnd'}
+      start: {
+       elem: "input",
+       type: "text",
+       label: "In"
+      },
+      end: {
+        elem: "input",
+        type: "text",
+        label: "Out"
+      },
+      onStart: {
+        elem: "input",
+        type: "function",
+        label: "onStart"
+      },
+      onFrame: {
+        elem: "input",
+        type: "function",
+        label: "onFrame"
+      },
+      onEnd: {
+        elem: "input",
+        type: "function",
+        label: "onEnd"
+      }
     }
   });
 })( Popcorn );
diff --git a/plugins/code/popcorn.code.unit.html b/plugins/code/popcorn.code.unit.html
index d67e8dc24..5c5b7c9ce 100755
--- a/plugins/code/popcorn.code.unit.html
+++ b/plugins/code/popcorn.code.unit.html
@@ -24,18 +24,18 @@ <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
   <div id="qunit-fixture">  </div>
 
-  <video id='video'
+  <video id="video"
     autobuffer
     preload="auto"
     controls
-    width= '250px'
+    width= "250px"
     poster="../../test/poster.png">
 
-    <source id='mp4'
+    <source id="mp4"
       src="../../test/trailer.mp4"
       type='video/mp4; codecs="avc1, mp4a"'>
 
-    <source id='ogv'
+    <source id="ogv"
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'>
 
diff --git a/plugins/code/popcorn.code.unit.js b/plugins/code/popcorn.code.unit.js
index 1303b049f..441074747 100755
--- a/plugins/code/popcorn.code.unit.js
+++ b/plugins/code/popcorn.code.unit.js
@@ -1,10 +1,10 @@
-test('Popcorn Code Plugin', function () {
+test( "Popcorn Code Plugin", function () {
 
-  var popped = Popcorn('#video'),
+  var popped = Popcorn( "#video" ),
       expects = 9,
       count = 0,
       frames = 0,
-      codeDiv = document.getElementById('code-div');
+      codeDiv = document.getElementById( "code-div" );
 
   expect( expects );
 
@@ -16,18 +16,18 @@ test('Popcorn Code Plugin', function () {
 
   stop();
 
-  ok('code' in popped, 'code is a method of the popped instance');
+  ok( "code" in popped, "code is a method of the popped instance" );
   plus();
 
-  equals ( codeDiv.innerHTML, '', 'initially, there is nothing inside the code-div' );
+  equals ( codeDiv.innerHTML, "", "initially, there is nothing inside the code-div" );
   plus();
 
   popped.code({
     start: 0,
     end: 2,
     onStart: function( options ) {
-      codeDiv.innerHTML = 'Test 1 - onStart (no onEnd)';
-      ok(true, 'Test 1 onStart was run.');
+      codeDiv.innerHTML = "Test 1 - onStart (no onEnd)";
+      ok( true, "Test 1 onStart was run." );
       plus();
     }
   });
@@ -36,13 +36,13 @@ test('Popcorn Code Plugin', function () {
     start: 2,
     end: 4,
     onStart: function( options ) {
-      codeDiv.innerHTML = 'Test 2 - onStart';
-      ok(true, 'Test 2 onStart was run.');
+      codeDiv.innerHTML = "Test 2 - onStart";
+      ok( true, "Test 2 onStart was run." );
       plus();
     },
     onEnd: function ( options ) {
-      codeDiv.innerHTML = 'Test 2 - onEnd';
-      ok(true, 'Test 2 onEnd was run.');
+      codeDiv.innerHTML = "Test 2 - onEnd";
+      ok( true, "Test 2 onEnd was run." );
       plus();
     }
   });
@@ -51,19 +51,19 @@ test('Popcorn Code Plugin', function () {
     start: 4,
     end: 6,
     onStart: function( options ) {
-      codeDiv.innerHTML = 'Test 3 - onStart [Frames: ';
-      ok(true, 'Test 3 onStart was run.');
+      codeDiv.innerHTML = "Test 3 - onStart [Frames: ";
+      ok( true, "Test 3 onStart was run." );
       plus();
     },
     onFrame: function ( options ) {
-      codeDiv.innerHTML += '.';
+      codeDiv.innerHTML += ".";
       frames++;
     },
     onEnd: function ( options ) {
-      codeDiv.innerHTML += '] Test 3 - onEnd';
-      ok(true, 'Test 3 onEnd was run.');
+      codeDiv.innerHTML += "] Test 3 - onEnd";
+      ok( true, "Test 3 onEnd was run." );
       plus();
-      ok(frames > 1, 'Test 3 onFrames was run.');
+      ok( frames > 1, "Test 3 onFrames was run." );
       plus();
       popped.pause();
     }
@@ -77,10 +77,10 @@ test('Popcorn Code Plugin', function () {
   try {
     popped.code({});
   } catch( e ) {
-    ok(true, 'empty event was caught by debug');
+    ok( true, "empty event was caught by debug" );
     plus();
   }
 
-  popped.volume(0);
+  popped.volume( 0 );
   popped.play();
 });
diff --git a/plugins/facebook/popcorn.facebook.html b/plugins/facebook/popcorn.facebook.html
index 695977fd7..2098e9680 100755
--- a/plugins/facebook/popcorn.facebook.html
+++ b/plugins/facebook/popcorn.facebook.html
@@ -2,59 +2,60 @@
 <html>
 <head>
   <title>Popcorn Facebook Plug-in Demo</title>
-  
+
   <script src="../../popcorn.js"></script>
   <script src="popcorn.facebook.js"></script>
   <script>
-    document.addEventListener('DOMContentLoaded', function () {
-      var p = Popcorn('#video')
-      .volume(0)
+    document.addEventListener( "DOMContentLoaded", function () {
+      var p = Popcorn( "#video" )
+      .volume( 0 )
       .play()
       .facebook({
-        type        : "live-stream",
-        target      : "activitydiv",
-        start       : 1,
-        end         : 10,
-        event_app_id: 174243249296725 // id is from example http://developers.facebook.com/docs/reference/plugins/live-stream/
-      } )
+        type: "live-stream",
+        target: "activitydiv",
+        start: 1,
+        end: 10,
+        // id is from example http://developers.facebook.com/docs/reference/plugins/live-stream/
+        event_app_id: 174243249296725
+      })
       .facebook({
-        type  : "LIKE",
+        type: "LIKE",
         target: "likediv",
         layout: "box_count",
-        start : 5,
-        end   : 10
-      } )
+        start: 5,
+        end: 10
+      })
       .facebook({
-        type   : "send",
-        target : "likediv",
-        start  : 1,
-        end    : 5
-      } )
+        type: "send",
+        target: "likediv",
+        start: 1,
+        end: 5
+      })
       .facebook({
-        href  : "http://www.facebook.com/senecacollege",
-        type  : "LIKE-BOX",
-        show_faces : "true",
+        href: "http://www.facebook.com/senecacollege",
+        type: "LIKE-BOX",
+        show_faces: "true",
         header: "false",
         target: "likeboxdiv",
-        start : 6,
-        end   : 10
-      } )
+        start: 6,
+        end: 10
+      })
       .facebook({
-        site  : "http://popcornjs.org/",
-        type  : "ACTIVITY",
+        site: "http://popcornjs.org/",
+        type: "ACTIVITY",
         target: "activitydiv",
         header: true,
-        start : 11,
-        end   : 15
-      } )
+        start: 11,
+        end: 15
+      })
       .facebook({
-        href  : "http://www.facebook.com/senecacollege",
-        type  : "FACEPILE",
+        href: "http://www.facebook.com/senecacollege",
+        type: "FACEPILE",
         target: "facepilediv",
-        width : 300,
-        start : 10,
-        end   : 15
-      } );
+        width: 300,
+        start: 10,
+        end: 15
+      });
     }, false);
 
   </script>
@@ -64,24 +65,24 @@ <h1 id="qunit-header">Popcorn Facebook Plug-in Demo</h1>
   <p>"Like" plugin directly below video. href is the page it's on. "Like box" is below "like". href is set to Seneca College's Facebook page<br/>
   "Facepile" is to the right of the video (must be logged into facebook). href is also set to Seneca College's Facebook page. <br/>
   "Activity feed" is below "Facepile". href is set to popcornjs.org.</p>
-  
+
   <div>
-    <video id='video' 
-      controls preload='none' 
-      width= '350px'
-      poster="../../test/poster.png"> 
+    <video id="video"
+      controls preload="none"
+      width= "350px"
+      poster="../../test/poster.png">
 
-      <source id='mp4'
+      <source id="mp4"
         src="../../test/trailer.mp4"
-        type='video/mp4; codecs="avc1, mp4a"'> 
+        type='video/mp4; codecs="avc1, mp4a"'>
 
-      <source id='ogv'
+      <source id="ogv"
         src="../../test/trailer.ogv"
-        type='video/ogg; codecs="theora, vorbis"'> 
+        type='video/ogg; codecs="theora, vorbis"'>
 
-      <p>Your user agent does not support the HTML5 Video element.</p> 
+      <p>Your user agent does not support the HTML5 Video element.</p>
 
-    </video> 
+    </video>
   </div>
   <div>
     <div id="likediv"></div>
diff --git a/plugins/facebook/popcorn.facebook.js b/plugins/facebook/popcorn.facebook.js
index 0366ed0da..26737ea13 100755
--- a/plugins/facebook/popcorn.facebook.js
+++ b/plugins/facebook/popcorn.facebook.js
@@ -2,7 +2,7 @@
 
 (function(Popcorn, global ) {
 /**
-  * Facebook Popcorn plug-in 
+  * Facebook Popcorn plug-in
   * Places Facebook's "social plugins" inside a div ( http://developers.facebook.com/docs/plugins/ )
   * Sets options according to user input or default values
   * Options parameter will need a target, type, start and end time
@@ -31,7 +31,7 @@
   * Xid - unique identifier if more than one live-streams are on one page
   *
   * @param {Object} options
-  * 
+  *
   * Example:
     var p = Popcorn('#video')
       .facebook({
@@ -61,39 +61,119 @@
   }
 
   Popcorn.plugin( "facebook" , {
-    manifest:{
-      about:{
-        name   : "Popcorn Facebook Plugin",
+    manifest: {
+      about: {
+        name: "Popcorn Facebook Plugin",
         version: "0.1",
-        author : "Dan Ventura",
+        author: "Dan Ventura",
         website: "dsventura.blogspot.com"
       },
-      options:{
-        type   : {elem:"select", options:["LIKE", "LIKE-BOX", "ACTIVITY", "FACEPILE", "LIVE-STREAM", "SEND"], label:"Type"},
-        target : "facebook-container",
-        start  : {elem:'input', type:'number', label:'In'},
-        end    : {elem:'input', type:'number', label:'Out'},
+      options: {
+        type: {
+          elem: "select",
+          options: [ "LIKE", "LIKE-BOX", "ACTIVITY", "FACEPILE", "LIVE-STREAM", "SEND" ],
+          label: "Type"
+        },
+        target: "facebook-container",
+        start: {
+          elem: "input",
+          type: "number",
+          label: "In"
+        },
+        end: {
+          elem: "input",
+          type: "number",
+          label: "Out"
+        },
         // optional parameters:
-        font   : {elem:"input", type:"text", label:"font"},        
-        xid    : {elem:"input", type:"text", label:"Xid"},
-        href   : {elem:"input", type:"text", label:"Href"},
-        site   : {elem:"input", type:"text", label:"Site"},
-        height : {elem:"input", type:"text", label:"Height"},
-        width  : {elem:"input", type:"text", label:"Width"},
-        action : {elem:"select", options:["like", "recommend"], label:"Action"},
-        stream : {elem:"select", options:["false", "true"], label:"Stream"},
-        header : {elem:"select", options:["false", "true"], label:"Header"},
-        layout : {elem:"select", options:["standard", "button_count", "box_count"], label:"Layout"},
-        max_rows     : {elem:"input", type:"text", label:"Max_rows"},
-        border_color : {elem:"input", type:"text", label:"Border_color"},
-        event_app_id : {elem:"input", type:"text", label:"Event_app_id"},
-        colorscheme  : {elem:"select", options:["light", "dark"], label:"Colorscheme"},
-        show_faces   : {elem:"select", options:["false", "true"], label:"Showfaces"},
-        recommendations        : {elem:"select", options:["false", "true"], label:"Recommendations"},
-        always_post_to_friends : {elem:"input",  options:["false", "true"], label:"Always_post_to_friends"}
+        font: {
+          elem: "input",
+          type: "text",
+          label: "font"
+        },
+        xid: {
+          elem: "input",
+          type: "text",
+          label: "Xid"
+        },
+        href: {
+          elem: "input",
+          type: "text",
+          label: "Href"
+        },
+        site: {
+          elem: "input",
+          type: "text",
+          label:"Site"
+        },
+        height: {
+          elem: "input",
+          type: "text",
+          label: "Height"
+        },
+        width: {
+          elem: "input",
+          type: "text",
+          label: "Width"
+        },
+        action: {
+          elem: "select",
+          options: [ "like", "recommend" ],
+          label: "Action"
+        },
+        stream: {
+          elem: "select",
+          options: [ "false", "true" ],
+          label: "Stream"
+        },
+        header: {
+          elem: "select",
+          options: [ "false", "true" ],
+          label: "Header"
+        },
+        layout: {
+          elem: "select",
+          options: [ "standard", "button_count", "box_count" ],
+          label: "Layout"
+        },
+        max_rows: {
+          elem: "input",
+          type: "text",
+          label: "Max_rows"
+        },
+        border_color: {
+          elem: "input",
+          type: "text",
+          label: "Border_color"
+        },
+        event_app_id: {
+          elem: "input",
+          type: "text",
+          label: "Event_app_id"
+        },
+        colorscheme: {
+           elem: "select",
+           options: [ "light", "dark" ],
+           label: "Colorscheme"
+        },
+        show_faces: {
+           elem: "select",
+           options: [ "false", "true" ],
+           label: "Showfaces"
+        },
+        recommendations: {
+           elem: "select",
+           options: [ "false", "true" ],
+           label: "Recommendations"
+        },
+        always_post_to_friends: {
+          elem: "input",
+          options: [ "false", "true" ],
+          label: "Always_post_to_friends"
+        }
       }
     },
-    
+
     _setup: function( options ) {
 
       var target = document.getElementById( options.target );
@@ -104,18 +184,18 @@
         fbRoot.setAttribute( "id", "fb-root" );
         document.body.appendChild( fbRoot );
       }
-      
+
       if ( !ranOnce || options.event_app_id ) {
         ranOnce = true;
         // initialize facebook JS SDK
-        Popcorn.getScript("http://connect.facebook.net/en_US/all.js");
+        Popcorn.getScript( "http://connect.facebook.net/en_US/all.js" );
 
         global.fbAsyncInit = function() {
           FB.init({
-            appId  : ( options.event_app_id || "" ),
-            status : true,
-            cookie : true,
-            xfbml  : true
+            appId: ( options.event_app_id || "" ),
+            status: true,
+            cookie: true,
+            xfbml: true
           });
         };
       }
@@ -134,7 +214,6 @@
 
       options._container = document.createElement( "fb:" + options.type );
 
-
       var setOptions = (function( options ) {
 
         options._container.style.display = "none";
@@ -217,4 +296,3 @@
   });
 
 })( Popcorn, this );
-
diff --git a/plugins/facebook/popcorn.facebook.unit.html b/plugins/facebook/popcorn.facebook.unit.html
index 73bd17b74..ec90985c4 100755
--- a/plugins/facebook/popcorn.facebook.unit.html
+++ b/plugins/facebook/popcorn.facebook.unit.html
@@ -4,13 +4,11 @@
   <title>Popcorn Facebook Plug-in Test</title>
   <link rel="stylesheet" href="../../test/qunit/qunit.css" type="text/css" media="screen">
   <script src="../../test/qunit/qunit.js"></script>
-  <!-- 
-    do not move - this must be called immediately prior to 
+  <!--
+    do not move - this must be called immediately prior to
     popcorn-api-draft.js
   -->
-  
   <script src="../../popcorn.js"></script>
-  
   <script src="popcorn.facebook.js"></script>
   <script src="popcorn.facebook.unit.js"></script>
 </head>
@@ -21,30 +19,29 @@ <h2 id="qunit-banner"></h2>
   <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
   <div id="qunit-fixture">  </div>
-  
+
   <div style="position:absolute;left:300px;">
     <div id="facepilediv"></div>
     <div id="activitydiv"></div>
   </div>
-  <video id='video' 
-    controls preload='none' 
-    width= '250px'
-    poster="../../test/poster.png"> 
+  <video id="video"
+    controls preload="none"
+    width= "250px"
+    poster="../../test/poster.png">
 
-    <source id='mp4'
+    <source id="mp4"
       src="../../test/trailer.mp4"
-      type='video/mp4; codecs="avc1, mp4a"'> 
+      type='video/mp4; codecs="avc1, mp4a"'>
 
-    <source id='ogv'
+    <source id="ogv"
       src="../../test/trailer.ogv"
-      type='video/ogg; codecs="theora, vorbis"'> 
+      type='video/ogg; codecs="theora, vorbis"'>
 
-    <p>Your user agent does not support the HTML5 Video element.</p> 
-  </video> 
+    <p>Your user agent does not support the HTML5 Video element.</p>
+  </video>
   <div>
     <div id="likediv"></div>
     <div id="likeboxdiv"></div>
   </div>
 </body>
 </html>
-
diff --git a/plugins/facebook/popcorn.facebook.unit.js b/plugins/facebook/popcorn.facebook.unit.js
index 84fd5845f..bc36a27e3 100755
--- a/plugins/facebook/popcorn.facebook.unit.js
+++ b/plugins/facebook/popcorn.facebook.unit.js
@@ -1,6 +1,6 @@
-test("Popcorn Facebook Plugin", function () {
-  
-  var popped = Popcorn("#video"),
+test( "Popcorn Facebook Plugin", function () {
+
+  var popped = Popcorn( "#video" ),
       expects = 9,
       count = 0,
       interval,
@@ -8,80 +8,79 @@ test("Popcorn Facebook Plugin", function () {
       interval3,
       interval4,
       subtitlediv;
-  
-  expect(expects);
-  
+
+  expect( expects );
+
   function plus() {
-    if ( ++count===expects) {
+    if ( ++count===expects ) {
       start();
     }
   }
-  
+
   stop();
-   
-  ok ('facebook' in popped, "facebook is a method of the popped instance");
+
+  ok ( "facebook" in popped, "facebook is a method of the popped instance" );
   plus();
 
   popped.facebook({
         target: "likediv",
-        start : 1,
-        end   : 6
-      } )
+        start: 1,
+        end: 6
+      })
       .facebook({
-        href  : "http://www.facebook.com/senecacollege",
-        type  : "LIKE_BOX",
+        href: "http://www.facebook.com/senecacollege",
+        type: "LIKE_BOX",
         target: "likeboxdiv",
-        start : 2,
-        end   : 6
-      } )
+        start: 2,
+        end: 6
+      })
       .facebook({
-        site   : "http://popcornjs.org/",
-        type   : "ACTIVITY",
-        target : "activitydiv",
-        start  : 3,
-        end    : 6
-      } )
+        site: "http://popcornjs.org/",
+        type: "ACTIVITY",
+        target: "activitydiv",
+        start: 3,
+        end: 6
+      })
       .facebook({
-        href   : "http://www.facebook.com/senecacollege",
-        type   : "FACEPILE",
-        target : "facepilediv",
-        start  : 4,
-        end    : 6,
-        width  : 300
-      } )
-    .volume(0)
+        href: "http://www.facebook.com/senecacollege",
+        type: "FACEPILE",
+        target: "facepilediv",
+        start: 4,
+        end: 6,
+        width: 300
+      })
+    .volume( 0 )
     .play();
-    
-  ok (document.getElementById('likediv'), "likediv exists on the page" );
+
+  ok ( document.getElementById( "likediv" ), "likediv exists on the page" );
   plus();
-  ok (document.getElementById('likeboxdiv'), "likeboxdiv exists on the page" );
+  ok ( document.getElementById( "likeboxdiv" ), "likeboxdiv exists on the page" );
   plus();
-  ok (document.getElementById('activitydiv'), "activitydiv exists on the page" );
+  ok ( document.getElementById( "activitydiv" ), "activitydiv exists on the page" );
   plus();
-  ok (document.getElementById('facepilediv'), "facepilediv exists on the page" );
+  ok ( document.getElementById( "facepilediv" ), "facepilediv exists on the page" );
   plus();
-  
+
   // I inspected the html genterated by facebook, and found that there are no uniquely identifying attributes between plug-in types
   // so right now, we just check ot make sure that facebook is returning a plugin and displaying it at the correct time.
-  
+
   popped.exec( 2, function() {
     ok ( document.getElementById( "likediv" ).innerHTML, "likediv is not empty at 0:02 (expected)" );
     plus();
   });
-  
+
   popped.exec( 3, function() {
     ok ( document.getElementById( "likeboxdiv" ).innerHTML, "likeboxdiv is not empty at 0:03 (expected)" );
     plus();
   });
-  
+
   popped.exec( 4, function() {
     ok ( document.getElementById( "activitydiv" ).innerHTML, "Activitydiv is not empty at 0:04 (expected)" );
     plus();
   });
-  
+
   popped.exec( 5, function() {
     ok ( document.getElementById( "facepilediv" ).innerHTML, "Facepilediv is not empty at 0:05 (expected)" );
     plus();
   });
 });
-
diff --git a/plugins/flickr/popcorn.flickr.html b/plugins/flickr/popcorn.flickr.html
index c71e0387e..50d3ee69d 100755
--- a/plugins/flickr/popcorn.flickr.html
+++ b/plugins/flickr/popcorn.flickr.html
@@ -61,11 +61,11 @@ <h1 id="qunit-header">Popcorn Flickr Plug-in Demo</h1>
 
       <source id="mp4"
         src="../../test/trailer.mp4"
-        type="video/mp4; codecs='avc1, mp4a'">
+        type='video/mp4; codecs="avc1, mp4a"'>
 
       <source id="ogv"
         src="../../test/trailer.ogv"
-        type="video/ogg; codecs='theora, vorbis'">
+        type='video/ogg; codecs="theora, vorbis"'>
 
       <p>Your user agent does not support the HTML5 Video element.</p>
 
diff --git a/plugins/flickr/popcorn.flickr.unit.html b/plugins/flickr/popcorn.flickr.unit.html
index f810b6000..dd98cdcb1 100755
--- a/plugins/flickr/popcorn.flickr.unit.html
+++ b/plugins/flickr/popcorn.flickr.unit.html
@@ -31,11 +31,11 @@ <h2 id="qunit-userAgent"></h2>
 
     <source id="mp4"
       src="../../test/trailer.mp4"
-      type="video/mp4; codecs='avc1, mp4a'">
+      type='video/mp4; codecs="avc1, mp4a"'>
 
     <source id="ogv"
       src="../../test/trailer.ogv"
-      type="video/ogg; codecs='theora, vorbis'">
+      type='video/ogg; codecs="theora, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p>
 
diff --git a/plugins/footnote/popcorn.footnote.html b/plugins/footnote/popcorn.footnote.html
index 8d4f4736b..c2267caa5 100755
--- a/plugins/footnote/popcorn.footnote.html
+++ b/plugins/footnote/popcorn.footnote.html
@@ -2,25 +2,25 @@
 <html>
 <head>
   <title>Popcorn footnote Plug-in Demo</title>
-  
+
   <script src="../../popcorn.js"></script>
   <script src="popcorn.footnote.js"></script>
   <script>
     document.addEventListener('DOMContentLoaded', function () {
-      var p = Popcorn('#video')
-      .play() 
+      var p = Popcorn( "#video" )
+      .play()
       .footnote({
-        start: 5, // seconds
-        end: 15, // seconds
-        text: 'This video made exclusively for drumbeat.org',
-        target: 'footnotediv'
-      } )
+        start: 5,
+        end: 15,
+        text: "This video made exclusively for drumbeat.org",
+        target: "footnotediv"
+      })
       .footnote({
-        start: 20, // seconds
-        end: 45, // seconds
-        text: 'Visit webmademovies.org for more details',
-        target: 'footnotediv'
-      } )
+        start: 20,
+        end: 45,
+        text: "Visit webmademovies.org for more details",
+        target: "footnotediv"
+      })
 
     }, false);
 
@@ -31,22 +31,22 @@ <h1 id="qunit-header">Popcorn Footnote Plug-in Demo</h1>
   <p> A footnote displaying This video made exclusively for drumbeat.org' will appear at 5 seconds and disappear at 15 seconds.</p>
   <p> A footnote displaying 'Visit webmademovies.org for more details' will appear at 20 seconds and disappear at 45 seconds.</p>
   <div>
-    <video id='video' 
-      controls preload='none' 
-      width= '250px'
-      poster="../../test/poster.png"> 
+    <video id="video"
+      controls preload="none"
+      width="250px"
+      poster="../../test/poster.png">
 
-      <source id='mp4'
+      <source id="mp4"
         src="../../test/trailer.mp4"
-        type='video/mp4; codecs="avc1, mp4a"'> 
+        type='video/mp4; codecs="avc1, mp4a"'>
 
-      <source id='ogv'
+      <source id="ogv"
         src="../../test/trailer.ogv"
-        type='video/ogg; codecs="theora, vorbis"'> 
+        type='video/ogg; codecs="theora, vorbis"'>
 
-      <p>Your user agent does not support the HTML5 Video element.</p> 
+      <p>Your user agent does not support the HTML5 Video element.</p>
 
-    </video> 
+    </video>
   </div>
   <div id="footnotediv" width="50%" height="50%">
   </div>
diff --git a/plugins/footnote/popcorn.footnote.js b/plugins/footnote/popcorn.footnote.js
index 2f4781c2e..5b76aaab4 100755
--- a/plugins/footnote/popcorn.footnote.js
+++ b/plugins/footnote/popcorn.footnote.js
@@ -1,6 +1,6 @@
 // PLUGIN: Footnote/Text
 
-(function (Popcorn) {
+(function ( Popcorn ) {
 
   /**
    * Footnote popcorn plug-in
@@ -37,17 +37,29 @@
           website: "annasob.wordpress.com"
         },
         options: {
-          start: { elem: "input", type: "text", label: "In" },
-          end: { elem: "input", type: "text", label: "Out" },
-          text: { elem: "input", type: "text", label: "Text" },
+          start: {
+            elem: "input",
+            type: "text",
+            label: "In"
+          },
+          end: {
+            elem: "input",
+            type: "text",
+            label: "Out"
+          },
+          text: {
+            elem: "input",
+            type: "text",
+            label: "Text"
+          },
           target: name + "-container"
         }
       },
-    _setup: function(options) {
+    _setup: function( options ) {
 
       var target = document.getElementById( options.target );
 
-      options._container = document.createElement( 'div' );
+      options._container = document.createElement( "div" );
       options._container.style.display = "none";
       options._container.innerHTML  = options.text;
 
@@ -57,21 +69,21 @@
       target && target.appendChild( options._container );
     },
     /**
-     * @member footnote 
-     * The start function will be executed when the currentTime 
-     * of the video  reaches the start time provided by the 
+     * @member footnote
+     * The start function will be executed when the currentTime
+     * of the video  reaches the start time provided by the
      * options variable
      */
-    start: function(event, options){
+    start: function( event, options ){
       options._container.style.display = "inline";
     },
     /**
-     * @member footnote 
-     * The end function will be executed when the currentTime 
-     * of the video  reaches the end time provided by the 
+     * @member footnote
+     * The end function will be executed when the currentTime
+     * of the video  reaches the end time provided by the
      * options variable
      */
-    end: function(event, options){
+    end: function( event, options ){
       options._container.style.display = "none";
     },
     _teardown: function( options ) {
diff --git a/plugins/footnote/popcorn.footnote.unit.html b/plugins/footnote/popcorn.footnote.unit.html
index ba39a85ff..e42d2ff1c 100755
--- a/plugins/footnote/popcorn.footnote.unit.html
+++ b/plugins/footnote/popcorn.footnote.unit.html
@@ -22,16 +22,16 @@ <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
   <div id="qunit-fixture">  </div>
 
-  <video id='video'
-    controls preload='none'
-    width= '250px'
+  <video id="video"
+    controls preload="none"
+    width="250px"
     poster="../../test/poster.png">
 
-    <source id='mp4'
+    <source id="mp4"
       src="../../test/trailer.mp4"
       type='video/mp4; codecs="avc1, mp4a"'>
 
-    <source id='ogv'
+    <source id="ogv"
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'>
 
diff --git a/plugins/footnote/popcorn.footnote.unit.js b/plugins/footnote/popcorn.footnote.unit.js
index dbdf83f16..d54cd717b 100755
--- a/plugins/footnote/popcorn.footnote.unit.js
+++ b/plugins/footnote/popcorn.footnote.unit.js
@@ -1,12 +1,12 @@
-test("Popcorn Footnote Plugin", function () {
+test( "Popcorn Footnote Plugin", function () {
 
-  var popped = Popcorn("#video"),
+  var popped = Popcorn( "#video" ),
       expects = 8,
       count = 0,
       setupId,
-      footnotediv = document.getElementById("footnotediv");
+      footnotediv = document.getElementById( "footnotediv" );
 
-  expect(expects);
+  expect( expects );
 
   function plus() {
     if ( ++count===expects) {
@@ -16,21 +16,21 @@ test("Popcorn Footnote Plugin", function () {
 
   stop();
 
-  ok ("footnote" in popped, "footnote is a mehtod of the popped instance");
+  ok ( "footnote" in popped, "footnote is a mehtod of the popped instance" );
   plus();
 
   equals ( footnotediv.childElementCount, 0, "initially, there is nothing inside the footnotediv" );
   plus();
 
   popped.footnote({
-    start: 0, // seconds
-    end: 2, // seconds
+    start: 0,
+    end: 2,
     text: "This video made exclusively for drumbeat.org",
     target: "footnotediv"
   })
   .footnote({
-    start: 2, // seconds
-    end: 4, // seconds
+    start: 2,
+    end: 4,
     text: "Visit webmademovies.org for more details",
     target: "footnotediv"
   });
@@ -40,42 +40,42 @@ test("Popcorn Footnote Plugin", function () {
   popped.exec( 0, function() {
     equals ( footnotediv.childElementCount, 2, "footnotediv now has two inner elements" );
     plus();
-    equals (footnotediv.children[0].innerHTML , "This video made exclusively for drumbeat.org", "footnote displaing correct information" );
+    equals ( footnotediv.children[ 0 ].innerHTML , "This video made exclusively for drumbeat.org", "footnote displaing correct information" );
     plus();
-    equals (footnotediv.children[0].style.display , "inline", "footnote is visible on the page" );
+    equals ( footnotediv.children[ 0 ].style.display , "inline", "footnote is visible on the page" );
     plus();
   });
 
   popped.exec( 3, function() {
-    equals (footnotediv.children[1].style.display , "inline", "second footnote is visible on the page" );
+    equals ( footnotediv.children[ 1 ].style.display , "inline", "second footnote is visible on the page" );
     plus();
   });
 
   popped.exec( 4, function() {
-    ok (footnotediv.children[1].style.display === 'none' &&  footnotediv.children[0].style.display === 'none', "footnote are no longer vidible on the page" );
+    ok ( footnotediv.children[ 1 ].style.display === "none" &&  footnotediv.children[0].style.display === 'none', "footnote are no longer vidible on the page" );
     plus();
 
     popped.pause().removeTrackEvent( setupId );
-    ok( !footnotediv.children[1], "removed footnote was properly destroyed"  );
+    ok( !footnotediv.children[ 1 ], "removed footnote was properly destroyed" );
     plus();
   });
-  popped.play().volume(0);
+  popped.play().volume( 0 );
 
 });
 
 
-test("Popcorn Text Plugin", function () {
+test( "Popcorn Text Plugin", function () {
 
-  var popped = Popcorn("#video"),
+  var popped = Popcorn( "#video" ),
       expects = 2,
       count = 0,
       setupId,
       textdiv = document.getElementById( "textdiv" );
 
-  expect(expects);
+  expect( expects );
 
   function plus() {
-    if ( ++count===expects) {
+    if ( ++count===expects ) {
       start();
     }
   }
@@ -84,8 +84,8 @@ test("Popcorn Text Plugin", function () {
   plus();
 
   popped.text({
-    start: 0, // seconds
-    end: 3, // seconds
+    start: 0,
+    end: 3,
     text: "I am an alias",
     target: "textdiv"
   });
@@ -94,8 +94,8 @@ test("Popcorn Text Plugin", function () {
 
   popped.exec( 2, function() {
 
-    equal( textdiv.children[0].innerHTML , "I am an alias", "I am an alias set by Popcorn.p.text" );
+    equal( textdiv.children[ 0 ].innerHTML , "I am an alias", "I am an alias set by Popcorn.p.text" );
     plus();
 
-  }).currentTime(1).play();
+  }).currentTime( 1 ).play();
 });
diff --git a/plugins/gml/popcorn.gml.html b/plugins/gml/popcorn.gml.html
index 9d46f7335..d3b9f1d83 100755
--- a/plugins/gml/popcorn.gml.html
+++ b/plugins/gml/popcorn.gml.html
@@ -2,35 +2,33 @@
 <html>
 <head>
   <title>Popcorn Grafiti Markup Language Plug-in Demo</title>
-  
   <script src="../../popcorn.js"></script>
   <script src="popcorn.gml.js"></script>
   <script>
-    document.addEventListener('DOMContentLoaded', function () {
-      var p = Popcorn('#video')
-      .play() 
-      .volume(0)
+    document.addEventListener( "DOMContentLoaded", function () {
+      var p = Popcorn( "#video" )
+      .play()
+      .volume( 0 )
       .gml({
-        start: 0, // seconds
-        end: 5, // seconds
-        gmltag: '29582',
-        target: 'gmldiv'
+        start: 0,
+        end: 5,
+        gmltag: "29582",
+        target: "gmldiv"
       })
       .gml({
-        start: 10, // seconds
-        end: 20, // seconds
-        gmltag: '155',
-        target: 'gmldiv'
+        start: 10,
+        end: 20,
+        gmltag: "155",
+        target: "gmldiv"
       })
       .gml({
-        start: 20, // seconds
-        end: 40, // seconds
-        gmltag: '161',
-        target: 'gmldiv'
+        start: 20,
+        end: 40,
+        gmltag: "161",
+        target: "gmldiv"
       });
-
     }, false);
-      
+
   </script>
 </head>
 <body>
@@ -39,22 +37,22 @@ <h1 id="qunit-header">Popcorn GML Plug-in Demo</h1>
   <p> A Processing canvas displaying the GML tag <a href="http://000000book.com/data/155">155</a> will appear at 10-20 seconds.</p>
   <p> A Processing canvas displaying the GML tag <a href="http://000000book.com/data/161">161</a> will appear at 20-40 seconds.</p>
   <div>
-    <video id='video' 
-      controls preload='none' 
-      width= '250px'
-      poster="../../test/poster.png"> 
+    <video id="video"
+      controls preload="none"
+      width= "250px"
+      poster="../../test/poster.png">
 
-      <source id='mp4'
+      <source id="mp4"
         src="../../test/trailer.mp4"
-        type='video/mp4; codecs="avc1, mp4a"'> 
+        type='video/mp4; codecs="avc1, mp4a"'>
 
-      <source id='ogv'
+      <source id="ogv"
         src="../../test/trailer.ogv"
-        type='video/ogg; codecs="theora, vorbis"'> 
+        type='video/ogg; codecs="theora, vorbis"'>
 
-      <p>Your user agent does not support the HTML5 Video element.</p> 
+      <p>Your user agent does not support the HTML5 Video element.</p>
 
-    </video> 
+    </video>
   </div>
   <div id="gmldiv"></div>
 </body>
diff --git a/plugins/gml/popcorn.gml.js b/plugins/gml/popcorn.gml.js
index 17cf12f4e..daa8c5543 100755
--- a/plugins/gml/popcorn.gml.js
+++ b/plugins/gml/popcorn.gml.js
@@ -1,11 +1,11 @@
 // PLUGIN: GML
 
-(function (Popcorn) {
+(function ( Popcorn ) {
 
   var gmlPlayer = function( $p ) {
 
         var _stroke = 0,
-            onPt = 0, 
+            onPt = 0,
             onStroke = 0,
             x = null,
             y = null,
@@ -94,9 +94,9 @@
               var tag = data.gml.tag,
                   app_name =  tag.header && tag.header.client && tag.header.client.name;
 
-              rotation = app_name === 'Graffiti Analysis 2.0: DustTag' ||
-                         app_name === 'DustTag: Graffiti Analysis 2.0' ||
-                         app_name === 'Fat Tag - Katsu Edition';
+              rotation = app_name === "Graffiti Analysis 2.0: DustTag" ||
+                         app_name === "DustTag: Graffiti Analysis 2.0" ||
+                         app_name === "Fat Tag - Katsu Edition";
 
               play = function() {
 
@@ -121,18 +121,18 @@
           dataReady();
         };
       };
-  
+
   /**
-   * Grafiti markup Language (GML) popcorn plug-in 
+   * Grafiti markup Language (GML) popcorn plug-in
    * Renders a GML tag inside an HTML element
    * Options parameter will need a mandatory start, end, target, gmltag.
    * Optional parameters: none.
    * Start is the time that you want this plug-in to execute
-   * End is the time that you want this plug-in to stop executing 
+   * End is the time that you want this plug-in to stop executing
    * Target is the id of the document element that you wish to render the grafiti in
    * gmltag is the numerical reference to a gml tag via 000000book.com
    * @param {Object} options
-   * 
+   *
    * Example:
      var p = Popcorn('#video')
        .gml({
@@ -149,7 +149,7 @@
 
       var self = this,
           target = document.getElementById( options.target );
-      
+
       options.endDrawing = options.endDrawing || options.end;
 
       // create a canvas to put in the target div
@@ -189,9 +189,9 @@
       readyCheck();
     },
     /**
-     * @member gml 
-     * The start function will be executed when the currentTime 
-     * of the video  reaches the start time provided by the 
+     * @member gml
+     * The start function will be executed when the currentTime
+     * of the video  reaches the start time provided by the
      * options variable
      */
     start: function( event, options ) {
@@ -200,9 +200,9 @@
       options.container.style.display = "block";
     },
     /**
-     * @member gml 
-     * The end function will be executed when the currentTime 
-     * of the video  reaches the end time provided by the 
+     * @member gml
+     * The end function will be executed when the currentTime
+     * of the video  reaches the end time provided by the
      * options variable
      */
     end: function( event, options ) {
diff --git a/plugins/gml/popcorn.gml.unit.html b/plugins/gml/popcorn.gml.unit.html
index c0761c53d..d16eab853 100755
--- a/plugins/gml/popcorn.gml.unit.html
+++ b/plugins/gml/popcorn.gml.unit.html
@@ -4,14 +4,12 @@
   <title>Popcorn GML Plugin</title>
   <link rel="stylesheet" href="../../test/qunit/qunit.css" type="text/css" media="screen">
   <script src="../../test/qunit/qunit.js"></script>
-  <!-- 
-    do not move - this must be called immediately prior to 
+  <!--
+    do not move - this must be called immediately prior to
     popcorn-api-draft.js
   -->
-  
   <script src="../../popcorn.js"></script>
   <script src="popcorn.gml.js"></script>
-
   <script src="popcorn.gml.unit.js"></script>
 </head>
 <body>
@@ -21,23 +19,23 @@ <h2 id="qunit-banner"></h2>
   <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
   <div id="qunit-fixture">  </div>
-  
-  <video id='video' 
-    controls preload='none' 
-    width= '250px'
-    poster="../../test/poster.png"> 
 
-    <source id='mp4'
+  <video id="video"
+    controls preload="none"
+    width= "250px"
+    poster="../../test/poster.png">
+
+    <source id="mp4"
       src="../../test/trailer.mp4"
-      type='video/mp4; codecs="avc1, mp4a"'> 
+      type='video/mp4; codecs="avc1, mp4a"'>
 
-    <source id='ogv'
+    <source id="ogv"
       src="../../test/trailer.ogv"
-      type='video/ogg; codecs="theora, vorbis"'> 
+      type='video/ogg; codecs="theora, vorbis"'>
 
-    <p>Your user agent does not support the HTML5 Video element.</p> 
+    <p>Your user agent does not support the HTML5 Video element.</p>
 
-  </video> 
-  <div id="gmldiv"></div>  
+  </video>
+  <div id="gmldiv"></div>
 </body>
 </html>
diff --git a/plugins/gml/popcorn.gml.unit.js b/plugins/gml/popcorn.gml.unit.js
index da2537537..48d9ad238 100755
--- a/plugins/gml/popcorn.gml.unit.js
+++ b/plugins/gml/popcorn.gml.unit.js
@@ -1,56 +1,56 @@
-test("Popcorn GML Plugin", function () {
-  
-  var popped = Popcorn("#video"),
-      expects = 8, 
+test( "Popcorn GML Plugin", function () {
+
+  var popped = Popcorn( "#video" ),
+      expects = 8,
       count = 0,
       setupId,
-      gmldiv = document.getElementById('gmldiv');
+      gmldiv = document.getElementById( "gmldiv" );
+
+  expect( expects );
 
-  expect(expects);
-  
   function plus() {
-    if ( ++count===expects) {
+    if ( ++count===expects ) {
       start();
     }
   }
-  
+
   stop( 10000 );
-   
-  ok ('gml' in popped, "gml is a method of the popped instance");
+
+  ok ( "gml" in popped, "gml is a method of the popped instance" );
   plus();
-  
+
   equals ( gmldiv.childElementCount, 0, "initially, there is nothing inside the gmldiv" );
   plus();
-  
+
   popped.gml({
-    start: 0, // seconds
-    end: 2, // seconds
-    gmltag: '29582',
-    target: 'gmldiv'
+    start: 0,
+    end: 2,
+    gmltag: "29582",
+    target: "gmldiv"
   })
   .gml({
-    start: 2, // seconds
-    end: 4, // seconds
-    gmltag: '155',
-    target: 'gmldiv'
+    start: 2,
+    end: 4,
+    gmltag: "155",
+    target: "gmldiv"
   }).volume( 0 );
 
   setupId = popped.getLastTrackEventId();
 
   popped.exec( 0, function() {
-    equals( gmldiv.children[0].style.display , "block", "first GML is visible on the page" );
+    equals( gmldiv.children[ 0 ].style.display , "block", "first GML is visible on the page" );
     plus();
   });
-  
+
   popped.exec( 3, function() {
-    equals( gmldiv.children[1].style.display , "block", "second GML is visible on the page" );
+    equals( gmldiv.children[ 1 ].style.display , "block", "second GML is visible on the page" );
     plus();
   });
-  
+
   popped.exec( 4, function() {
-    equals( gmldiv.children[1].style.display , "none", "second GML is no longer visible on the page" );
+    equals( gmldiv.children[ 1 ].style.display , "none", "second GML is no longer visible on the page" );
     plus();
-    equals( gmldiv.children[0].style.display , "none", "first GML is no longer visible on the page" );
+    equals( gmldiv.children[ 0 ].style.display , "none", "first GML is no longer visible on the page" );
     plus();
 
     popped.pause().removeTrackEvent( setupId );
@@ -58,10 +58,10 @@ test("Popcorn GML Plugin", function () {
     ok( !Processing.getInstanceById( "canvas155" ), "Processing insteance was properly destroyed"  );
     plus();
 
-    ok( !gmldiv.children[1], "canvas element was properly removed"  );
+    ok( !gmldiv.children[ 1 ], "canvas element was properly removed"  );
     plus();
   });
-  
+
   popped.play();
 
 });
diff --git a/plugins/googlefeed/.swp b/plugins/googlefeed/.swp
new file mode 100644
index 0000000000000000000000000000000000000000..d3b0a86be26b7df2e4a161e6c205fd0d7729ecbf
GIT binary patch
literal 12288
zcmeI%u?vDg6vy#rTQn5)4_M8L<<J_@(jc_heyM>ZTx7KNfA+^zCwZ%jpv(8bdw9p=
z_xNn$IXE36cjJd*)}-40YqS+f%PhaxgNC|S&pa)?NF_V1uio*l{X!?IXlUUI0R%c1
z7{=jx6;!dy#oV1u<IX1_5CH@bKmY**5I_I{1o{(r+#GqC_(45_txo-JYkw1xi~s@%
zAb<b@2q1s}0tg_000M0VR4Vcwi+s#e{r|V$|6hC7Hh_Kv5I_I{1Q0*~0R#|0009IL
H=w09kY?c+y

literal 0
HcmV?d00001

diff --git a/plugins/googlefeed/popcorn.googlefeed.html b/plugins/googlefeed/popcorn.googlefeed.html
index e426303f8..f3bb0b912 100755
--- a/plugins/googlefeed/popcorn.googlefeed.html
+++ b/plugins/googlefeed/popcorn.googlefeed.html
@@ -41,11 +41,11 @@ <h1 id="qunit-header">Popcorn Google Feed Plug-in Demo</h1>
 
       <source id="mp4"
         src="../../test/trailer.mp4"
-        type="video/mp4; codecs='avc1, mp4a'">
+        type='video/mp4; codecs="avc1, mp4a"'>
 
       <source id="ogv"
         src="../../test/trailer.ogv"
-        type="video/ogg; codecs='theora, vorbis'">
+        type='video/ogg; codecs="theora, vorbis"'>
 
       <p>Your user agent does not support the HTML5 Video element.</p>
 
diff --git a/plugins/googlefeed/popcorn.googlefeed.unit.html b/plugins/googlefeed/popcorn.googlefeed.unit.html
index 59e2029c3..2f63a8a7b 100755
--- a/plugins/googlefeed/popcorn.googlefeed.unit.html
+++ b/plugins/googlefeed/popcorn.googlefeed.unit.html
@@ -28,11 +28,11 @@ <h2 id="qunit-userAgent"></h2>
 
     <source id="mp4"
       src="../../test/trailer.mp4"
-      type="video/mp4; codecs='avc1, mp4a'">
+      type='video/mp4; codecs="avc1, mp4a"'>
 
     <source id="ogv"
       src="../../test/trailer.ogv"
-      type="video/ogg; codecs='theora, vorbis'">
+      type='video/ogg; codecs="theora, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p>
 
diff --git a/plugins/googlemap/popcorn.googlemap.html b/plugins/googlemap/popcorn.googlemap.html
index d0cac6429..a14b6f17d 100755
--- a/plugins/googlemap/popcorn.googlemap.html
+++ b/plugins/googlemap/popcorn.googlemap.html
@@ -6,22 +6,22 @@
   <script src="../../popcorn.js"></script>
   <script src="popcorn.googlemap.js"></script>
   <script type="text/javascript">
-    document.addEventListener('DOMContentLoaded', function () {
-      var p = Popcorn('#video')
-      .volume(0)
+    document.addEventListener( "DOMContentLoaded", function () {
+      var p = Popcorn( "#video" )
+      .volume( 0 )
       .play()
       .googlemap({
-        start: 0, // seconds
-        end: 20, // seconds
+        start: 0,
+        end: 20,
         type: "ROADMAP",
         target: "map",
         lat: 43.665429,
         lng: -79.403323,
         zoom: "10"
-      } )
+      })
       .googlemap({
-        start: 0, // seconds
-        end: 40, // seconds
+        start: 0,
+        end: 40,
         type: "STREETVIEW",
         target: "map3",
         location: "6th Line, Oakville, Ontario",
@@ -34,8 +34,8 @@
 				tween: "York university"
       })
       .googlemap({
-        start: 0, // seconds
-        end: 40, // seconds
+        start: 0,
+        end: 40,
         type: "STREETVIEW",
         target: "map5",
         location: "Buffallo",
@@ -48,8 +48,8 @@
 				tween: "Ottawa"
       })
       .googlemap({
-        start: 0, // seconds
-        end: 20, // seconds
+        start: 0,
+        end: 20,
         type: "STREETVIEW",
         target: "map4",
         lat: 35.7795324,
@@ -57,45 +57,80 @@
         zoom: "1",
         heading: "180",
         pitch: "1",
-        tween:[ 
+        tween: [
+          {
+            position: {
+              lat: 35.778056,
+              lng: -78.63903579999999
+            },
+            pov: {
+              heading: 183.5,
+              zoom: 1,
+              pitch: 1
+            },
+            interval: 2000
+          },
           {
-            position: {lat: 35.778056, lng: -78.63903579999999}, 
-            pov: {heading: 183.5, zoom: 1, pitch:1}, 
-            interval:2000 
+            position: {
+              lat: 35.7770258,
+              lng: -78.63929150000001
+            },
+            pov: {
+              heading: 180,
+              zoom: 1,
+              pitch: 1
+            },
+            interval: 2000
           },
-          {	
-            position: {lat: 35.7770258, lng: -78.63929150000001}, 
-            pov: {heading: 180, zoom: 1, pitch:1},
-            interval:2000
+          {
+            position: {
+              lat: 35.775581,
+              lng: -78.639395
+            },
+            pov: {
+              heading: 180,
+              zoom: 1,
+              pitch: 1
+            },
+            interval: 2000
           },
-          {	
-            position: {lat: 35.775581, lng: -78.639395}, 
-            pov: {heading: 180, zoom: 1, pitch:1},
-            interval:2000
-          }, 
-          {	
-            position: {lat: 35.775581, lng: -78.639395}, 
-            pov: {heading: 105, zoom: 1, pitch:1},
-            interval:2000
+          {
+            position: {
+              lat: 35.775581,
+              lng: -78.639395
+            },
+            pov: {
+              heading: 105,
+              zoom: 1,
+              pitch: 1
+            },
+            interval: 2000
           },
-          {	
-            position: {lat: 35.775581, lng: -78.639395}, 
-          	pov: {heading: 0, zoom: 1, pitch:1},
-          	interval:2000
-          }	
+          {
+            position: {
+              lat: 35.775581,
+              lng: -78.639395
+            },
+            pov: {
+              heading: 0,
+              zoom: 1,
+              pitch: 1
+            },
+          	interval: 2000
+          }
         ]
-      } )
+      })
       .googlemap({
-        start: 0, // seconds
-        end: 30, // seconds
+        start: 0,
+        end: 30,
         type: "ROADMAP",
         target: "map2",
         location:"boston",
         zoom: 15
-      } )
+      })
       .googlemap({
-        start: 0, // seconds
-        end: 20, // seconds
+        start: 0,
+        end: 20,
         type: "STREETVIEW",
         target: "map1",
         lat: 43.665429,
@@ -103,7 +138,7 @@
         zoom: "1",
         heading: "0",
         pitch: "1"
-      } );
+      });
     }, false);
   </script>
 </head>
@@ -118,16 +153,16 @@ <h1 id="qunit-header">Popcorn google Map Plug-in Demo</h1>
   <p> A Google Map Streetview tweening from Buffallo to Ottawa  will appear at 0 seconds and disaapear at 40 seconds</p>
   <div>
 
-    <video id='video'
+    <video id="video"
       controls
-      width= '250px'
+      width= "250px"
       poster="../../test/poster.png">
 
-      <source id='mp4'
+      <source id="mp4"
         src="../../test/trailer.mp4"
         type='video/mp4; codecs="avc1, mp4a"'>
 
-      <source id='ogv'
+      <source id="ogv"
         src="../../test/trailer.ogv"
         type='video/ogg; codecs="theora, vorbis"'>
 
diff --git a/plugins/googlemap/popcorn.googlemap.js b/plugins/googlemap/popcorn.googlemap.js
index 56b12ee71..358bc6503 100755
--- a/plugins/googlemap/popcorn.googlemap.js
+++ b/plugins/googlemap/popcorn.googlemap.js
@@ -1,31 +1,31 @@
 
 // PLUGIN: Google Maps
 var googleCallback;
-(function (Popcorn) {
+(function ( Popcorn ) {
 
   var i = 1,
     _mapFired = false,
     _mapLoaded = false,
     geocoder, loadMaps;
-  //google api callback 
-  googleCallback = function (data) {
-    // ensure all of the maps functions needed are loaded 
+  //google api callback
+  googleCallback = function ( data ) {
+    // ensure all of the maps functions needed are loaded
     // before setting _maploaded to true
-    if (typeof google !== "undefined" && google.maps && google.maps.Geocoder && google.maps.LatLng) {
+    if ( typeof google !== "undefined" && google.maps && google.maps.Geocoder && google.maps.LatLng ) {
       geocoder = new google.maps.Geocoder();
       _mapLoaded = true;
     } else {
       setTimeout(function () {
-        googleCallback(data);
+        googleCallback( data );
       }, 1);
     }
   };
   // function that loads the google api
   loadMaps = function () {
     // for some reason the Google Map API adds content to the body
-    if (document.body) {
+    if ( document.body ) {
       _mapFired = true;
-      Popcorn.getScript("http://maps.google.com/maps/api/js?sensor=false&callback=googleCallback");
+      Popcorn.getScript( "http://maps.google.com/maps/api/js?sensor=false&callback=googleCallback" );
     } else {
       setTimeout(function () {
         loadMaps();
@@ -75,19 +75,19 @@ var googleCallback;
    } )
    *
    */
-  Popcorn.plugin("googlemap", function (options) {
+  Popcorn.plugin( "googlemap", function ( options ) {
     var newdiv, map, location,
         target = document.getElementById( options.target );
 
     // if this is the firest time running the plugins
     // call the function that gets the sctipt
-    if (!_mapFired) {
+    if ( !_mapFired ) {
       loadMaps();
     }
 
     // create a new div this way anything in the target div is left intact
     // this is later passed on to the maps api
-    newdiv = document.createElement("div");
+    newdiv = document.createElement( "div" );
     newdiv.id = "actualmap" + i;
     newdiv.style.width = "100%";
     newdiv.style.height = "100%";
@@ -102,26 +102,26 @@ var googleCallback;
     // ensure that google maps and its functions are loaded
     // before setting up the map parameters
     var isMapReady = function () {
-      if (_mapLoaded) {
-        if (options.location) {
+      if ( _mapLoaded ) {
+        if ( options.location ) {
           // calls an anonymous google function called on separate thread
           geocoder.geocode({
             "address": options.location
-          }, function (results, status) {
-            if (status === google.maps.GeocoderStatus.OK) {
-              options.lat = results[0].geometry.location.lat();
-              options.lng = results[0].geometry.location.lng();
-              location = new google.maps.LatLng(options.lat, options.lng);
-              map = new google.maps.Map(newdiv, {
-                mapTypeId: google.maps.MapTypeId[options.type] || google.maps.MapTypeId.HYBRID
+          }, function ( results, status ) {
+            if ( status === google.maps.GeocoderStatus.OK ) {
+              options.lat = results[ 0 ].geometry.location.lat();
+              options.lng = results[ 0 ].geometry.location.lng();
+              location = new google.maps.LatLng( options.lat, options.lng );
+              map = new google.maps.Map( newdiv, {
+                mapTypeId: google.maps.MapTypeId[ options.type ] || google.maps.MapTypeId.HYBRID
               });
               map.getDiv().style.display = "none";
             }
           });
         } else {
-          location = new google.maps.LatLng(options.lat, options.lng);
-          map = new google.maps.Map(newdiv, {
-            mapTypeId: google.maps.MapTypeId[options.type] || google.maps.MapTypeId.HYBRID
+          location = new google.maps.LatLng( options.lat, options.lng );
+          map = new google.maps.Map( newdiv, {
+            mapTypeId: google.maps.MapTypeId[ options.type ] || google.maps.MapTypeId.HYBRID
           });
           map.getDiv().style.display = "none";
         }
@@ -150,7 +150,7 @@ var googleCallback;
           if ( map ) {
             map.getDiv().style.display = "block";
             // reset the location and zoom just in case the user plaid with the map
-            google.maps.event.trigger(map, 'resize');
+            google.maps.event.trigger( map, "resize" );
             map.setCenter( location );
 
             // make sure options.zoom is a number
@@ -171,8 +171,6 @@ var googleCallback;
               options.pitch = +options.pitch;
             }
 
-						
-
             if ( options.type === "STREETVIEW" ) {
               // Switch this map into streeview mode
               map.setStreetView(
@@ -187,7 +185,7 @@ var googleCallback;
                   }
                 })
               );
-  
+
               //  Function to handle tweening using a set timeout
               var tween = function( rM, t ) {
 
@@ -195,7 +193,7 @@ var googleCallback;
                 setTimeout(function() {
 
                   var current_time = that.media.currentTime;
-    
+
                   //  Checks whether this is a generated route or not
                   if ( typeof options.tween === "object" ) {
 
@@ -234,16 +232,16 @@ var googleCallback;
                           heading: computeHeading( rM[ k ], rM[ k + 1 ] ) || 0,
                           zoom: options.zoom,
                           pitch: options.pitch || 0
-                        }); 
+                        });
                         sView2.setPosition( checkpoints[ k ] );
                       }
                     }
 
                     tween( checkpoints, options.interval );
-                  }   
+                  }
                 }, t );
               };
-              
+
               //  Determines if we should use hardcoded values ( using options.tween ),
               //  or if we should use a start and end location and let google generate
               //  the route for us
@@ -252,7 +250,7 @@ var googleCallback;
               //  Creating another variable to hold the streetview map for tweening,
               //  Doing this because if there was more then one streetview map, the tweening would sometimes appear in other maps
               var sView2 = sView;
-                
+
                 //  Create an array to store all the lat/lang values along our route
                 var checkpoints = [];
 
@@ -280,13 +278,13 @@ var googleCallback;
                 });
 
                 var showSteps = function ( directionResult, that ) {
-                
+
                   //  Push new google map lat and lng values into an array from our list of lat and lng values
                   var routes = directionResult.routes[ 0 ].overview_path;
                   for ( var j = 0, k = routes.length; j < k; j++ ) {
                     checkpoints.push( new google.maps.LatLng( routes[ j ].lat(), routes[ j ].lng() ) );
-                  }   
-                  
+                  }
+
                   //  Check to make sure the interval exists, if not, set to a default of 1000
                   options.interval = options.interval || 1000;
                   tween( checkpoints, 10 );
@@ -298,7 +296,7 @@ var googleCallback;
                 var sView3 = sView;
 
                 for ( var i = 0, l = options.tween.length; i < l; i++ ) {
-                 
+
                   //  Make sure interval exists, if not, set to 1000
                   options.tween[ i ].interval = options.tween[ i ].interval || 1000;
                   tween( options.tween, 10 );
@@ -319,19 +317,19 @@ var googleCallback;
        * of the video reaches the end time provided by the
        * options variable
        */
-      end: function (event, options) {
+      end: function ( event, options ) {
         // if the map exists hide it do not delete the map just in
         // case the user seeks back to time b/w start and end
-        if (map) {
+        if ( map ) {
           map.getDiv().style.display = "none";
         }
       },
-      _teardown: function (options) {
+      _teardown: function ( options ) {
 
-        var target = document.getElementById(options.target);
+        var target = document.getElementById( options.target );
 
         // the map must be manually removed
-        target && target.removeChild(newdiv);
+        target && target.removeChild( newdiv );
         newdiv = map = location = null;
       }
     };
@@ -356,7 +354,7 @@ var googleCallback;
       target: "map-container",
       type: {
         elem: "select",
-        options: ["ROADMAP", "SATELLITE", "STREETVIEW", "HYBRID", "TERRAIN"],
+        options: [ "ROADMAP", "SATELLITE", "STREETVIEW", "HYBRID", "TERRAIN" ],
         label: "Type"
       },
       zoom: {
@@ -391,5 +389,5 @@ var googleCallback;
       }
     }
   });
-})(Popcorn);
+})( Popcorn );
 
diff --git a/plugins/googlemap/popcorn.googlemap.unit.html b/plugins/googlemap/popcorn.googlemap.unit.html
index e37ab4f66..11db41634 100755
--- a/plugins/googlemap/popcorn.googlemap.unit.html
+++ b/plugins/googlemap/popcorn.googlemap.unit.html
@@ -4,11 +4,11 @@
   <title>Popcorn API</title>
   <link rel="stylesheet" href="../../test/qunit/qunit.css" type="text/css" media="screen">
   <script src="../../test/qunit/qunit.js"></script>
-  <!-- 
-    do not move - this must be called immediately prior to 
+  <!--
+    do not move - this must be called immediately prior to
     popcorn-api-draft.js
   -->
-  
+
   <script src="../../popcorn.js"></script>
   <script src="popcorn.googlemap.js"></script>
 
@@ -21,26 +21,26 @@ <h2 id="qunit-banner"></h2>
   <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
   <div id="qunit-fixture">  </div>
-  
-  <video id='video' 
-    controls preload='none' 
-    width= '250px'
-    poster="../../test/poster.png"> 
 
-    <source id='mp4'
+  <video id="video"
+    controls preload="none"
+    width= "250px"
+    poster="../../test/poster.png">
+
+    <source id="mp4"
       src="../../test/trailer.mp4"
-      type='video/mp4; codecs="avc1, mp4a"'> 
+      type='video/mp4; codecs="avc1, mp4a"'>
 
-    <source id='ogv'
+    <source id="ogv"
       src="../../test/trailer.ogv"
-      type='video/ogg; codecs="theora, vorbis"'> 
+      type='video/ogg; codecs="theora, vorbis"'>
 
-    <p>Your user agent does not support the HTML5 Video element.</p> 
+    <p>Your user agent does not support the HTML5 Video element.</p>
 
-  </video> 
-  <div id="map" style="position:relative;float:left;width:300px;height:400px"></div> 
+  </video>
+  <div id="map" style="position:relative;float:left;width:300px;height:400px"></div>
   <div id="map2" style="position:relative;float:left;width:300px;height:400px"></div>
-  <div id="map3" style="position:relative;float:left;width:300px;height:400px"></div>    
+  <div id="map3" style="position:relative;float:left;width:300px;height:400px"></div>
 </body>
 </html>
 
diff --git a/plugins/googlemap/popcorn.googlemap.unit.js b/plugins/googlemap/popcorn.googlemap.unit.js
index d3269057d..f242bb6f7 100755
--- a/plugins/googlemap/popcorn.googlemap.unit.js
+++ b/plugins/googlemap/popcorn.googlemap.unit.js
@@ -1,51 +1,51 @@
-test("Popcorn Google Map Plugin", function () {
-  
+test( "Popcorn Google Map Plugin", function () {
+
   var popped = Popcorn( "#video" ),
-      expects = 15, 
+      expects = 15,
       count = 0,
       setupId;
-  
+
   expect( expects );
-  
+
   function plus() {
     if ( ++count === expects ) {
       start();
     }
   }
-  
+
   stop();
 
-  ok ( 'googlemap' in popped, "googlemap is a mehtod of the popped instance" );
+  ok ( "googlemap" in popped, "googlemap is a mehtod of the popped instance" );
   plus();
-  
-  ok ( document.getElementById( 'map' ).innerHTML === "", "initially, there is nothing inside the map" );
+
+  ok ( document.getElementById( "map" ).innerHTML === "", "initially, there is nothing inside the map" );
   plus();
-  
-  ok ( document.getElementById( 'map2' ).innerHTML === "", "initially, there is nothing inside the map2" );
+
+  ok ( document.getElementById( "map2" ).innerHTML === "", "initially, there is nothing inside the map2" );
   plus();
-  
-  ok ( document.getElementById( 'map3' ).innerHTML === "", "initially, there is nothing inside the map3" );
+
+  ok ( document.getElementById( "map3" ).innerHTML === "", "initially, there is nothing inside the map3" );
   plus();
-  
+
   popped.googlemap({
-    start: 0, // seconds
-    end: 2, // seconds
-    type: 'ROADMAP',
-    target: 'map',
+    start: 0,
+    end: 2,
+    type: "ROADMAP",
+    target: "map",
     lat: 43.665429,
     lng: -79.403323
   })
   .googlemap({
-      start: 0, // seconds
-      end: 2, // seconds
-      type: 'SATELLITE',
-      target: 'map2',
-      location:'toronto',
+      start: 0,
+      end: 2,
+      type: "SATELLITE",
+      target: "map2",
+      location: "toronto",
       zoom: 15
   });
   var mapz = popped.googlemap({
-    start: 2, // seconds
-    end: 4, // seconds
+    start: 2,
+    end: 4,
     type: "STREETVIEW",
     target: "map3",
     location: "6th Line, Oakville, Ontario",
@@ -55,7 +55,7 @@ test("Popcorn Google Map Plugin", function () {
 	  interval: 1000,
 	  tween: "York university"
   })
-  .volume(0);
+  .volume( 0 );
 
   setupId = popped.getLastTrackEventId();
 
@@ -64,34 +64,34 @@ test("Popcorn Google Map Plugin", function () {
     plus();
     ok( google.maps.Geocoder, "Google maps Geocoder is available" );
     plus();
-    ok ( document.getElementById( 'actualmap1' ), "First map is on the page" );
+    ok ( document.getElementById( "actualmap1" ), "First map is on the page" );
     plus();
-    equals ( document.getElementById( 'actualmap1' ).offsetParent.id, "map", "First map is inside the 'map' div" );
+    equals ( document.getElementById( "actualmap1" ).offsetParent.id, "map", "First map is inside the 'map' div" );
     plus();
-    equals( popped.data.trackEvents.byStart[1].zoom, 8, "Defaulting to zoom of 8" );
+    equals( popped.data.trackEvents.byStart[ 1 ].zoom, 8, "Defaulting to zoom of 8" );
     plus();
   });
 
   popped.exec( 1, function() {
-    ok (document.getElementById('actualmap2'), "Second map is on the page" );
+    ok ( document.getElementById( "actualmap2" ), "Second map is on the page" );
     plus();
-    equals (document.getElementById('actualmap2').offsetParent.id, "map2", "Second map is inside the 'map2' div" );
+    equals ( document.getElementById( "actualmap2" ).offsetParent.id, "map2", "Second map is inside the 'map2' div" );
     plus();
   });
 
   popped.exec( 3, function() {
-    equals (document.getElementById('actualmap3').offsetParent.id, "map3", "Tweening map is inside the 'map3' div" );
+    equals ( document.getElementById( "actualmap3" ).offsetParent.id, "map3", "Tweening map is inside the 'map3' div" );
     plus();
   });
 
   popped.exec( 5, function() {
-    ok ( document.getElementById( 'actualmap2' ).style.display === "none" && 
-        document.getElementById( 'actualmap1' ).style.display === "none" &&
-        document.getElementById( 'actualmap3' ).style.display === "none", "All maps are no longer visible" );
+    ok ( document.getElementById( "actualmap2" ).style.display === "none" && 
+        document.getElementById( "actualmap1" ).style.display === "none" &&
+        document.getElementById( "actualmap3" ).style.display === "none", "All maps are no longer visible" );
     plus();
     popped.pause().removeTrackEvent( setupId );
 
-    ok( !document.getElementById( 'actualmap4' ), "removed map was properly destroyed" );
+    ok( !document.getElementById( "actualmap4" ), "removed map was properly destroyed" );
     plus();
   });
 
@@ -103,11 +103,10 @@ test("Popcorn Google Map Plugin", function () {
   try {
     popped.googlemap({});
   } catch( e ) {
-    ok(true, 'empty event was caught by debug');
+    ok( true, "empty event was caught by debug" );
     plus();
   }
 
   popped.play();
-  
-});
 
+});
diff --git a/plugins/image/popcorn.image.html b/plugins/image/popcorn.image.html
index a83045bcb..3cd99293f 100755
--- a/plugins/image/popcorn.image.html
+++ b/plugins/image/popcorn.image.html
@@ -2,7 +2,6 @@
 <html>
 <head>
   <title>Popcorn Image Plug-in Demo</title>
-  
   <script src="../../popcorn.js"></script>
   <script src="popcorn.image.js"></script>
   <script>
@@ -10,7 +9,7 @@
 
       var p = Popcorn( "#video" )
       .volume( 0 )
-      .play() 
+      .play()
       .image({
       	// seconds
         start: 5,
@@ -40,25 +39,25 @@ <h1 id="qunit-header">Popcorn Image Plug-in Demo</h1>
   <p> First one (with an overlayed text) will disappear at 15 seconds.</p>
   <p> Second one (without an overlayed text) will disappear at 45 seconds.</p>
   <div>
-    <video id="video" 
+    <video id="video"
       controls
       width="250px"
-      poster="../../test/poster.png"> 
+      poster="../../test/poster.png">
 
       <source id="mp4"
         src="../../test/trailer.mp4"
-        type='video/mp4; codecs="avc1, mp4a"'> 
+        type='video/mp4; codecs="avc1, mp4a"'>
 
       <source id="ogv"
         src="../../test/trailer.ogv"
-        type='video/ogg; codecs="theora, vorbis"'> 
+        type='video/ogg; codecs="theora, vorbis"'>
 
-      <p>Your user agent does not support the HTML5 Video element.</p> 
+      <p>Your user agent does not support the HTML5 Video element.</p>
 
-    </video> 
+    </video>
   </div>
   <div style="width:400px; height:400px" id="imagediv">
-  </div> 
+  </div>
 
 </body>
 </html>
diff --git a/plugins/image/popcorn.image.js b/plugins/image/popcorn.image.js
index 6da4bec24..9d7d220be 100755
--- a/plugins/image/popcorn.image.js
+++ b/plugins/image/popcorn.image.js
@@ -1,21 +1,21 @@
 // PLUGIN: IMAGE
 
-(function (Popcorn) {
+(function ( Popcorn ) {
 
 /**
- * Images popcorn plug-in 
+ * Images popcorn plug-in
  * Shows an image element
  * Options parameter will need a start, end, href, target and src.
  * Start is the time that you want this plug-in to execute
- * End is the time that you want this plug-in to stop executing 
- * href is the url of the destination of a link - optional 
- * Target is the id of the document element that the iframe needs to be attached to, 
+ * End is the time that you want this plug-in to stop executing
+ * href is the url of the destination of a link - optional
+ * Target is the id of the document element that the iframe needs to be attached to,
  * this target element must exist on the DOM
  * Src is the url of the image that you want to display
- * text is the overlayed text on the image - optional  
+ * text is the overlayed text on the image - optional
  *
  * @param {Object} options
- * 
+ *
  * Example:
    var p = Popcorn('#video')
       .image({
@@ -30,7 +30,7 @@
  */
   Popcorn.plugin( "image", {
       manifest: {
-        about:{
+        about: {
           name: "Popcorn image Plugin",
           version: "0.1",
           author: "Scott Downe",
@@ -54,8 +54,8 @@
           },
           target: "image-container",
           src: {
-            elem: "input", 
-            type: "text",   
+            elem: "input",
+            type: "text",
             label: "Source URL"
           },
           text: {
@@ -84,16 +84,16 @@
 
           // borders look really bad, if someone wants it they can put it on their div target
           img.style.borderStyle = "none";
-          
+
           if ( options.href ) {
             options.link.href = options.href;
           }
 
           options.link.target = "_blank";
 
-          var fontHeight = ( img.height / 12 ) + "px", 
+          var fontHeight = ( img.height / 12 ) + "px",
               divText = document.createElement( "div" );
-          
+
           Popcorn.extend( divText.style, {
 
             color: "black",
@@ -108,7 +108,7 @@
           divText.innerHTML = options.text || "";
           options.link.appendChild( divText );
           options.link.appendChild( img );
-          divText.style.top = ( img.height / 2 ) - ( divText.offsetHeight / 2 ) + "px"; 
+          divText.style.top = ( img.height / 2 ) - ( divText.offsetHeight / 2 ) + "px";
           options.link.style.display = "none";
         }, false );
 
@@ -116,18 +116,18 @@
       },
 
       /**
-       * @member image 
-       * The start function will be executed when the currentTime 
-       * of the video  reaches the start time provided by the 
+       * @member image
+       * The start function will be executed when the currentTime
+       * of the video  reaches the start time provided by the
        * options variable
        */
       start: function( event, options ) {
         options.link.style.display = "block";
       },
       /**
-       * @member image 
-       * The end function will be executed when the currentTime 
-       * of the video  reaches the end time provided by the 
+       * @member image
+       * The end function will be executed when the currentTime
+       * of the video  reaches the end time provided by the
        * options variable
        */
       end: function( event, options ) {
diff --git a/plugins/image/popcorn.image.unit.html b/plugins/image/popcorn.image.unit.html
index d78a7d4ca..fd714c048 100755
--- a/plugins/image/popcorn.image.unit.html
+++ b/plugins/image/popcorn.image.unit.html
@@ -4,14 +4,12 @@
   <title>Popcorn Image Plug-in Test</title>
   <link rel="stylesheet" href="../../test/qunit/qunit.css" type="text/css" media="screen">
   <script src="../../test/qunit/qunit.js"></script>
-  <!-- 
-    do not move - this must be called immediately prior to 
+  <!--
+    do not move - this must be called immediately prior to
     popcorn-api-draft.js
   -->
-  
   <script src="../../popcorn.js"></script>
   <script src="popcorn.image.js"></script>
-
   <script src="popcorn.image.unit.js"></script>
 </head>
 <body>
@@ -21,23 +19,23 @@ <h2 id="qunit-banner"></h2>
   <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
   <div id="qunit-fixture">  </div>
-  
-  <video id="video" 
+
+  <video id="video"
     controls
     width="250px"
-    poster="../../test/poster.png"> 
+    poster="../../test/poster.png">
 
     <source id="mp4"
       src="../../test/trailer.mp4"
-      type='video/mp4; codecs="avc1, mp4a"'> 
+      type='video/mp4; codecs="avc1, mp4a"'>
 
     <source id="ogv"
       src="../../test/trailer.ogv"
-      type='video/ogg; codecs="theora, vorbis"'> 
+      type='video/ogg; codecs="theora, vorbis"'>
 
-    <p>Your user agent does not support the HTML5 Video element.</p> 
+    <p>Your user agent does not support the HTML5 Video element.</p>
 
-  </video> 
-  <div id="imagediv"></div>  
+  </video>
+  <div id="imagediv"></div>
 </body>
 </html>
diff --git a/plugins/image/popcorn.image.unit.js b/plugins/image/popcorn.image.unit.js
index afa2c24ff..447b17950 100755
--- a/plugins/image/popcorn.image.unit.js
+++ b/plugins/image/popcorn.image.unit.js
@@ -1,4 +1,4 @@
-test("Popcorn Image Plugin", function () {
+test( "Popcorn Image Plugin", function () {
 
   var popped = Popcorn( "#video" ),
       expects = 9,
@@ -7,33 +7,33 @@ test("Popcorn Image Plugin", function () {
       imagediv = document.getElementById( "imagediv" ),
       sources = [
         "https://www.drumbeat.org/media//images/drumbeat-logo-splash.png",
-        "http://www.petmountain.com/category/mini/organic-dog-supplies/520/organic-dog-supplies.jpg", 
+        "http://www.petmountain.com/category/mini/organic-dog-supplies/520/organic-dog-supplies.jpg",
         "http://www.botskool.com/sites/default/files/images/javascript.png"
       ];
-  
+
   expect( expects );
-  
+
   function plus() {
-    if ( ++count === expects) {
+    if ( ++count === expects ) {
       start();
     }
   }
 
   stop();
- 
+
   ok( "image" in popped, "image is a method of the popped instance" );
   plus();
 
   equals( imagediv.innerHTML, "", "initially, there is nothing inside the imagediv" );
   plus();
-  
+
   popped.image({
     // seconds
     start: 1,
     // seconds
     end: 3,
     href: "http://www.drumbeat.org/",
-    src: sources[0],
+    src: sources[ 0 ],
     text: "DRUMBEAT",
     target: "imagediv"
   })
@@ -43,7 +43,7 @@ test("Popcorn Image Plugin", function () {
     // seconds
     end: 6,
     // no href
-    src: sources[1],
+    src: sources[ 1 ],
     target: "imagediv"
   })
   .image({
@@ -52,8 +52,8 @@ test("Popcorn Image Plugin", function () {
     // seconds
     end: 6,
     // no href
-    src: sources[2],
-    target: "imagediv"  
+    src: sources[ 2 ],
+    target: "imagediv"
   });
 
   setupId = popped.getLastTrackEventId();
@@ -64,24 +64,24 @@ test("Popcorn Image Plugin", function () {
     ok( /img/.test( imagediv.innerHTML ), "An image exists" );
     plus();
   });
-  
+
   popped.exec( 3, function() {
     ok( /display: none;/.test( imagediv.innerHTML ), "Div contents are hidden again" );
     plus();
   });
-  
+
   popped.exec( 5, function() {
     [].forEach.call( document.querySelectorAll( "#imagediv a img" ), function( img, idx ) {
       ok( img.src === sources[ idx ], "Image " + idx + " is in the right order" );
       plus();
     });
   });
-  
+
   popped.exec( 7, function() {
     popped.pause().removeTrackEvent( setupId );
-    ok( !imagediv.children[2], "removed image was properly destroyed" );
+    ok( !imagediv.children[ 2 ], "removed image was properly destroyed" );
     plus();
   });
 
-  popped.volume( 0 ).play();  
+  popped.volume( 0 ).play();
 });
diff --git a/plugins/lastfm/popcorn.lastfm.html b/plugins/lastfm/popcorn.lastfm.html
index 2d7e5ee24..c3876c498 100755
--- a/plugins/lastfm/popcorn.lastfm.html
+++ b/plugins/lastfm/popcorn.lastfm.html
@@ -2,56 +2,56 @@
 <html>
 <head>
   <title>Popcorn LastFM Plug-in Demo</title>
-  
+
   <!--
     ATTENTION
-  
+
     This demo uses an API key obtained for testing the LastFM Popcorn.js
     plugin. Please do not use it for other purposes.
   -->
-  
+
   <script src="../../popcorn.js"></script>
   <script src="popcorn.lastfm.js"></script>
-  <script> 
-    document.addEventListener('DOMContentLoaded', function () {
-      var p = Popcorn('#video')
-      .volume(0)
+  <script>
+    document.addEventListener( "DOMContentLoaded", function () {
+      var p = Popcorn( "#video" )
+      .volume( 0 )
       .play()
       .lastfm({
-        start: 5, // seconds
-        end: 15, // seconds
-        artist: 'yacht',
-        target: 'lastfmdiv',
-        apikey: '30ac38340e8be75f9268727cb4526b3d'
-      } )
+        start: 5,
+        end: 15,
+        artist: "yacht",
+        target: "lastfmdiv",
+        apikey: "30ac38340e8be75f9268727cb4526b3d"
+      })
       .lastfm({
-        start: 10, // seconds
-        end: 20, // seconds
-        artist: 'the beatles',
-        target: 'lastfmdiv',
-        apikey: '30ac38340e8be75f9268727cb4526b3d'
-      } )
+        start: 10,
+        end: 20,
+        artist: "the beatles",
+        target: "lastfmdiv",
+        apikey: "30ac38340e8be75f9268727cb4526b3d"
+      })
       .lastfm({
-        start: 15, // seconds
-        end: 30, // seconds
-        artist: 'sdfsdfsdfdsddfsdfsdfsddfsf',
-        target: 'lastfmdiv',
-        apikey: '30ac38340e8be75f9268727cb4526b3d'
-      } )
+        start: 15,
+        end: 30,
+        artist: "sdfsdfsdfdsddfsdfsdfsddfsf",
+        target: "lastfmdiv",
+        apikey: "30ac38340e8be75f9268727cb4526b3d"
+      })
 	    .lastfm({
-        start: 20, // seconds
-        end: 45, // seconds
-        artist: 'Coldplay',
-        target: 'lastfmdiv',
-        apikey: '30ac38340e8be75f9268727cb4526b3d'
-      } )
+        start: 20,
+        end: 45,
+        artist: "Coldplay",
+        target: "lastfmdiv",
+        apikey: "30ac38340e8be75f9268727cb4526b3d"
+      })
       .lastfm({
-        start: 25, // seconds
-        end: 40, // seconds
-        artist: 'yacht',
-        target: 'lastfmdiv',
-        apikey: '30ac38340e8be75f9268727cb4526b3d'
-      } )
+        start: 25,
+        end: 40,
+        artist: "yacht",
+        target: "lastfmdiv",
+        apikey: "30ac38340e8be75f9268727cb4526b3d"
+      })
     }, false);
   </script>
 </head>
@@ -63,22 +63,22 @@ <h1 id="qunit-header">Popcorn LastFM Plug-in Demo</h1>
   <p> Artist information for 'Coldplay' will appear at 20 seconds and disappear at 45 seconds.</p>
   <p> Artist information for 'yacht' will appear at 25 seconds and disappear at 40 seconds.</p>
   <div>
-    <video id='video' 
-      controls preload='none' 
-      width= '250px'
-      poster="../../test/poster.png"> 
+    <video id="video"
+      controls preload="none"
+      width= "250px"
+      poster="../../test/poster.png">
 
-      <source id='mp4'
+      <source id="mp4"
         src="../../test/trailer.mp4"
-        type='video/mp4; codecs="avc1, mp4a"'> 
+        type='video/mp4; codecs="avc1, mp4a"'>
 
-      <source id='ogv'
+      <source id="ogv"
         src="../../test/trailer.ogv"
-        type='video/ogg; codecs="theora, vorbis"'> 
+        type='video/ogg; codecs="theora, vorbis"'>
 
-      <p>Your user agent does not support the HTML5 Video element.</p> 
+      <p>Your user agent does not support the HTML5 Video element.</p>
 
-    </video> 
+    </video>
   </div>
   <div id="lastfmdiv" width="50%" height="50%">
   </div>
diff --git a/plugins/lastfm/popcorn.lastfm.js b/plugins/lastfm/popcorn.lastfm.js
index a38d4593d..d4f0dee34 100755
--- a/plugins/lastfm/popcorn.lastfm.js
+++ b/plugins/lastfm/popcorn.lastfm.js
@@ -1,31 +1,31 @@
 // PLUGIN: LASTFM
 
-(function (Popcorn) {
+(function ( Popcorn ) {
 
   var _artists = {},
-      lastFMcallback = function(data){
-        if (data.artist) {
+      lastFMcallback = function( data ) {
+        if ( data.artist ) {
           var htmlString = "";
 
-          htmlString = '<h3>'+data.artist.name+'</h3>';
-          htmlString += '<a href="'+data.artist.url+'" target="_blank" style="float:left;margin:0 10px 0 0;"><img src="'+ data.artist.image[2]['#text'] +'" alt=""></a>';
-          htmlString += '<p>'+ data.artist.bio.summary +'</p>';
-          htmlString += '<hr /><p><h4>Tags</h4><ul>';
+          htmlString = "<h3>"+data.artist.name+"</h3>";
+          htmlString += "<a href='" + data.artist.url + "' target='_blank' style='float:left;margin:0 10px 0 0;'><img src='" + data.artist.image[ 2 ][ "#text"] + "' alt=''></a>";
+          htmlString += "<p>" + data.artist.bio.summary + "</p>";
+          htmlString += "<hr /><p><h4>Tags</h4><ul>";
 
           Popcorn.forEach( data.artist.tags.tag, function( val, i) {
-            htmlString += '<li><a href="'+ val.url +'">'+ val.name +'</a></li>';
+            htmlString += "<li><a href='" + val.url + "'>" + val.name + "</a></li>";
           });
 
-          htmlString += '</ul></p>';
-          htmlString += '<hr /><p><h4>Similar</h4><ul>';
+          htmlString += "</ul></p>";
+          htmlString += "<hr /><p><h4>Similar</h4><ul>";
 
           Popcorn.forEach( data.artist.similar.artist, function( val, i) {
-            htmlString += '<li><a href="'+ val.url +'">'+ val.name +'</a></li>';
+            htmlString += "<li><a href='" + val.url + "'>" + val.name + "</a></li>";
           });
 
-          htmlString += '</ul></p>';
+          htmlString += "</ul></p>";
 
-          _artists[data.artist.name.toLowerCase()].htmlString = htmlString;
+          _artists[ data.artist.name.toLowerCase() ].htmlString = htmlString;
         }
       };
 
@@ -39,9 +39,9 @@
    * Target is the id of the document element that the images are
    *  appended to, this target element must exist on the DOM
    * ApiKey is the API key registered with LastFM for use with their API
-   * 
+   *
    * @param {Object} options
-   *  
+   *
    * Example:
      var p = Popcorn('#video')
         .lastfm({
@@ -54,12 +54,12 @@
    *
    */
   Popcorn.plugin( "lastfm" , (function(){
-      
-    
+
+
     return {
 
       _setup: function( options ) {
-        options._container = document.createElement( 'div' );
+        options._container = document.createElement( "div" );
         options._container.style.display = "none";
         options._container.innerHTML = "";
         options.artist = options.artist && options.artist.toLowerCase() || "";
@@ -70,32 +70,32 @@
           throw new Error( "target container doesn't exist" );
         }
         target && target.appendChild( options._container );
-        
-        if(!_artists[options.artist]) {
 
-          _artists[options.artist] = {
+        if ( !_artists[ options.artist ] ) {
+
+          _artists[ options.artist ] = {
             count: 0,
             htmlString: "Unknown Artist"
           };
-          Popcorn.getJSONP("http://ws.audioscrobbler.com/2.0/?method=artist.getinfo&artist="+ options.artist +"&api_key="+options.apikey+"&format=json&callback=lastFMcallback", lastFMcallback, false );
+          Popcorn.getJSONP( "http://ws.audioscrobbler.com/2.0/?method=artist.getinfo&artist=" + options.artist + "&api_key=" + options.apikey + "&format=json&callback=lastFMcallback", lastFMcallback, false );
         }
-        _artists[options.artist].count++;
-        
+        _artists[ options.artist ].count++;
+
       },
       /**
-       * @member LastFM 
-       * The start function will be executed when the currentTime 
-       * of the video  reaches the start time provided by the 
+       * @member LastFM
+       * The start function will be executed when the currentTime
+       * of the video  reaches the start time provided by the
        * options variable
        */
       start: function( event, options ) {
-        options._container.innerHTML = _artists[options.artist].htmlString;
+        options._container.innerHTML = _artists[ options.artist ].htmlString;
         options._container.style.display = "inline";
       },
       /**
-       * @member LastFM 
-       * The end function will be executed when the currentTime 
-       * of the video  reaches the end time provided by the 
+       * @member LastFM
+       * The end function will be executed when the currentTime
+       * of the video  reaches the end time provided by the
        * options variable
        */
       end: function( event, options ) {
@@ -111,16 +111,28 @@
   })(),
   {
     about:{
-      name:    "Popcorn LastFM Plugin",
+      name: "Popcorn LastFM Plugin",
       version: "0.1",
-      author:  "Steven Weerdenburg",
+      author: "Steven Weerdenburg",
       website: "http://sweerdenburg.wordpress.com/"
     },
-    options:{
-      start    : {elem:'input', type:'text', label:'In'},
-      end      : {elem:'input', type:'text', label:'Out'},
-      target   : 'lastfm-container',
-      artist   : {elem:'input', type:'text', label:'Artist'}
+    options: {
+      start: {
+        elem: "input",
+        type: "text",
+        label: "In"
+      },
+      end: {
+        elem: "input",
+        type: "text",
+        label: "Out"
+      },
+      target: "lastfm-container",
+      artist: {
+        elem: "input",
+        type: "text",
+        label: "Artist"
+      }
     }
   });
 
diff --git a/plugins/lastfm/popcorn.lastfm.unit.html b/plugins/lastfm/popcorn.lastfm.unit.html
index f7bf0f0c6..ad4c9e344 100755
--- a/plugins/lastfm/popcorn.lastfm.unit.html
+++ b/plugins/lastfm/popcorn.lastfm.unit.html
@@ -4,11 +4,11 @@
   <title>Popcorn API</title>
   <link rel="stylesheet" href="../../test/qunit/qunit.css" type="text/css" media="screen">
   <script src="../../test/qunit/qunit.js"></script>
-  <!-- 
-    do not move - this must be called immediately prior to 
+  <!--
+    do not move - this must be called immediately prior to
     popcorn-api-draft.js
   -->
-  
+
   <script src="../../popcorn.js"></script>
   <script src="../../test/jquery.js"></script>
   <script src="popcorn.lastfm.js"></script>
@@ -23,23 +23,23 @@ <h2 id="qunit-banner"></h2>
   <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
   <div id="qunit-fixture">  </div>
-  
-  <video id='video' 
-    controls 
-    width= '250px'
-    poster="../../test/poster.png"> 
 
-    <source id='mp4'
+  <video id="video"
+    controls
+    width= "250px"
+    poster="../../test/poster.png">
+
+    <source id="mp4"
       src="../../test/trailer.mp4"
-      type='video/mp4; codecs="avc1, mp4a"'> 
+      type='video/mp4; codecs="avc1, mp4a"'>
 
-    <source id='ogv'
+    <source id="ogv"
       src="../../test/trailer.ogv"
-      type='video/ogg; codecs="theora, vorbis"'> 
+      type='video/ogg; codecs="theora, vorbis"'>
 
-    <p>Your user agent does not support the HTML5 Video element.</p> 
+    <p>Your user agent does not support the HTML5 Video element.</p>
 
-  </video> 
-  <div id="lastfmdiv"></div>  
+  </video>
+  <div id="lastfmdiv"></div>
 </body>
 </html>
diff --git a/plugins/lastfm/popcorn.lastfm.unit.js b/plugins/lastfm/popcorn.lastfm.unit.js
index a5c0c0a39..c20aaf1f2 100755
--- a/plugins/lastfm/popcorn.lastfm.unit.js
+++ b/plugins/lastfm/popcorn.lastfm.unit.js
@@ -1,51 +1,51 @@
-test("Popcorn LastFM Plugin", function () {
+test( "Popcorn LastFM Plugin", function () {
   /*
     ATTENTION
-  
+
     This demo uses an API key obtained for testing the LastFM Popcorn.js
     plugin. Please do not use it for other purposes.
   */
-  var popped = Popcorn("#video"),
-      expects = 10, 
+  var popped = Popcorn( "#video" ),
+      expects = 10,
       count = 0,
       setupId,
-      lastfmdiv = document.getElementById('lastfmdiv');
-  
+      lastfmdiv = document.getElementById( "lastfmdiv" );
+
   expect( expects );
-  
+
   function plus() {
-    if ( ++count === expects) {
+    if ( ++count === expects ) {
       start();
     }
   }
 
-  stop();   
- 
-  ok('lastfm' in popped, "lastfm is a method of the popped instance");
+  stop();
+
+  ok( "lastfm" in popped, "lastfm is a method of the popped instance" );
   plus();
 
   equals ( lastfmdiv.innerHTML, "", "initially, there is nothing inside the lastfmdiv" );
   plus();
-  
+
   popped.lastfm({
-    start: 1, // seconds
-    end: 4, // seconds
-    artist: 'yacht',
-    target: 'lastfmdiv',
-    apikey: '30ac38340e8be75f9268727cb4526b3d'
+    start: 1,
+    end: 4,
+    artist: "yacht",
+    target: "lastfmdiv",
+    apikey: "30ac38340e8be75f9268727cb4526b3d"
   })
   .lastfm({
-    start: 2, // seconds
-    end: 7, // seconds
-    artist: 'the beatles',
-    target: 'lastfmdiv',
-    apikey: '30ac38340e8be75f9268727cb4526b3d'
+    start: 2,
+    end: 7,
+    artist: "the beatles",
+    target: "lastfmdiv",
+    apikey: "30ac38340e8be75f9268727cb4526b3d"
   })
   .lastfm({
-    start: 4, // seconds
-    end: 7, // seconds
-    target: 'lastfmdiv',
-    apikey: '30ac38340e8be75f9268727cb4526b3d'
+    start: 4,
+    end: 7,
+    target: "lastfmdiv",
+    apikey: "30ac38340e8be75f9268727cb4526b3d"
   });
 
   setupId = popped.getLastTrackEventId();
@@ -53,25 +53,25 @@ test("Popcorn LastFM Plugin", function () {
   popped.exec( 2, function() {
     equals ( lastfmdiv.childElementCount, 3, "lastfmdiv now has three inner elements" );
     plus();
-    equals (lastfmdiv.children[0].style.display , "inline", "yachtdiv is visible on the page" );
+    equals ( lastfmdiv.children[0].style.display , "inline", "yachtdiv is visible on the page" );
     plus();
   });
 
   popped.exec( 3, function() {
-    equals (lastfmdiv.children[0].style.display , "inline", "yachtdiv is still visible on the page" );
+    equals ( lastfmdiv.children[ 0 ].style.display , "inline", "yachtdiv is still visible on the page" );
     plus();
-    equals (lastfmdiv.children[1].style.display , "inline", "beatlesdiv is visible on the page" );
+    equals ( lastfmdiv.children[ 1 ].style.display , "inline", "beatlesdiv is visible on the page" );
     plus();
-    equals (lastfmdiv.children[2].style.display , "none", "nulldiv is not visible on the page" );
+    equals ( lastfmdiv.children[ 2 ].style.display , "none", "nulldiv is not visible on the page" );
     plus();
   });
 
   popped.exec( 5, function() {
-    equals (lastfmdiv.children[2].innerHTML , "Unknown Artist", "Artist information could not be found" );
+    equals ( lastfmdiv.children[ 2 ].innerHTML , "Unknown Artist", "Artist information could not be found" );
     plus();
 
     popped.pause().removeTrackEvent( setupId );
-    ok( !lastfmdiv.children[2], "removed artist was properly destroyed" );
+    ok( !lastfmdiv.children[ 2 ], "removed artist was properly destroyed" );
     plus();
   });
 
@@ -83,9 +83,9 @@ test("Popcorn LastFM Plugin", function () {
   try {
     popped.lastfm({});
   } catch( e ) {
-    ok(true, 'empty event was caught by debug');
+    ok ( true, "empty event was caught by debug" );
     plus();
   }
-  
-  popped.volume(0).play();
+
+  popped.volume( 0 ).play();
 });
diff --git a/plugins/linkedin/popcorn.linkedin.html b/plugins/linkedin/popcorn.linkedin.html
index cf141a343..15056b61d 100755
--- a/plugins/linkedin/popcorn.linkedin.html
+++ b/plugins/linkedin/popcorn.linkedin.html
@@ -4,7 +4,6 @@
   <title>Popcorn LinkedIn Plug-in Demo</title>
     <!--
     ATTENTION
-  
     This demo uses an API key obtained for testing the LinkedIn Popcorn.js
     plugin. Please do not use it for other purposes. This API key is meant
     to be used on localhost (port 80). For other purposes, please obtain an API key
@@ -69,38 +68,38 @@
 </head>
 <body>
 <h1 id="qunit-header">Popcorn LinkedIn Plug-in Demo</h1>
-  Right of video: 
+  Right of video:
   <ul>
-  	 <li>share button: between 1 and 4 seconds</li> 
-  	 <li>recommend button: between 5  and 8 seconds</li> 
-  	 <li>member profile: between 9 and 15 seconds</li> 
+  	 <li>share button: between 1 and 4 seconds</li>
+  	 <li>recommend button: between 5  and 8 seconds</li>
+  	 <li>member profile: between 9 and 15 seconds</li>
   </ul>
   Below video:
-  <ul> 
-     <li>company insider: between 9 and 15 seconds</li> 
+  <ul>
+     <li>company insider: between 9 and 15 seconds</li>
      <li>company profile: between 16 and 27 seconds</li>
   </ul>
-  <p>   
+  <p>
      For a description of each plugin's purpose, go to: <a href="http://developer.linkedin.com/community/plugins">LinkedIn Plugins</a><br/>
   </p>
-  
+
   <div>
-    <video id="video" 
-      controls preload="none" 
+    <video id="video"
+      controls preload="none"
       width="350px"
-      poster="../../test/poster.png"> 
+      poster="../../test/poster.png">
 
       <source id="mp4"
         src="../../test/trailer.mp4"
-        type='video/mp4; codecs="avc1, mp4a"'> 
+        type='video/mp4; codecs="avc1, mp4a"'>
 
       <source id="ogv"
         src="../../test/trailer.ogv"
-        type='video/ogg; codecs="theora, vorbis"'> 
+        type='video/ogg; codecs="theora, vorbis"'>
 
-      <p>Your user agent does not support the HTML5 Video element.</p> 
+      <p>Your user agent does not support the HTML5 Video element.</p>
 
-    </video> 
+    </video>
   </div>
   <div id="sharediv" style="position:absolute;top:400px;left:400px;"></div>
   <div id="recommenddiv" style="position:absolute;top:400px;left:400px;"></div>
diff --git a/plugins/linkedin/popcorn.linkedin.js b/plugins/linkedin/popcorn.linkedin.js
index 1777d8a99..c20ecd384 100755
--- a/plugins/linkedin/popcorn.linkedin.js
+++ b/plugins/linkedin/popcorn.linkedin.js
@@ -1,6 +1,6 @@
 //PLUGIN: linkedin
 
-(function (Popcorn){
+(function ( Popcorn ){
 
   /**
    * LinkedIn Popcorn plug-in
@@ -68,44 +68,44 @@
           label: "Counter"
         },
         memberid: {
-          elem:"input",
-          type:"text",
-          label:"Member ID"
+          elem: "input",
+          type: "text",
+          label: "Member ID"
         },
         format: {
-          elem:"input",
-          type:"text",
-          label:"Format"
+          elem: "input",
+          type: "text",
+          label: "Format"
         },
         companyid: {
-          elem:"input",
-          type:"text",
-          label:"Company ID"
+          elem: "input",
+          type: "text",
+          label: "Company ID"
         },
         modules: {
-          elem:"input",
-          type:"text",
-          label:"Modules"
+          elem: "input",
+          type: "text",
+          label: "Modules"
         },
         productid: {
-          elem:"input",
-          type:"text",
-          label:"productid"
+          elem: "input",
+          type: "text",
+          label: "productid"
         },
         related: {
-          elem:"input",
-          type:"text",
-          label:"related"
+          elem: "input",
+          type: "text",
+          label: "related"
         },
         start: {
-          elem:"input",
-          type:"text",
-          label:"In"
+          elem: "input",
+          type: "text",
+          label: "In"
         },
         end: {
-          elem:"input",
-          type:"text",
-          label:"Out"
+          elem: "input",
+          type: "text",
+          label: "Out"
         },
 
         target: "linkedin-container"
@@ -117,7 +117,7 @@
           target = document.getElementById( options.target ),
           script = document.createElement( "script" );
 
-      Popcorn.getScript("http://platform.linkedin.com/in.js");
+      Popcorn.getScript( "http://platform.linkedin.com/in.js" );
 
       options._container = document.createElement( "div" );
       options._container.appendChild( script );
@@ -125,7 +125,7 @@
       if ( apikey ) {
         script.innerHTML = "api_key: " + apikey;
       }
-      
+
       options.type = options.type && options.type.toLowerCase() || "";
 
       // Replace the LinkedIn plugin's error message to something more helpful
diff --git a/plugins/linkedin/popcorn.linkedin.unit.html b/plugins/linkedin/popcorn.linkedin.unit.html
index f9caeb26d..0a122c9c2 100755
--- a/plugins/linkedin/popcorn.linkedin.unit.html
+++ b/plugins/linkedin/popcorn.linkedin.unit.html
@@ -4,13 +4,12 @@
   <title>Popcorn LinkedIn Plugin Test</title>
   <link rel="stylesheet" href="../../test/qunit/qunit.css" type="text/css" media="screen">
   <script src="../../test/qunit/qunit.js"></script>
-  <!-- 
-    do not move - this must be called immediately prior to 
+  <!--
+    do not move - this must be called immediately prior to
     popcorn-api-draft.js
   -->
-  
   <script src="../../popcorn.js"></script>
-  <script src="popcorn.linkedin.js"></script>  
+  <script src="popcorn.linkedin.js"></script>
   <script src="popcorn.linkedin.unit.js"></script>
 </head>
 <body>
@@ -20,27 +19,27 @@ <h2 id="qunit-banner"></h2>
   <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
   <div id="qunit-fixture">  </div>
-  
-  <video id='video' 
+
+  <video id="video"
     controls
-    width= '250px'
-    poster="../../test/poster.png"> 
+    width= "250px"
+    poster="../../test/poster.png">
 
-    <source id='mp4'
+    <source id="mp4"
       src="../../test/trailer.mp4"
-      type='video/mp4; codecs="avc1, mp4a"'> 
+      type='video/mp4; codecs="avc1, mp4a"'>
 
-    <source id='ogv'
+    <source id="ogv"
       src="../../test/trailer.ogv"
-      type='video/ogg; codecs="theora, vorbis"'> 
+      type='video/ogg; codecs="theora, vorbis"'>
 
-    <p>Your user agent does not support the HTML5 Video element.</p> 
+    <p>Your user agent does not support the HTML5 Video element.</p>
 
-  </video> 
+  </video>
   <div id="sharediv"></div>
   <div id="recommenddiv"></div>
   <div id="memberprofilediv"></div>
   <div id="companyinsiderdiv"></div>
-  <div id="companyprofilediv"></div>  
+  <div id="companyprofilediv"></div>
 </body>
 </html>
diff --git a/plugins/linkedin/popcorn.linkedin.unit.js b/plugins/linkedin/popcorn.linkedin.unit.js
index 2625bff36..2791f8863 100755
--- a/plugins/linkedin/popcorn.linkedin.unit.js
+++ b/plugins/linkedin/popcorn.linkedin.unit.js
@@ -1,9 +1,9 @@
-test("Popcorn LinkedIn Plugin", function () {
-  
+test ("Popcorn LinkedIn Plugin", function () {
+
   if ( /localhost/.test( location.hostname ) ) {
-    
+
     // run tests on localhost
-    var popped = Popcorn("#video"),
+    var popped = Popcorn( "#video" ),
         expects = 23,
         count = 0,
         setupId,
@@ -12,25 +12,25 @@ test("Popcorn LinkedIn Plugin", function () {
         memberprofilediv = document.getElementById( "memberprofilediv" ),
         companyinsiderdiv = document.getElementById( "companyinsiderdiv" ),
         companyprofilediv = document.getElementById( "companyprofilediv" );
-    
+
     expect( expects );
-    
+
     function plus() {
-  
+
       if ( ++count === expects ) {
         start();
       }
     }
-  
+
     stop();
-   
+
     ok( "linkedin" in popped, "linkedin is a method of the popped instance" );
     plus();
-  
+
     // Testing the share plugin
     equals( sharediv.innerHTML, "", "initially, there is nothing inside the sharediv" );
     plus();
-    
+
     popped.linkedin({
       type: "share",
       counter: "right",
@@ -40,25 +40,25 @@ test("Popcorn LinkedIn Plugin", function () {
       start: 1,
       end: 3
     });
-  
+
     popped.exec( 2, function() {
-  
+
       ok( /block/.test( sharediv.children[ 0 ].style.display ), "sharediv contents are displayed" );
       plus();
       ok( /script/.test( sharediv.children[ 0 ].innerHTML ), "share plugin exists" );
       plus();
     });
-    
+
     popped.exec( 4, function() {
-  
+
       ok( /none/.test( sharediv.children[ 0 ].style.display ), "sharediv contents are hidden again" );
       plus();
     });
-    
+
     // Testing the recommendproduct plugin
     equals( recommenddiv.innerHTML, "", "initially, there is nothing inside the recommenddiv" );
     plus();
-    
+
     popped.linkedin({
       type: "recommendproduct",
       counter: "top",
@@ -69,25 +69,25 @@ test("Popcorn LinkedIn Plugin", function () {
       start: 1,
       end: 3
     });
-    
+
     popped.exec( 2, function() {
-  
+
       ok( /block/.test( recommenddiv.children[ 0 ].style.display ), "recommenddiv contents are displayed" );
       plus();
       ok( /script/.test( recommenddiv.children[ 0 ].innerHTML ), "recommend plugin exists" );
       plus();
     });
-    
+
     popped.exec( 4, function() {
-  
+
       ok( /none/.test( recommenddiv.children[ 0 ].style.display ), "recommenddiv contents are hidden again" );
       plus();
     });
-    
+
     // Testing memberprofile plugin
     equals( memberprofilediv.innerHTML, "", "initially, there is nothing inside the memberprofilediv" );
     plus();
-    
+
     popped.linkedin({
       type: "memberprofile",
       memberid: "/in/jeffweiner08",
@@ -99,23 +99,23 @@ test("Popcorn LinkedIn Plugin", function () {
     });
 
     popped.exec( 2, function() {
-  
+
       ok( /block/.test( memberprofilediv.children[ 0 ].style.display ), "memberprofilediv contents are displayed" );
       plus();
       ok( /script/.test( memberprofilediv.children[ 0 ].innerHTML ), "member profile plugin exists" );
       plus();
     });
-    
+
     popped.exec( 4, function() {
-  
+
       ok( /none/.test( memberprofilediv.children[ 0 ].style.display ), "memberprofilediv contents are hidden again" );
       plus();
     });
-    
+
     // Testing the company insider plugin
     equals( companyinsiderdiv.innerHTML, "", "initially, there is nothing inside the companyinsiderdiv" );
     plus();
-        
+
     popped.linkedin({
       type: "companyinsider",
       companyid: "1441",
@@ -126,15 +126,15 @@ test("Popcorn LinkedIn Plugin", function () {
     });
 
     popped.exec( 2, function() {
-  
+
       ok( /block/.test( companyinsiderdiv.children[ 0 ].style.display ), "companyinsiderdiv contents are displayed" );
       plus();
       ok( /script/.test( companyinsiderdiv.children[ 0 ].innerHTML ), "company insider plugin exists" );
       plus();
     });
-    
+
     popped.exec( 4, function() {
-  
+
       ok( /none/.test( companyinsiderdiv.children[ 0 ].style.display ), "companyinsiderdiv contents are hidden again" );
       plus();
     });
@@ -142,7 +142,7 @@ test("Popcorn LinkedIn Plugin", function () {
     // Testing company profile plugin
     equals( companyprofilediv.innerHTML, "", "initially, there is nothing inside the companyprofilediv" );
     plus();
-    
+
     popped.linkedin({
       type: "companyprofile",
       companyid: "1441",
@@ -152,25 +152,25 @@ test("Popcorn LinkedIn Plugin", function () {
       start: 1,
       end: 3
     });
-    
+
     setupId = popped.getLastTrackEventId();
 
     popped.exec( 2, function() {
-  
+
       ok( /block/.test( companyprofilediv.children[ 0 ].style.display ), "companyprofilediv contents are displayed" );
       plus();
       ok( /script/.test( companyprofilediv.children[ 0 ].innerHTML ), "company profile plugin exists" );
       plus();
     });
-    
+
     popped.exec( 4, function() {
-  
+
       ok( /none/.test( companyprofilediv.children[ 0 ].style.display ), "companyprofilediv contents are hidden again" );
       plus();
-      
+
       // Make sure _teardown functionality works
       popped.pause().removeTrackEvent( setupId );
-      ok( !companyprofilediv.children[1], "companyprofilediv plugin was properly destroyed"  );
+      ok( !companyprofilediv.children[ 1 ], "companyprofilediv plugin was properly destroyed"  );
       plus();
     });
 
@@ -182,13 +182,13 @@ test("Popcorn LinkedIn Plugin", function () {
     try {
       popped.linkedin({});
     } catch( e ) {
-      ok(true, 'empty event was caught by debug');
+      ok( true, "empty event was caught by debug" );
       plus();
     }
 
     popped.volume( 0 ).play();
   } else {
-    
+
     // tests must be run on localhost
     ok( false, "LinkedIn apikey will only work under localhost" );
   }
diff --git a/plugins/lowerthird/popcorn.lowerthird.html b/plugins/lowerthird/popcorn.lowerthird.html
index c3cb77468..60750c378 100755
--- a/plugins/lowerthird/popcorn.lowerthird.html
+++ b/plugins/lowerthird/popcorn.lowerthird.html
@@ -40,11 +40,11 @@ <h1 id="qunit-header">Popcorn Lower Third Plug-in Demo</h1>
 
       <source id="mp4"
         src="../../test/trailer.mp4"
-        type="video/mp4; codecs='avc1, mp4a'">
+        type='video/mp4; codecs="avc1, mp4a"'>
 
       <source id="ogv"
         src="../../test/trailer.ogv"
-        type="video/ogg; codecs='theora, vorbis'">
+        type='video/ogg; codecs="theora, vorbis"'>
 
       <p>Your user agent does not support the HTML5 Video element.</p>
 
diff --git a/plugins/lowerthird/popcorn.lowerthird.unit.html b/plugins/lowerthird/popcorn.lowerthird.unit.html
index 1d549003b..714584070 100755
--- a/plugins/lowerthird/popcorn.lowerthird.unit.html
+++ b/plugins/lowerthird/popcorn.lowerthird.unit.html
@@ -29,11 +29,11 @@ <h2 id="qunit-userAgent"></h2>
 
     <source id="mp4"
       src="../../test/trailer.mp4"
-      type="video/mp4; codecs='avc1, mp4a'">
+      type='video/mp4; codecs="avc1, mp4a"'>
 
     <source id="ogv"
       src="../../test/trailer.ogv"
-      type="video/ogg; codecs='theora, vorbis'">
+      type='video/ogg; codecs="theora, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p>
 
diff --git a/plugins/mustache/popcorn.mustache.js b/plugins/mustache/popcorn.mustache.js
index 5d708c733..ed34b7e48 100755
--- a/plugins/mustache/popcorn.mustache.js
+++ b/plugins/mustache/popcorn.mustache.js
@@ -1,6 +1,6 @@
 // PLUGIN: Mustache
 
-(function (Popcorn) {
+(function ( Popcorn ) {
 
   /**
    * Mustache Popcorn Plug-in
@@ -84,11 +84,11 @@
   *
   */
 
-  Popcorn.plugin( 'mustache' , function( options ) {
+  Popcorn.plugin( "mustache" , function( options ) {
 
     var getData, data, getTemplate, template;
 
-    Popcorn.getScript('https://github.com/janl/mustache.js/raw/master/mustache.js');
+    Popcorn.getScript( "https://github.com/janl/mustache.js/raw/master/mustache.js" );
 
     var shouldReload = !!options.dynamic,
         typeOfTemplate = typeof options.template,
@@ -100,32 +100,32 @@
     }
     options.container = target || document.createElement( "div" );
 
-    if ( typeOfTemplate === 'function' ) {
+    if ( typeOfTemplate === "function" ) {
       if ( !shouldReload ) {
         template = options.template( options );
       } else {
         getTemplate = options.template;
       }
-    } else if ( typeOfTemplate === 'string' ) {
+    } else if ( typeOfTemplate === "string" ) {
       template = options.template;
     } else if ( Popcorn.plugin.debug ) {
-      throw new Error( 'Mustache Plugin Error: options.template must be a String or a Function.' );
+      throw new Error( "Mustache Plugin Error: options.template must be a String or a Function." );
     } else {
       template = "";
     }
 
-    if ( typeOfData === 'function' ) {
+    if ( typeOfData === "function" ) {
       if ( !shouldReload ) {
-        data = options.data(options);
+        data = options.data( options );
       } else {
         getData = options.data;
       }
-    } else if ( typeOfData === 'string' ) {
+    } else if ( typeOfData === "string" ) {
       data = JSON.parse( options.data );
-    } else if ( typeOfData === 'object' ) {
+    } else if ( typeOfData === "object" ) {
       data = options.data;
     } else if ( Popcorn.plugin.debug ) {
-      throw new Error( 'Mustache Plugin Error: options.data must be a String, Object, or Function.' );
+      throw new Error( "Mustache Plugin Error: options.data must be a String, Object, or Function." );
     } else {
       data = "";
     }
@@ -152,7 +152,7 @@
 
             var html = Mustache.to_html( template,
                                          data
-                                       ).replace( /^\s*/mg, '' );
+                                       ).replace( /^\s*/mg, "" );
             options.container.innerHTML = html;
           }
         };
@@ -162,7 +162,7 @@
       },
 
       end: function( event, options ) {
-        options.container.innerHTML = '';
+        options.container.innerHTML = "";
       },
       _teardown: function( options ) {
         getData = data = getTemplate = template = null;
@@ -171,19 +171,39 @@
   },
   {
     about: {
-      name: 'Popcorn Mustache Plugin',
-      version: '0.1',
-      author: 'David Humphrey (@humphd)',
-      website: 'http://vocamus.net/dave'
+      name: "Popcorn Mustache Plugin",
+      version: "0.1",
+      author: "David Humphrey (@humphd)",
+      website: "http://vocamus.net/dave"
     },
     options: {
-      start: {elem:'input', type:'text', label:'In'},
-      end: {elem:'input', type:'text', label:'Out'},
-      target: 'mustache-container',
-      template: {elem:'input', type:'text', label:'Template'},
-      data: {elem:'input', type:'text', label:'Data'},
+      start: {
+        elem: "input",
+        type: "text",
+        label: "In"
+      },
+      end: {
+        elem: "input",
+        type: "text",
+        label: "Out"
+      },
+      target: "mustache-container",
+      template: {
+        elem: "input",
+        type: "text",
+        label: "Template"
+      },
+      data: {
+        elem: "input",
+        type: "text",
+        label: "Data"
+      },
       /* TODO: how to show a checkbox/boolean? */
-      dynamic: {elem:'input', type:'text', label:'Dynamic'}
+      dynamic: {
+        elem: "input",
+        type: "text",
+        label: "Dynamic"
+      }
     }
   });
 })( Popcorn );
diff --git a/plugins/mustache/popcorn.mustache.unit.html b/plugins/mustache/popcorn.mustache.unit.html
index 18a329f99..64d54a053 100755
--- a/plugins/mustache/popcorn.mustache.unit.html
+++ b/plugins/mustache/popcorn.mustache.unit.html
@@ -23,18 +23,18 @@ <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
   <div id="qunit-fixture">  </div>
 
-  <video id='video'
+  <video id="video"
     autobuffer
     preload="auto"
     controls
-    width= '250px'
+    width= "250px"
     poster="../../test/poster.png">
 
-    <source id='mp4'
+    <source id="mp4"
       src="../../test/trailer.mp4"
       type='video/mp4; codecs="avc1, mp4a"'>
 
-    <source id='ogv'
+    <source id="ogv"
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'>
 
diff --git a/plugins/mustache/popcorn.mustache.unit.js b/plugins/mustache/popcorn.mustache.unit.js
index c330b60c7..2a331ce44 100755
--- a/plugins/mustache/popcorn.mustache.unit.js
+++ b/plugins/mustache/popcorn.mustache.unit.js
@@ -1,85 +1,85 @@
-test('Popcorn Mustache Plugin', function () {
+test( "Popcorn Mustache Plugin", function () {
 
-  var popped = Popcorn('#video'),
+  var popped = Popcorn( "#video" ),
       expects = 6,
       count = 0,
-      mustacheDiv = document.getElementById('mustache-div');
+      mustacheDiv = document.getElementById( "mustache-div" );
 
   expect( expects );
 
   function plus() {
-    if ( ++count === expects) {
+    if ( ++count === expects ) {
       start();
     }
   }
 
   stop();
 
-  ok('mustache' in popped, 'mustache is a method of the popped instance');
+  ok( "mustache" in popped, "mustache is a method of the popped instance" );
   plus();
 
-  equals ( mustacheDiv.innerHTML, '', 'initially, there is nothing inside the mustache-div' );
+  equals ( mustacheDiv.innerHTML, "", "initially, there is nothing inside the mustache-div" );
   plus();
 
   // Static strings
   popped.mustache({
-    start: 0, // seconds
-    end: 2, // seconds
-    template: '<h1>{{heading}}</h1>',
+    start: 0,
+    end: 2,
+    template: "<h1>{{heading}}</h1>",
     data: '{"heading": "mustache - test 1/3"}',
-    target: 'mustache-div',
+    target: "mustache-div",
     dynamic: false
-  } );
+  });
 
   // Dynamic functions
   popped.mustache({
-    start: 2, // seconds
-    end: 4, // seconds
-    template: function(plugin, options) {
-      return '<h1>{{heading}}</h1>';
+    start: 2,
+    end: 4,
+    template: function( plugin, options ) {
+      return "<h1>{{heading}}</h1>";
     },
-    data: function(plugin, options) {
-      return JSON.parse('{"heading": "mustache - test 2/3"}');
+    data: function( plugin, options ) {
+      return JSON.parse( '{"heading": "mustache - test 2/3"}' );
     },
-    target: 'mustache-div',
-  } );
+    target: "mustache-div",
+  });
 
   // Template + Object literal
   popped.mustache({
-    start: 4, // seconds
-    end: 5, // seconds
-    template: function(plugin, options) {
-      return '<h1>{{heading}}</h1>';
+    start: 4,
+    end: 5,
+    template: function( plugin, options ) {
+      return "<h1>{{heading}}</h1>";
     },
-    data: { heading: 'mustache - test 3/3' },
-    target: 'mustache-div',
+    data: { heading: "mustache - test 3/3" },
+    target: "mustache-div",
     dynamic: false
-  } );
+  });
 
-  var video = document.getElementById('video');
+  var video = document.getElementById( "video" );
   var two = six = ten = false;
 
-  video.addEventListener('timeupdate', function() {
+  video.addEventListener( "timeupdate", function() {
 
-    function pass(a, b) {
-      equals( mustacheDiv.innerHTML, '<h1>mustache - test ' + a + '/' + b + '<\/h1>','Mustache template rendered' );
+    function pass( a, b ) {
+      equals( mustacheDiv.innerHTML, "<h1>mustache - test " + a + "/" + b + "<\/h1>","Mustache template rendered" );
       plus();
     }
 
-    var t = Math.floor(video.currentTime);
+    var t = Math.floor( video.currentTime );
 
-    if (t === 1 && !two) {
-      pass(1, 3);
+    if ( t === 1 && !two ) {
+      pass( 1, 3 );
       two = true;
-    } else if (t === 3 && !six) {
-      pass(2, 3);
+    } else if ( t === 3 && !six ) {
+      pass( 2, 3 );
       six = true;
-    } else if (t === 4 && !ten) {
-      pass(3, 3);
+    } else if ( t === 4 && !ten ) {
+      pass( 3, 3 );
       ten = true;
     }
 
-    if (t === 6) {
+    if ( t === 6 ) {
       video.pause();
     }
 
@@ -93,10 +93,10 @@ test('Popcorn Mustache Plugin', function () {
   try {
     popped.mustache({});
   } catch( e ) {
-    ok(true, 'empty event was caught by debug');
+    ok( true, "empty event was caught by debug" );
     plus();
   }
 
-  popped.volume(0);
+  popped.volume( 0 );
   popped.play();
 });
diff --git a/plugins/openmap/popcorn.openmap.html b/plugins/openmap/popcorn.openmap.html
index 571eb460b..204023f5e 100755
--- a/plugins/openmap/popcorn.openmap.html
+++ b/plugins/openmap/popcorn.openmap.html
@@ -5,24 +5,24 @@
   <script src="../../popcorn.js"></script>
   <script src="popcorn.openmap.js"></script>
   <script>
-    document.addEventListener('DOMContentLoaded', function () {
-      Popcorn('#video')
+    document.addEventListener( "DOMContentLoaded", function () {
+      Popcorn( "#video" )
       .volume( 0 )
       .play()
       .openmap( {
         start: 0,
         end: 20,
-        type: 'ROADMAP',
-        target: 'map',
+        type: "ROADMAP",
+        target: "map",
         lat: 43.665429,
         lng: -79.403323,
         zoom: "10"
-      } )
+      })
       .openmap( {
         start: 0,
         end: 30,
-        type: 'SATELLITE',
-        target: 'map2',
+        type: "SATELLITE",
+        target: "map2",
         lat: 42.358544,
         lng: -71.05957,
         zoom: 9,
@@ -40,16 +40,16 @@
             text: "Another clickable marker"
           }
         ]
-      } )
-      .openmap( {
+      })
+      .openmap({
         start: 0,
         end: 20,
-        type: 'TERRAIN',
-        target: 'map3',
+        type: "TERRAIN",
+        target: "map3",
         lat: 40.943926,
         lng: -78.968525,
         zoom: 14
-      } );
+      });
     }, false);
   </script>
 </head>
@@ -59,20 +59,20 @@ <h1 id="qunit-header">Popcorn Open Map Plug-in Demo</h1>
   <p> An OpenLayers + NASA LandSat Map displaying Boston and a map marker will appear at 0 seconds and disappear at 30 seconds.</p>
   <p> An OpenLayers + USGS Topographic Map displaying Punxsutawney, PA will appear at 0 seconds and disappear at 20 seconds.</p>
   <div>
-    <video id='video' 
-      controls 
-      width= '250px'
-      poster="../../test/poster.png"> 
+    <video id="video"
+      controls
+      width= "250px"
+      poster="../../test/poster.png">
 
-      <source id='mp4'
+      <source id="mp4"
         src="../../test/trailer.mp4"
-        type='video/mp4;' codecs="avc1, mp4a"'> 
+        type='video/mp4; codecs="avc1, mp4a"'>
 
-      <source id='ogv'
+      <source id="ogv"
         src="../../test/trailer.ogv"
-        type='video/ogg;' codecs="theora, vorbis"'> 
+        type='video/ogg; codecs="theora, vorbis"'>
 
-      <p>Your user agent does not support the HTML5 Video element.</p> 
+      <p>Your user agent does not support the HTML5 Video element.</p>
 
     </video>
   </div>
@@ -82,4 +82,4 @@ <h1 id="qunit-header">Popcorn Open Map Plug-in Demo</h1>
     <div id="map3" style="position:relative;float:left;width:300px;height:400px"><p>Locations in this video:</p></div>
   </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/plugins/openmap/popcorn.openmap.js b/plugins/openmap/popcorn.openmap.js
index 95bfbac1f..f0c93562f 100755
--- a/plugins/openmap/popcorn.openmap.js
+++ b/plugins/openmap/popcorn.openmap.js
@@ -1,13 +1,13 @@
 // PLUGIN: OPENMAP
 ( function ( Popcorn ) {
-  
+
   /**
-   * openmap popcorn plug-in 
+   * openmap popcorn plug-in
    * Adds an OpenLayers map and open map tiles (OpenStreetMap [default], NASA WorldWind, or USGS Topographic)
    * Based on the googlemap popcorn plug-in. No StreetView support
    * Options parameter will need a start, end, target, type, zoom, lat and lng
    * -Start is the time that you want this plug-in to execute
-   * -End is the time that you want this plug-in to stop executing 
+   * -End is the time that you want this plug-in to stop executing
    * -Target is the id of the DOM element that you want the map to appear in. This element must be in the DOM
    * -Type [optional] either: ROADMAP (OpenStreetMap), SATELLITE (NASA WorldWind / LandSat), or TERRAIN (USGS).  ROADMAP/OpenStreetMap is the default.
    * -Zoom [optional] defaults to 2
@@ -20,9 +20,9 @@
    * --Lat and Lng are coordinates of the map marker if location is not specified
    * --Location is a name of a place for the map marker, geocoded to coordinates using TinyGeocoder.com
    *  Note: using location requires extra loading time, also not specifying both lat/lng and location will
-   * cause a JavaScript error. 
+   * cause a JavaScript error.
    * @param {Object} options
-   * 
+   *
    * Example:
      var p = Popcorn( '#video' )
         .openmap({
@@ -40,7 +40,7 @@
 
   function toggle( container, display ) {
     if ( container.map ) {
-      
+
       container.map.div.style.display = display;
       return;
     }
@@ -89,7 +89,7 @@
           Popcorn.getJSONP(
             "http://tinygeocoder.com/create-api.php?q=" + options.location + "&callback=jsonp",
             function( latlng ) {
-              centerlonlat = new OpenLayers.LonLat( latlng[1], latlng[0] );
+              centerlonlat = new OpenLayers.LonLat( latlng[ 1 ], latlng[ 0 ] );
               options.map.setCenter( centerlonlat );
             }
           );
@@ -110,7 +110,7 @@
           displayProjection = new OpenLayers.Projection( "EPSG:4326" );
           projection = new OpenLayers.Projection( "EPSG:4326" );
           options.map = new OpenLayers.Map( {div: newdiv, projection: projection } );
-          var relief = new OpenLayers.Layer.WMS( "USGS Terraserver", "http://terraserver-usa.org/ogcmap.ashx?", { layers: 'DRG' } ); 
+          var relief = new OpenLayers.Layer.WMS( "USGS Terraserver", "http://terraserver-usa.org/ogcmap.ashx?", { layers: 'DRG' } );
           options.map.addLayer( relief );
         } else {
           // add OpenStreetMap layer
@@ -126,22 +126,22 @@
         }
       }
     };
-    
+
     isGeoReady();
 
     return {
-    
+
       /**
-       * @member openmap 
-       * The setup function will be executed when the plug-in is instantiated 
+       * @member openmap
+       * The setup function will be executed when the plug-in is instantiated
        */
       _setup: function( options ) {
-      
+
         // insert openlayers api script once
         if ( !window.OpenLayers ) {
           Popcorn.getScript( "http://openlayers.org/api/OpenLayers.js" );
         }
-      
+
         var isReady = function() {
           // wait until OpenLayers has been loaded, and the start function is run, before adding map
           if ( !options.map ) {
@@ -149,10 +149,10 @@
               isReady();
             }, 13 );
           } else {
-          
+
             // default zoom is 2
             options.zoom = options.zoom || 2;
-            
+
             // make sure options.zoom is a number
             if ( options.zoom && typeof options.zoom !== "number" ) {
               options.zoom = +options.zoom;
@@ -161,7 +161,7 @@
             // reset the location and zoom just in case the user played with the map
             options.map.setCenter( centerlonlat, options.zoom );
             if ( options.markers ) {
-              var layerStyle = OpenLayers.Util.extend( {} , OpenLayers.Feature.Vector.style[ 'default' ] ),
+              var layerStyle = OpenLayers.Util.extend( {} , OpenLayers.Feature.Vector.style[ "default" ] ),
                   featureSelected = function( clickInfo ) {
                     clickedFeature = clickInfo.feature;
                     if ( !clickedFeature.attributes.text ) {
@@ -181,7 +181,7 @@
                     clickedFeature.popup = popup;
                     popup.feature = clickedFeature;
                     options.map.addPopup( popup );
-                  }, 
+                  },
                   featureUnSelected = function( clickInfo ) {
                     feature = clickInfo.feature;
                     if ( feature.popup ) {
@@ -205,7 +205,7 @@
                         myPointStyle.externalGraphic = myMarker.icon;
                         var myPointFeature = new OpenLayers.Feature.Vector( myPoint, null, myPointStyle );
                         if ( myMarker.text ) {
-                          myPointFeature.attributes = { 
+                          myPointFeature.attributes = {
                             text: myMarker.text
                           };
                         }
@@ -214,7 +214,7 @@
                     );
                   };
               pointLayer = new OpenLayers.Layer.Vector( "Point Layer", { style: layerStyle } );
-              options.map.addLayer( pointLayer ); 
+              options.map.addLayer( pointLayer );
               for ( var m = 0, l = options.markers.length; m < l ; m++ ) {
                 var myMarker = options.markers[ m ];
                 if( myMarker.text ){
@@ -230,7 +230,7 @@
                 }
                 if ( myMarker.location ) {
                   var geocodeThenPlotMarker = gcThenPlotMarker;
-                  geocodeThenPlotMarker(myMarker);
+                  geocodeThenPlotMarker( myMarker );
                 } else {
                   var myPoint = new OpenLayers.Geometry.Point( myMarker.lng, myMarker.lat ).transform( displayProjection, projection ),
                       myPointStyle = OpenLayers.Util.extend( {}, layerStyle );
@@ -242,7 +242,7 @@
                   myPointStyle.externalGraphic = myMarker.icon;
                   var myPointFeature = new OpenLayers.Feature.Vector( myPoint, null, myPointStyle );
                   if ( myMarker.text ) {
-                    myPointFeature.attributes = { 
+                    myPointFeature.attributes = {
                       text: myMarker.text
                     };
                   }
@@ -252,30 +252,30 @@
             }
           }
         };
-        
+
         isReady();
       },
-      
+
       /**
-       * @member openmap 
-       * The start function will be executed when the currentTime 
-       * of the video  reaches the start time provided by the 
+       * @member openmap
+       * The start function will be executed when the currentTime
+       * of the video  reaches the start time provided by the
        * options variable
        */
       start: function( event, options ) {
         toggle( options, "block" );
       },
-      
+
       /**
        * @member openmap
-       * The end function will be executed when the currentTime 
-       * of the video reaches the end time provided by the 
+       * The end function will be executed when the currentTime
+       * of the video reaches the end time provided by the
        * options variable
        */
       end: function( event, options ) {
-          toggle( options, "none" );        
+          toggle( options, "none" );
       },
-      
+
       _teardown: function( options ) {
 
         target && target.removeChild( newdiv );
@@ -291,15 +291,47 @@
       website: "mapadelsur.blogspot.com"
     },
     options:{
-      start    : { elem: 'input', type: 'text', label: 'In'},
-      end      : { elem: 'input', type: 'text', label: 'Out'},
-      target   : 'map-container',
-      type     : { elem: 'select', options:[ 'ROADMAP', 'SATELLITE', 'TERRAIN' ], label: 'Type' },
-      zoom     : { elem: 'input', type: 'text', label: 'Zoom'},
-      lat      : { elem: 'input', type: 'text', label: 'Lat'},
-      lng      : { elem: 'input', type: 'text', label: 'Lng'},
-      location : { elem: 'input', type: 'text', label: 'Location'},
-      markers  : { elem: 'input', type: 'text', label: 'List Markers'}
+      start: {
+        elem: "input",
+        type: "text",
+        label: "In"
+      },
+      end: {
+        elem: "input",
+        type: "text",
+        label: "Out"
+      },
+      target: "map-container",
+      type: {
+        elem: "select",
+        options: [ "ROADMAP", "SATELLITE", "TERRAIN" ],
+        label: "Type"
+      },
+      zoom: {
+        elem: "input",
+        type: "text",
+        label: "Zoom"
+      },
+      lat: {
+        elem: "input",
+        type: "text",
+        label: "Lat"
+      },
+      lng: {
+        elem: "input",
+        type: "text",
+        label: "Lng"
+      },
+      location: {
+        elem: "input",
+        type: "text",
+        label: "Location"
+      },
+      markers: {
+        elem: "input",
+        type: "text",
+        label: "List Markers"
+      }
     }
   });
 }) ( Popcorn );
diff --git a/plugins/openmap/popcorn.openmap.unit.html b/plugins/openmap/popcorn.openmap.unit.html
index aa9dc9a83..00f1a3179 100755
--- a/plugins/openmap/popcorn.openmap.unit.html
+++ b/plugins/openmap/popcorn.openmap.unit.html
@@ -4,14 +4,12 @@
   <title>Popcorn Open Map Test</title>
   <link rel="stylesheet" href="../../test/qunit/qunit.css" type="text/css" media="screen">
   <script src="../../test/qunit/qunit.js"></script>
-  <!-- 
-    do not move - this must be called immediately prior to 
+  <!--
+    do not move - this must be called immediately prior to
     popcorn-api-draft.js
   -->
-  
   <script src="../../popcorn.js"></script>
   <script src="popcorn.openmap.js"></script>
-
   <script src="popcorn.openmap.unit.js"></script>
 </head>
 <body>
@@ -21,24 +19,24 @@ <h2 id="qunit-banner"></h2>
   <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
   <div id="qunit-fixture">  </div>
-  
-  <video id='video' 
-    controls preload='none' 
-    width= '250px'
-    poster="../../test/poster.png"> 
 
-    <source id='mp4'
+  <video id="video"
+    controls preload="none"
+    width= "250px"
+    poster="../../test/poster.png">
+
+    <source id="mp4"
       src="../../test/trailer.mp4"
-      type='video/mp4;' codecs="avc1, mp4a"'> 
+      type='video/mp4; codecs="avc1, mp4a"'>
 
-    <source id='ogv'
+    <source id="ogv"
       src="../../test/trailer.ogv"
-      type='video/ogg;' codecs="theora, vorbis"'> 
+      type='video/ogg; codecs="theora, vorbis"'>
 
-    <p>Your user agent does not support the HTML5 Video element.</p> 
+    <p>Your user agent does not support the HTML5 Video element.</p>
 
-  </video> 
-  <div id="map" style="position:relative;float:left;width:300px;height:400px"></div> 
+  </video>
+  <div id="map" style="position:relative;float:left;width:300px;height:400px"></div>
   <div id="map2" style="position:relative;float:left;width:300px;height:400px"></div>
   <div id="map3" style="position:relative;float:left;width:300px;height:400px"></div>
   <div id="map4" style="position:relative;float:left;width:300px;height:400px"></div>
diff --git a/plugins/openmap/popcorn.openmap.unit.js b/plugins/openmap/popcorn.openmap.unit.js
index b7216cef5..20cf25621 100755
--- a/plugins/openmap/popcorn.openmap.unit.js
+++ b/plugins/openmap/popcorn.openmap.unit.js
@@ -1,108 +1,108 @@
 test( "Popcorn OpenMap Plugin", function () {
-  
-  var popped = Popcorn("#video"),
-     expects = 15, 
+
+  var popped = Popcorn( "#video" ),
+     expects = 15,
      count = 0;
-  
-  expect(expects);
-  
+
+  expect( expects );
+
   function plus() {
-    if ( ++count===expects) {
+    if ( ++count===expects ) {
       start();
     }
   }
-  
+
   stop();
 
-  ok ('openmap' in popped, "openmap is a method of the popped instance");
+  ok ( "openmap" in popped, "openmap is a method of the popped instance" );
   plus();
-  
-  ok ( document.getElementById('map').innerHTML === "", "initially, there is nothing inside map" );
+
+  ok ( document.getElementById( "map" ).innerHTML === "", "initially, there is nothing inside map" );
   plus();
-  
-  ok ( document.getElementById('map2').innerHTML === "", "initially, there is nothing inside map2" );
+
+  ok ( document.getElementById( "map2" ).innerHTML === "", "initially, there is nothing inside map2" );
   plus();
 
-  ok ( document.getElementById('map3').innerHTML === "", "initially, there is nothing inside map3" );
+  ok ( document.getElementById( "map3" ).innerHTML === "", "initially, there is nothing inside map3" );
   plus();
-  
+
   popped.openmap({
     start: 0,
     end: 4,
-    type: 'ROADMAP',
-    target: 'map',
+    type: "ROADMAP",
+    target: "map",
     lat: 43.665429,
     lng: -79.403323,
     zoom: 10
-  } )
+  })
   .openmap({
     start: 0,
     end: 4,
-    type: 'SATELLITE',
-    target: 'map2',
+    type: "SATELLITE",
+    target: :map2",
     lat: 40.943926,
     lng: -78.968525,
     zoom: 9
-  } )
-  .openmap( {
+  })
+  .openmap({
     start: 0,
     end: 4,
-    type: 'TERRAIN',
-    target: 'map3',
+    type: "TERRAIN",
+    target: "map3",
     lat: 40.943926,
     lng: -78.968525,
     zoom: 14
-  } )
-  .openmap( {
+  })
+  .openmap({
     start: 0,
     end: 4,
-    target: 'map4',
+    target: "map4",
     lat: 40.943926,
     lng: -78.968525,
     zoom: "14"
-  } )
-  .volume(0)
+  })
+  .volume( 0 )
   .play();
 
   setupId = popped.getLastTrackEventId();
 
   popped.exec( 3, function() {
-    ok(OpenLayers, "OpenLayers is available");
+    ok( OpenLayers, "OpenLayers is available" );
     plus();
 
-    ok (document.getElementById('openmapdiv1'), "First map is on the page" );
+    ok ( document.getElementById( "openmapdiv1" ), "First map is on the page" );
     plus();
 
-    equals (document.getElementById('openmapdiv1').offsetParent.id, "map", "First map is inside the 'map' div" );
+    equals ( document.getElementById( "openmapdiv1" ).offsetParent.id, "map", "First map is inside the 'map' div" );
     plus();
 
-    ok (document.getElementById('openmapdiv2'), "Second map is on the page" );
+    ok ( document.getElementById( "openmapdiv2" ), "Second map is on the page" );
     plus();
 
-    equals (document.getElementById('openmapdiv2').offsetParent.id, "map2", "Second map is inside the 'map2' div" );
+    equals ( document.getElementById( "openmapdiv2" ).offsetParent.id, "map2", "Second map is inside the 'map2' div" );
     plus();
 
-    ok (document.getElementById('openmapdiv3'), "Third map is on the page" );
+    ok ( document.getElementById( "openmapdiv3" ), "Third map is on the page" );
     plus();
 
-    equals (document.getElementById('openmapdiv3').offsetParent.id, "map3", "Third map is inside the 'map3' div" );
+    equals ( document.getElementById( "openmapdiv3" ).offsetParent.id, "map3", "Third map is inside the 'map3' div" );
     plus();
 
-    ok (document.getElementById('openmapdiv4'), "Fourth map is on the page" );
+    ok ( document.getElementById( "openmapdiv4" ), "Fourth map is on the page" );
     plus();
-    equals (document.getElementById('openmapdiv4').offsetParent.id, "map4", "Fourth map is inside the 'map4' div" );
+    equals ( document.getElementById( "openmapdiv4" ).offsetParent.id, "map4", "Fourth map is inside the 'map4' div" );
     plus();
 
   } )
   .exec( 5, function() {
-    ok (document.getElementById('openmapdiv2').style.display === "none" && 
-        document.getElementById('openmapdiv3').style.display === "none" && 
-        document.getElementById('openmapdiv4').style.display === "none" &&
-        document.getElementById('openmapdiv1').style.display === "none", "All three maps are no longer visible" );
+    ok ( document.getElementById( "openmapdiv2" ).style.display === "none" &&
+        document.getElementById( "openmapdiv3" ).style.display === "none" &&
+        document.getElementById( "openmapdiv4" ).style.display === "none" &&
+        document.getElementById( "openmapdiv1" ).style.display === "none", "All three maps are no longer visible" );
     plus();
     popped.pause().removeTrackEvent( setupId );
-    ok( !document.getElementById('actualmap3'), "removed map was properly destroyed" );
+    ok( !document.getElementById( "actualmap3" ), "removed map was properly destroyed" );
     plus();
 
-  } );
-} );
+  });
+});
diff --git a/plugins/pause/popcorn.pause.html b/plugins/pause/popcorn.pause.html
index 0eafa020d..018bba2a3 100755
--- a/plugins/pause/popcorn.pause.html
+++ b/plugins/pause/popcorn.pause.html
@@ -29,11 +29,11 @@ <h1 id="qunit-header">Popcorn Code Plugin Demo</h1>
 
       <source id="mp4"
         src="../../test/trailer.mp4"
-        type="video/mp4; codecs='avc1, mp4a'" />
+        type='video/mp4; codecs="avc1, mp4a"' />
 
       <source id="ogv"
         src="../../test/trailer.ogv"
-        type="video/ogg; codecs='theora, vorbis'" />
+        type='video/ogg; codecs="theora, vorbis"' />
 
       <p>Your user agent does not support the HTML5 Video element.</p>
 
diff --git a/plugins/pause/popcorn.pause.unit.html b/plugins/pause/popcorn.pause.unit.html
index 90b301476..ec84b1ddd 100755
--- a/plugins/pause/popcorn.pause.unit.html
+++ b/plugins/pause/popcorn.pause.unit.html
@@ -32,11 +32,11 @@ <h2 id="qunit-userAgent"></h2>
 
     <source id="mp4"
       src="../../test/trailer.mp4"
-      type="video/mp4; codecs='avc1, mp4a'" />
+      type='video/mp4; codecs="avc1, mp4a"' />
 
     <source id="ogv"
       src="../../test/trailer.ogv"
-      type="video/ogg; codecs='theora, vorbis'" />
+      type='video/ogg; codecs="theora, vorbis"' />
 
     <p>Your user agent does not support the HTML5 Video element.</p>
   </video>
@@ -49,11 +49,11 @@ <h2 id="qunit-userAgent"></h2>
 
     <source id="mp4"
       src="../../test/trailer.mp4"
-      type="video/mp4; codecs='avc1, mp4a'">
+      type='video/mp4; codecs="avc1, mp4a"'>
 
     <source id="ogv"
       src="../../test/trailer.ogv"
-      type="video/ogg; codecs='theora, vorbis'">
+      type='video/ogg; codecs="theora, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p>
   </video>
diff --git a/plugins/processing/popcorn.processing.html b/plugins/processing/popcorn.processing.html
index 33f7a2195..41a32b76e 100644
--- a/plugins/processing/popcorn.processing.html
+++ b/plugins/processing/popcorn.processing.html
@@ -1,10 +1,10 @@
 <html>
 <head>
-  
+
   <title>Popcorn processing Plug-in Simple Demo</title>
   <script src="../../popcorn.js"></script>
   <script src="popcorn.processing.js"></script>
-  
+
   <script>
     document.addEventListener( "DOMContentLoaded", function () {
       var p = Popcorn( "#video" )
@@ -44,18 +44,18 @@
 </head>
 <body>
   <h1 id="qunit-header">Popcorn processing Plug-in Simple Demo</h1>
-  
+
   <div>
-    <video id='video'
+    <video id="video"
       controls preload="auto"
-      width= '250px'
+      width= "250px"
       poster="../../test/poster.png">
 
-      <source id='mp4'
+      <source id="mp4"
         src="../../test/trailer.mp4"
         type='video/mp4; codecs="avc1, mp4a"'>
 
-      <source id='ogv'
+      <source id="ogv"
         src="../../test/trailer.ogv"
         type='video/ogg; codecs="theora, vorbis"'>
 
diff --git a/plugins/processing/popcorn.processing.js b/plugins/processing/popcorn.processing.js
index e1ddc5c82..47d327f9b 100644
--- a/plugins/processing/popcorn.processing.js
+++ b/plugins/processing/popcorn.processing.js
@@ -2,9 +2,9 @@
  * Processing Popcorn Plug-In
  *
  * This plugin adds a Processing.js sketch to be added to a target div or canvas.
- * 
+ *
  * Options parameter needs to specify start, end, target and  sketch attributes
- * -Start is the time [in seconds] that you want the sketch to display and start looping. 
+ * -Start is the time [in seconds] that you want the sketch to display and start looping.
  * -End is the time [in seconds] you want the sketch to become hidden and stop looping.
  * -Target is the id of the div or canvas you want the target sketch to be displayed in. ( a target that is a div will have a canvas created and placed inside of it. )
  * -Sketch specifies the filename of the Procesing code to be loaded into Processing.js
@@ -29,7 +29,7 @@
   Popcorn.plugin( "processing" , function ( options ) {
 
     var init = function( context ) {
-    
+
       var initProcessing,
         canvas;
 
@@ -39,11 +39,11 @@
       }
 
       options.parentTarget = document.getElementById( options.target );
-      
+
       if ( !options.parentTarget && Popcorn.plugin.debug ) {
         throw new Error( "target container doesn't exist" );
       }
-      
+
       initProcessing = function() {
         var addListeners = function() {
           context.listen( "pause", function () {
@@ -57,7 +57,7 @@
             }
           });
         };
-        
+
         if ( window.Processing ) {
 
           options.pjsInstance = new Processing( options.canvas, options.processingCode );
@@ -68,23 +68,23 @@
           });
 
           options._running && !context.media.paused && options.pjsInstance.loop();
-          
+
           options.noPause = options.noPause || false;
-          !options.noPause && addListeners(); 
-          options.codeReady = true;         
+          !options.noPause && addListeners();
+          options.codeReady = true;
         } else {
           setTimeout ( function() {
             initProcessing.call( this );
             }, 10 );
         }
       };
-      
+
       canvas = document.createElement( "canvas" );
       canvas.id = Popcorn.guid( options.target + "-sketch-" );
       canvas[ "data-processing-sources" ] =  options.sketch;
-      canvas.style.display = "none";   
+      canvas.style.display = "none";
       options.canvas = canvas;
-      
+
       options.parentTarget && options.parentTarget.appendChild( options.canvas );
 
       if ( options.sketch ) {
@@ -109,7 +109,7 @@
     return {
 
       _setup: function( options ) {
-        
+
         options.codeReady = false;
 
         init( this );
@@ -122,11 +122,11 @@
       },
 
       end: function( event, options ) {
-        
+
         options.pjsInstance && options.pjsInstance.noLoop();
         options.canvas.style.display = "none";
       },
-      
+
       _teardown: function( options ) {
         options.pjsInstance && options.pjsInstance.exit();
         options.parentTarget && options.parentTarget.removeChild( options.canvas );
@@ -141,11 +141,31 @@
       website: "cadecairos.blogspot.com, ben1amin.wordpress.org"
     },
     options: {
-      start :   { elem: "input", type: "text", label: "In" },
-      end :     { elem: "input", type: "text", label: "Out" },
-      target :  { elem: "input", type: "text", label: "Target" },
-      sketch :  { elem: "input", type: "text", label: "Sketch" },
-      noPause : { elem: "select", options: [ "TRUE", "FALSE" ], label: "No Loop" }
+      start:   {
+        elem: "input",
+        type: "text",
+        label: "In"
+      },
+      end: {
+        elem: "input",
+        type: "text",
+        label: "Out"
+      },
+      target: {
+        elem: "input",
+        type: "text",
+        label: "Target"
+      },
+      sketch: {
+        elem: "input",
+        type: "text",
+        label: "Sketch"
+      },
+      noPause: {
+        elem: "select",
+        options: [ "TRUE", "FALSE" ],
+        label: "No Loop"
+      }
     }
   });
 }( Popcorn ));
diff --git a/plugins/processing/popcorn.processing.unit.html b/plugins/processing/popcorn.processing.unit.html
index 6dd7ad75e..446d658c7 100644
--- a/plugins/processing/popcorn.processing.unit.html
+++ b/plugins/processing/popcorn.processing.unit.html
@@ -1,10 +1,10 @@
 <html>
 <head>
-  
+
   <title>Popcorn processing unit Tests</title>
   <link rel="stylesheet" href="../../test/qunit/qunit.css" type="text/css" media="screen">
   <script src="../../test/qunit/qunit.js"></script>
-  
+
   <script src="../../popcorn.js"></script>
   <script src="popcorn.processing.js"></script>
   <script src="popcorn.processing.unit.js"></script>
@@ -17,16 +17,16 @@ <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
   <div id="qunit-fixture">  </div>
   <div>
-    <video id='video'
-      controls preload='none'
-      width= '250px'
+    <video id="video"
+      controls preload="none"
+      width= "250px"
       poster="../../test/poster.png">
 
-      <source id='mp4'
+      <source id="mp4"
         src="../../test/trailer.mp4"
         type='video/mp4; codecs="avc1, mp4a"'>
 
-      <source id='ogv'
+      <source id="ogv"
         src="../../test/trailer.ogv"
         type='video/ogg; codecs="theora, vorbis"'>
 
diff --git a/plugins/processing/popcorn.processing.unit.js b/plugins/processing/popcorn.processing.unit.js
index e44c5c748..881b74058 100644
--- a/plugins/processing/popcorn.processing.unit.js
+++ b/plugins/processing/popcorn.processing.unit.js
@@ -10,27 +10,27 @@ test( "Processing plugin tests", function() {
       trackids = [];
 
   expect( expects );
-  
+
   function plus() {
     if ( ++count === expects ) {
       start();
     }
   }
-  
+
   stop();
-  
+
   ok( "processing" in popped, "processing is a method of the popped instance" );
   plus();
 
   equals( processingDiv.innerHTML, "", "'processing-div-1' is empty" );
   plus();
-  
+
   equals( processingDiv2.innerHTML, "", "'processing-div-2' is empty" );
   plus();
-  
+
   equals( processingDiv3.innerHTML, "", "'processing-div-3' is empty" );
   plus();
-  
+
   equals( processingDiv4.innerHTML, "", "'processing-div-4' is empty" );
   plus();
 
@@ -41,7 +41,7 @@ test( "Processing plugin tests", function() {
     sketch: "test.pjs"
   });
   trackids.push( popped.getLastTrackEventId() );
-  
+
   popped.processing({
     start: 1,
     end: 3,
@@ -49,7 +49,7 @@ test( "Processing plugin tests", function() {
     sketch: "test2.pjs"
   });
   trackids.push( popped.getLastTrackEventId() );
-  
+
   popped.processing({
     start: 3,
     end: 4,
@@ -65,7 +65,7 @@ test( "Processing plugin tests", function() {
     sketch: "test2.pjs"
   });
   trackids.push( popped.getLastTrackEventId() );
-   
+
   popped.exec( 0.5, function() {
     equals( processingDiv.children[ 0 ].style.display, "inline", "canvas '" + processingDiv.children[ 0 ].id + "' is displayed" );
     plus();
@@ -75,7 +75,7 @@ test( "Processing plugin tests", function() {
     plus();
     equals( processingDiv4.children[ 0 ].style.display, "none", "canvas '" + processingDiv4.children[ 0 ].id + "' is hidden" );
     plus();
-    //TODO: David Humphrey has written code that allows for listening to events on Processing instances. when 
+    //TODO: David Humphrey has written code that allows for listening to events on Processing instances. when
     // it lands In the next processing release we'll be able to detect if a processing instance is looping or not.
     // this is required in order to test the noPause functionality (automatically)
   })
@@ -97,7 +97,7 @@ test( "Processing plugin tests", function() {
     plus();
     equals( processingDiv4.children[ 0 ].style.display, "inline", "canvas '" + processingDiv4.children[ 0 ].id + "' is displayed" );
     plus();
-  }).exec( 4.5, function() { 
+  }).exec( 4.5, function() {
     var idx = 5;
     while ( --idx ) {
       popped.removeTrackEvent( trackids.pop() );
@@ -105,19 +105,19 @@ test( "Processing plugin tests", function() {
       plus();
     }
   });
-  
+
   ok( "processing" in popped, "processing is a method of the popped instance" );
   plus();
-  
+
   //check that four canvases were created
-  canvases = document.querySelectorAll( "canvas" ); 
+  canvases = document.querySelectorAll( "canvas" );
   equals( canvases.length, 4, "four canvases are present" );
   plus();
 
   //enable this when ticket #583 lands
   //Popcorn.forEach( canvases, function( ctx, idx ) {
   [].forEach.call( canvases, function( ctx ) {
- 
+
     var idCount = 0, i = -1, len = canvases.length;
     for ( ; ++i < len; ){
       if ( ctx.id === canvases[ i ].id ) {
@@ -143,6 +143,6 @@ test( "Processing plugin tests", function() {
     ok(true, 'empty event was caught by debug');
     plus();
   }
-  
+
   popped.play();
 });
diff --git a/plugins/subtitle/popcorn.subtitle.html b/plugins/subtitle/popcorn.subtitle.html
index bba8e9658..811fcb49e 100755
--- a/plugins/subtitle/popcorn.subtitle.html
+++ b/plugins/subtitle/popcorn.subtitle.html
@@ -2,28 +2,24 @@
 <html>
 <head>
   <title>Popcorn Subtitle Plug-in Demo</title>
-  
   <script src="../../popcorn.js"></script>
-
   <script src="popcorn.subtitle.js"></script>
   <script>
-    document.addEventListener('DOMContentLoaded', function () {
-      var p = Popcorn('#video')
-      .volume(0)
-      .play() 
+    document.addEventListener( "DOMContentLoaded", function () {
+      var p = Popcorn( "#video" )
+      .volume( 0 )
+      .play()
       .subtitle({
-        start: 5, // seconds
-        end: 15, // seconds
-        text: 'this is the first subtitle of 2011',
-      } )
+        start: 5,
+        end: 15,
+        text: "this is the first subtitle of 2011",
+      })
       .subtitle({
-        start: 20, // seconds
-        end: 45, // seconds
-        text: 'this is the second subtitle of 2011',
-      } )
-
+        start: 20,
+        end: 45,
+        text: "this is the second subtitle of 2011",
+      })
     }, false);
-
   </script>
 </head>
 <body>
@@ -32,21 +28,21 @@ <h1 id="qunit-header">Popcorn Subtitle Plug-in Demo</h1>
   <p> A subtitle displaying 'this is the second subtitle of 2011' will appear at 20 seconds and disappear at 45 seconds.</p>
   <div>
 
-    <video id='video' 
+    <video id="video"
       controls height="480" width="854"
-      poster="../../test/poster.png"> 
+      poster="../../test/poster.png">
 
-      <source id='mp4'
+      <source id="mp4"
         src="../../test/trailer.mp4"
-        type='video/mp4; codecs="avc1, mp4a"'> 
+        type='video/mp4; codecs="avc1, mp4a"'>
 
-      <source id='ogv'
+      <source id="ogv"
         src="../../test/trailer.ogv"
-        type='video/ogg; codecs="theora, vorbis"'> 
+        type='video/ogg; codecs="theora, vorbis"'>
 
-      <p>Your user agent does not support the HTML5 Video element.</p> 
+      <p>Your user agent does not support the HTML5 Video element.</p>
 
-    </video> 
+    </video>
   </div>
 
 </body>
diff --git a/plugins/subtitle/popcorn.subtitle.js b/plugins/subtitle/popcorn.subtitle.js
index 50b4043d5..58dbd8da8 100755
--- a/plugins/subtitle/popcorn.subtitle.js
+++ b/plugins/subtitle/popcorn.subtitle.js
@@ -33,7 +33,7 @@
       };
 
   /**
-   * Subtitle popcorn plug-in 
+   * Subtitle popcorn plug-in
    * Displays a subtitle over the video, or in the target div
    * Options parameter will need a start, and end.
    * Optional parameters are target and text.
@@ -44,7 +44,7 @@
    * Text is the text of the subtitle you want to display.
    *
    * @param {Object} options
-   * 
+   *
    * Example:
      var p = Popcorn('#video')
         .subtitle({
@@ -57,7 +57,7 @@
    */
 
   Popcorn.plugin( "subtitle" , {
-    
+
       manifest: {
         about: {
           name: "Popcorn Subtitle Plugin",
@@ -67,19 +67,19 @@
         },
         options: {
           start: {
-            elem: "input", 
-            type: "text", 
+            elem: "input",
+            type: "text",
             label: "In"
           },
           end: {
-            elem: "input", 
-            type: "text", 
+            elem: "input",
+            type: "text",
             label: "Out"
           },
           target: "subtitle-container",
           text: {
-            elem: "input", 
-            type: "text", 
+            elem: "input",
+            type: "text",
             label: "Text"
           }
         }
@@ -92,13 +92,13 @@
         newdiv.style.display = "none";
 
         // Creates a div for all subtitles to use
-        ( !this.container && ( !options.target || options.target === "subtitle-container" ) ) && 
+        ( !this.container && ( !options.target || options.target === "subtitle-container" ) ) &&
           createDefaultContainer( this );
 
         // if a target is specified, use that
         if ( options.target && options.target !== "subtitle-container" ) {
           options.container = document.getElementById( options.target );
-        } else { 
+        } else {
           // use shared default container
           options.container = this.container;
         }
@@ -111,9 +111,9 @@
         };
       },
       /**
-       * @member subtitle 
-       * The start function will be executed when the currentTime 
-       * of the video  reaches the start time provided by the 
+       * @member subtitle
+       * The start function will be executed when the currentTime
+       * of the video  reaches the start time provided by the
        * options variable
        */
       start: function( event, options ){
@@ -121,9 +121,9 @@
         options.showSubtitle( options, options.text );
       },
       /**
-       * @member subtitle 
-       * The end function will be executed when the currentTime 
-       * of the video  reaches the end time provided by the 
+       * @member subtitle
+       * The end function will be executed when the currentTime
+       * of the video  reaches the end time provided by the
        * options variable
        */
       end: function( event, options ) {
@@ -134,7 +134,7 @@
       _teardown: function ( options ) {
         options.container.removeChild( options.innerContainer );
       }
-   
+
   });
 
 })( Popcorn );
diff --git a/plugins/subtitle/popcorn.subtitle.unit.html b/plugins/subtitle/popcorn.subtitle.unit.html
index ff84ce35c..45daaf3aa 100755
--- a/plugins/subtitle/popcorn.subtitle.unit.html
+++ b/plugins/subtitle/popcorn.subtitle.unit.html
@@ -4,13 +4,11 @@
   <title>Popcorn Subtitle Plug-in Test</title>
   <link rel="stylesheet" href="../../test/qunit/qunit.css" type="text/css" media="screen">
   <script src="../../test/qunit/qunit.js"></script>
-  <!-- 
-    do not move - this must be called immediately prior to 
+  <!--
+    do not move - this must be called immediately prior to
     popcorn-api-draft.js
   -->
-  
   <script src="../../popcorn.js"></script>
-  
   <script src="popcorn.subtitle.js"></script>
   <script src="popcorn.subtitle.unit.js"></script>
 </head>
@@ -21,38 +19,38 @@ <h2 id="qunit-banner"></h2>
   <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
   <div id="qunit-fixture">  </div>
-  
-  <video id='video' 
-    controls preload='none' 
-    width= '250px'
-    poster="../../test/poster.png"> 
 
-    <source id='mp4'
+  <video id="video"
+    controls preload="none"
+    width= "250px"
+    poster="../../test/poster.png">
+
+    <source id="mp4"
       src="../../test/trailer.mp4"
-      type='video/mp4; codecs="avc1, mp4a"'> 
+      type='video/mp4; codecs="avc1, mp4a"'>
 
-    <source id='ogv'
+    <source id="ogv"
       src="../../test/trailer.ogv"
-      type='video/ogg; codecs="theora, vorbis"'> 
+      type='video/ogg; codecs="theora, vorbis"'>
 
-    <p>Your user agent does not support the HTML5 Video element.</p> 
+    <p>Your user agent does not support the HTML5 Video element.</p>
 
   </video>
-  <video id='video2' 
-    controls preload='none' 
-    width= '250px'
-    poster="../../test/poster.png"> 
+  <video id="video2"
+    controls preload="none"
+    width= "250px"
+    poster="../../test/poster.png">
 
-    <source id='mp4'
+    <source id="mp4"
       src="../../test/trailer.mp4"
-      type='video/mp4; codecs="avc1, mp4a"'> 
+      type='video/mp4; codecs="avc1, mp4a"'>
 
-    <source id='ogv'
+    <source id="ogv"
       src="../../test/trailer.ogv"
-      type='video/ogg; codecs="theora, vorbis"'> 
+      type='video/ogg; codecs="theora, vorbis"'>
 
-    <p>Your user agent does not support the HTML5 Video element.</p> 
+    <p>Your user agent does not support the HTML5 Video element.</p>
 
-  </video> 
+  </video>
 </body>
 </html>
diff --git a/plugins/subtitle/popcorn.subtitle.unit.js b/plugins/subtitle/popcorn.subtitle.unit.js
index c4c53267a..2bdabb5ce 100755
--- a/plugins/subtitle/popcorn.subtitle.unit.js
+++ b/plugins/subtitle/popcorn.subtitle.unit.js
@@ -1,5 +1,5 @@
-test("Popcorn Subtitle Plugin", function () {
- 
+test( "Popcorn Subtitle Plugin", function () {
+
   var popped = Popcorn( "#video" ),
       popped2 = Popcorn( "#video2" ),
       expects = 12,
@@ -8,36 +8,36 @@ test("Popcorn Subtitle Plugin", function () {
       subLeft = 9001,
       subtitlediv,
       subtitle2div;
- 
-  expect(expects);
- 
+
+  expect( expects );
+
   function plus() {
     if ( ++count === expects ) {
       start();
     }
   }
- 
+
   stop( 12000 );
-   
-  ok ( 'subtitle' in popped, "subtitle is a method of the popped instance" );
+
+  ok ( "subtitle" in popped, "subtitle is a method of the popped instance" );
   plus();
- 
+
   popped.subtitle({
       start: 0,
       end: 2,
-      text: 'this is the first subtitle of 2011',
-    } )
+      text: "this is the first subtitle of 2011",
+    })
   .subtitle({
       start: 2,
       end: 4,
-      text: 'this is the second subtitle of 2011',
-    } )
+      text: "this is the second subtitle of 2011",
+    })
   .subtitle({
       start: 5,
       end: 7,
-      text: 'this is the third subtitle of 2011',
+      text: "this is the third subtitle of 2011",
     } )
-    .volume(0)
+    .volume( 0 )
     .play();
 
   subtitlediv = popped.getTrackEvent( popped.getLastTrackEventId() ).container;
@@ -45,42 +45,41 @@ test("Popcorn Subtitle Plugin", function () {
   popped.subtitle({
     start: 7,
     end: 9,
-    text: 'instance one test'
+    text: "instance one test"
   });
 
   popped2.subtitle({
       start: 7,
       end: 9,
-      text: 'instance two test'
+      text: "instance two test"
     })
-    .volume(0)
+    .volume( 0 )
     .play().pause();
 
   subtitle2div = popped2.getTrackEvent( popped2.getLastTrackEventId() ).container;
 
   popped.exec( 1, function() {
-   
+
     popped.media.pause();
     equals( subtitlediv.children[ 0 ].innerHTML, "this is the first subtitle of 2011", "subtitle displaying correct information" );
     plus();
-   
- 
+
     // capturing location now, to check against later,
     // a subtitle must be displayed to get valid data
     // which is why we do this in exec
     subLeft = subtitlediv.style.left;
     subTop  = subtitlediv.style.top;
- 
+
     // changing position
     popped.media.style.position = "absolute";
     popped.media.style.left = "400px";
     popped.media.style.top = "600px";
     popped.media.play();
-   
+
   });
- 
+
   popped.exec( 3, function() {
- 
+
     popped.media.pause();
 
     // check position of subttile that should of moved with video,
@@ -89,7 +88,7 @@ test("Popcorn Subtitle Plugin", function () {
     plus();
     ok( subtitlediv.style.top !== subTop, "subtitle's top position has changed" );
     plus();
- 
+
     // we know values have changed, but how accurate are they?
     // check values against the video's values
     // we need four checks because if we just check against video's position,
@@ -98,22 +97,22 @@ test("Popcorn Subtitle Plugin", function () {
     plus();
     ok( Popcorn.position( subtitlediv ).top > popped.position().top, "subtitle top position moved" );
     plus();
- 
-    equals (subtitlediv.children[ 1 ].innerHTML, "this is the second subtitle of 2011", "subtitle displaying correct information" );
+
+    equals ( subtitlediv.children[ 1 ].innerHTML, "this is the second subtitle of 2011", "subtitle displaying correct information" );
     plus();
 
     popped.media.play();
-   
+
   });
- 
+
   popped.exec( 4, function() {
-   
+
     popped.media.pause();
-    equals (subtitlediv.children[ 1 ].innerHTML, "", "subtitle is clear" );
+    equals ( subtitlediv.children[ 1 ].innerHTML, "", "subtitle is clear" );
     plus();
 
     popped.media.play();
- 
+
   });
 
   popped.exec( 8, function() {
@@ -124,24 +123,23 @@ test("Popcorn Subtitle Plugin", function () {
   popped2.exec( 8, function() {
     popped2.media.pause();
 
-    equals (subtitlediv.children[ 3 ].innerHTML, "instance one test", "subtitle displaying correct information" );
+    equals ( subtitlediv.children[ 3 ].innerHTML, "instance one test", "subtitle displaying correct information" );
     plus();
-    equals (subtitle2div.children[ 0 ].innerHTML, "instance two test", "subtitle displaying correct information" );
+    equals ( subtitle2div.children[ 0 ].innerHTML, "instance two test", "subtitle displaying correct information" );
     plus();
 
     popped.media.play();
   });
 
   popped.exec( 10, function() {
-    ok ( document.getElementById( 'subtitle-0' ).style.display === "none" && 
-        document.getElementById( 'subtitle-1' ).style.display === "none" &&
-        document.getElementById( 'subtitle-2' ).style.display === "none", "All subtitles are no longer visible" );
+    ok ( document.getElementById( "subtitle-0" ).style.display === "none" &&
+        document.getElementById( "subtitle-1" ).style.display === "none" &&
+        document.getElementById( "subtitle-2" ).style.display === "none", "All subtitles are no longer visible" );
     plus();
 
     popped.pause().removeTrackEvent( popped.data.trackEvents.byStart[ 6 ]._id );
 
-    ok( !document.getElementById( 'subtitle-2' ), "removed subtitle div was properly destroyed"  );
+    ok( !document.getElementById( "subtitle-2" ), "removed subtitle div was properly destroyed"  );
     plus();
   });
 });
-
diff --git a/plugins/tagthisperson/popcorn.tagthisperson.html b/plugins/tagthisperson/popcorn.tagthisperson.html
index 3b2ff517d..c07bccb29 100755
--- a/plugins/tagthisperson/popcorn.tagthisperson.html
+++ b/plugins/tagthisperson/popcorn.tagthisperson.html
@@ -48,11 +48,11 @@ <h1 id="qunit-header">Popcorn tagthisperson Plug-in Demo</h1>
 
       <source id="mp4"
         src="../../test/trailer.mp4"
-        type="video/mp4; codecs='avc1, mp4a'">
+        type='video/mp4; codecs="avc1, mp4a"'>
 
       <source id="ogv"
         src="../../test/trailer.ogv"
-        type="video/ogg; codecs='theora, vorbis'">
+        type='video/ogg; codecs="theora, vorbis"'>
 
       <p>Your user agent does not support the HTML5 Video element.</p> 
 
diff --git a/plugins/tagthisperson/popcorn.tagthisperson.unit.html b/plugins/tagthisperson/popcorn.tagthisperson.unit.html
index d18dae78d..b06ad15dc 100755
--- a/plugins/tagthisperson/popcorn.tagthisperson.unit.html
+++ b/plugins/tagthisperson/popcorn.tagthisperson.unit.html
@@ -28,11 +28,11 @@ <h2 id="qunit-userAgent"></h2>
 
     <source id="mp4"
       src="../../test/trailer.mp4"
-      type="video/mp4; codecs='avc1, mp4a'">
+      type='video/mp4; codecs="avc1, mp4a"'>
 
     <source id="ogv"
       src="../../test/trailer.ogv"
-      type="video/ogg; codecs='theora, vorbis'">
+      type='video/ogg; codecs="theora, vorbis"'>
 
     <p>Your user agent does not support the HTML5 Video element.</p>
 
diff --git a/plugins/timeline/popcorn.timeline.html b/plugins/timeline/popcorn.timeline.html
index 3d8a48bcd..08b7934fb 100644
--- a/plugins/timeline/popcorn.timeline.html
+++ b/plugins/timeline/popcorn.timeline.html
@@ -2,64 +2,64 @@
 <html>
 <head>
   <title>Popcorn Google Feed Plug-in Demo</title>
-  
+
   <script src="../../popcorn.js"></script>
   <script src="popcorn.timeline.js"></script>
   <script>
     document.addEventListener('DOMContentLoaded', function () {
       var p = Popcorn('#video')
-      .volume(0)
+      .volume( 0 )
       .play()
       .timeline({
-        start: 1, // seconds
+        start: 1,
         target: "timeline",
         title: "This is a title",
         text: "this is some interesting text that goes inside",
         innerHTML: "Click here for <a href='http://www.google.ca'>Google</a>" ,
         direction: "up"
-      } )
+      })
       .timeline({
-        start: 3, // seconds
+        start: 3,
         target: "timeline",
         title: "double as interesting",
         text: "this is some interesting text that goes inside",
         innerHTML: "Maybe a button? <button onClick=\"window.location.href='http://www.google.com'\">Click Me</button>",
         direction: "up"
-      } )
+      })
      .timeline({
-        start: 7, // seconds
+        start: 7,
         end: 700,
         target: "timeline",
         title: "3x as interesting",
         text: "this is some interesting text that goes inside",
         innerHTML: "",
         direction: "up"
-      } )
+      })
       .timeline({
-        start: 1, // seconds
+        start: 1,
         target: "timeline2",
         title: "This is a title",
         text: "this is some interesting text that goes inside",
         innerHTML: "Click here for <a href='http://www.google.ca'>Google</a>" ,
         direction: "down"
-      } )
+      })
       .timeline({
-        start: 3, // seconds
+        start: 3,
         target: "timeline2",
         title: "double as interesting",
         text: "this is some interesting text that goes inside",
         innerHTML: "Maybe a button? <button onClick=\"window.location.href='http://www.google.com'\">Click Me</button>",
         direction: "down"
-      } )
+      })
      .timeline({
-        start: 7, // seconds
+        start: 7,
         end: 700,
         target: "timeline2",
         title: "3x as interesting",
         text: "this is some interesting text that goes inside",
         innerHTML: "",
         direction: "down"
-      } )
+      })
     }, false);
   </script>
 </head>
@@ -67,16 +67,16 @@
   <h1 id="qunit-header">Popcorn Timeline Plug-in Demo</h1>
   <p>Continuos timeline elements will be added to the div throughout the video</p>
   <div>
-    <video id='video'
+    <video id="video"
       controls
-      width= '250px'
+      width= "250px"
       poster="../../test/poster.png">
 
-      <source id='mp4'
+      <source id="mp4"
         src="../../test/trailer.mp4"
         type='video/mp4; codecs="avc1, mp4a"'>
 
-      <source id='ogv'
+      <source id="ogv"
         src="../../test/trailer.ogv"
         type='video/ogg; codecs="theora, vorbis"'>
 
diff --git a/plugins/timeline/popcorn.timeline.js b/plugins/timeline/popcorn.timeline.js
index c8638b2a3..b24559e5c 100644
--- a/plugins/timeline/popcorn.timeline.js
+++ b/plugins/timeline/popcorn.timeline.js
@@ -68,32 +68,32 @@
         container.insertBefore( contentDiv, container.firstChild );
       }
       else {
-        
+
         container.appendChild( contentDiv );
       }
 
     } else if ( Popcorn.plugin.debug ) {
       throw new Error( "target container doesn't exist" );
     }
-    
+
     i++;
 
     //  Default to empty if not used
-    //options.innerHTML = options.innerHTML || "";    
+    //options.innerHTML = options.innerHTML || "";
 
     contentDiv.innerHTML = "<p><span id='big'>" + options.title + "</span><br />" +
     "<span id='mid'>" + options.text + "</span><br />" + options.innerHTML;
-    
+
     return {
 
       start: function( event, options ) {
         contentDiv.style.display = "block";
-        
+
         if( options.direction === "down" ) {
           container.scrollTop = container.scrollHeight;
         }
       },
- 
+
       end: function( event, options ) {
         contentDiv.style.display = "none";
       },
@@ -114,7 +114,7 @@
     },
 
     options: {
-      start: { 
+      start: {
         elem: "input",
         type: "text",
         label: "In"
@@ -126,19 +126,19 @@
       },
       target: "feed-container",
       title: {
-        elem: "input", 
-        type: "text", 
-        label: "title" 
+        elem: "input",
+        type: "text",
+        label: "title"
       },
       text: {
-        elem: "input", 
-        type: "text", 
-        label: "text" 
+        elem: "input",
+        type: "text",
+        label: "text"
       },
-      innerHTML: { 
-        elem: "input", 
-        type: "text", 
-        label: "innerHTML" 
+      innerHTML: {
+        elem: "input",
+        type: "text",
+        label: "innerHTML"
       },
       direction: {
         elem: "input",
@@ -147,5 +147,5 @@
       }
     }
   });
-  
+
 })( Popcorn );
diff --git a/plugins/timeline/popcorn.timeline.unit.html b/plugins/timeline/popcorn.timeline.unit.html
index 488bf66b4..902c6b56c 100644
--- a/plugins/timeline/popcorn.timeline.unit.html
+++ b/plugins/timeline/popcorn.timeline.unit.html
@@ -4,11 +4,11 @@
   <title>Popcorn API</title>
   <link rel="stylesheet" href="../../test/qunit/qunit.css" type="text/css" media="screen">
   <script src="../../test/qunit/qunit.js"></script>
-  <!-- 
-    do not move - this must be called immediately prior to 
+  <!--
+    do not move - this must be called immediately prior to
     popcorn-api-draft.js
   -->
-  
+
   <script src="../../popcorn.js"></script>
   <script src="popcorn.timeline.js"></script>
 
@@ -21,24 +21,24 @@ <h2 id="qunit-banner"></h2>
   <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
   <div id="qunit-fixture">  </div>
-  
-  <video id='video' 
-    controls preload='none' 
-    width= '250px'
+
+  <video id="video"
+    controls preload="none"
+    width= "250px"
     poster="../../test/poster.png"
-    style="float: left;"> 
+    style="float: left;">
 
-    <source id='mp4'
+    <source id="mp4"
       src="../../test/trailer.mp4"
-      type='video/mp4; codecs="avc1, mp4a"'> 
+      type='video/mp4; codecs="avc1, mp4a"'>
 
-    <source id='ogv'
+    <source id="ogv"
       src="../../test/trailer.ogv"
-      type='video/ogg; codecs="theora, vorbis"'> 
+      type='video/ogg; codecs="theora, vorbis"'>
 
-    <p>Your user agent does not support the HTML5 Video element.</p> 
+    <p>Your user agent does not support the HTML5 Video element.</p>
 
-  </video> 
+  </video>
   <div id="timeline-up" style="float:left;width:400px;height:200px;overflow:auto"></div>
   <div id="timeline-down" style="float:left;width:400px;height:200px;overflow:auto"></div>
 </body>
diff --git a/plugins/timeline/popcorn.timeline.unit.js b/plugins/timeline/popcorn.timeline.unit.js
index f33714975..a4c76183b 100644
--- a/plugins/timeline/popcorn.timeline.unit.js
+++ b/plugins/timeline/popcorn.timeline.unit.js
@@ -1,20 +1,20 @@
-test("Popcorn Timeline Plugin", function () {
-  
+test( "Popcorn Timeline Plugin", function () {
+
   var popped = Popcorn( "#video" ),
       expects = 17,
-      upIds = downIds = [], 
+      upIds = downIds = [],
       count = 0,
       timelineUp = document.getElementById( "timeline-up" ),
       timelineDown = document.getElementById( "timeline-down" );
-  
+
   expect( expects );
-  
+
   function plus() {
     if ( ++count === expects ) {
       start();
     }
   }
-  
+
   stop();
 
     ok ( "timeline" in popped, "timeline is a method of the popped instance" );
@@ -23,60 +23,60 @@ test("Popcorn Timeline Plugin", function () {
     plus();
     equals ( document.getElementById( "timeline-down" ).firstChild, undefined, "initially, there is nothing inside the 'timeline-down' feed" );
     plus();
-  
+
     popped.timeline({
-      start: 1, // seconds
+      start: 1,
       target: "timeline-up",
       title: "This is a title",
       text: "this is some interesting text that goes inside",
       innerHTML: "Click here for <a href='http://www.google.ca'>Google</a>"
-    } );
+    });
     upIds.push( popped.getLastTrackEventId() );
-    
+
     popped.timeline({
-      start: 2, // seconds
+      start: 2,
       target: "timeline-up",
       title: "double as interesting",
       text: "this is some interesting text that goes inside",
-      innerHTML: "Maybe a button? <button onClick=\"window.location.href='http://www.google.com'\">Click Me</button>" 
-    } );
+      innerHTML: "Maybe a button? <button onClick=\"window.location.href='http://www.google.com'\">Click Me</button>"
+    });
     upIds.push( popped.getLastTrackEventId() );
-    
+
     popped.timeline({
-      start: 1, // seconds
+      start: 1,
       target: "timeline-down",
       title: "This is a title",
       text: "this is some interesting text that goes inside",
       innerHTML: "Maybe a button? <button onClick=\"window.location.href='http://www.google.com'\">Click Me</button>",
       direction: "down"
-    } );
+    });
     downIds.push( popped.getLastTrackEventId() );
-    
+
     popped.timeline({
-      start: 2, // seconds
+      start: 2,
       target: "timeline-down",
       title: "double as interesting",
       text: "this is some interesting text that goes inside",
       innerHTML: "Maybe a button? <button onClick=\"window.location.href='http://www.google.com'\">Click Me</button>",
       direction: "down"
-    } );
+    });
     downIds.push( popped.getLastTrackEventId() );
-    
-    popped.volume(0);
-  
+
+    popped.volume( 0 );
+
   popped.exec( 1.5, function() {
     //up
     ok ( document.getElementById( "timelineDiv1" ), "First timeline is on the page" );
     plus();
     equals ( document.getElementById("timelineDiv1" ).parentNode.parentNode.id, "timeline-up", "First timeline is inside the 'timeline-up' div" );
     plus();
-    
+
     //down
     ok ( document.getElementById( "timelineDiv3" ), "First timeline is on the page" );
     plus();
     equals ( document.getElementById("timelineDiv3" ).parentNode.parentNode.id, "timeline-down", "First Timeline is inside the 'timeline-down' div" );
     plus();
-    
+
   });
   popped.exec( 2.5, function() {
    //up
@@ -88,9 +88,9 @@ test("Popcorn Timeline Plugin", function () {
     plus();
     equals ( timelineUp.firstChild.firstChild.id,  "timelineDiv2", "'timelineDiv2' is the first child in 'timeline-up'" );
     plus();
-    
+
     //down
-    
+
     ok ( timelinediv4, "Second down timeline is on the page" );
     plus();
     equals ( timelinediv4.parentNode.parentNode.id, "timeline-down", "timelineDiv4 is inside the 'timeline-down' div" );
@@ -99,14 +99,14 @@ test("Popcorn Timeline Plugin", function () {
     plus();
   });
   popped.exec( 4, function() {
-    ok (document.getElementById( "timelineDiv1" ).style.display !== "none" && 
+    ok ( document.getElementById( "timelineDiv1" ).style.display !== "none" &&
         document.getElementById( "timelineDiv2" ).style.display !== "none", "Both timelines in 'timeline-up are not visible" );
 	  plus();
-	  
-	  ok (document.getElementById( "timelineDiv3" ).style.display !== "none" && 
+
+	  ok ( document.getElementById( "timelineDiv3" ).style.display !== "none" &&
         document.getElementById( "timelineDiv4" ).style.display !== "none", "Both timelines in 'timeline-down' are not visible" );
 	  plus();
-    
+
     var uid, did;
     while ( uid = upIds.pop() ) {
       popped.removeTrackEvent( uid );
@@ -114,14 +114,14 @@ test("Popcorn Timeline Plugin", function () {
     while ( did = downIds.pop() ) {
       popped.removeTrackEvent( did );
     }
-    
+
     popped.pause();
     equals( document.getElementById( "timeline-up" ).firstChild, null, "removed timeline was properly destroyed"  );
     plus();
     equals( document.getElementById( "timeline-down" ).firstChild, null, "removed timeline was properly destroyed"  );
     plus();
   });
-  
+
   popped.play();
-  
+
 });
diff --git a/plugins/twitter/popcorn.twitter.html b/plugins/twitter/popcorn.twitter.html
index 689bb796f..d189505a4 100755
--- a/plugins/twitter/popcorn.twitter.html
+++ b/plugins/twitter/popcorn.twitter.html
@@ -2,30 +2,27 @@
 <html>
 <head>
   <title>Popcorn Twitter Plug-in Demo</title>
-  
   <script src="../../popcorn.js"></script>
-
   <script src="popcorn.twitter.js"></script>
   <script>
-    document.addEventListener('DOMContentLoaded', function () {
-      var p = Popcorn('#video')
+    document.addEventListener( "DOMContentLoaded", function () {
+      var p = Popcorn( "#video" )
       .twitter({
-        start: 5, // seconds
-        end: 15, // seconds
-        title: 'Steve Song',
-        src: '@stevesong',
-        target: 'twitterdiv',
-      } )
+        start: 5,
+        end: 15,
+        title: "Steve Song",
+        src: "@stevesong",
+        target: "twitterdiv",
+      })
       .twitter({
-        start: 20, // seconds
-        end: 45, // seconds
-        title: 'Oil Spill',
-        src: '#oilspill',
-        target: 'twitterdiv'
-      } )
+        start: 20,
+        end: 45,
+        title: "Oil Spill",
+        src: "#oilspill",
+        target: "twitterdiv"
+      })
       .play();
     }, false);
-
   </script>
 </head>
 <body>
@@ -33,22 +30,22 @@ <h1 id="qunit-header">Popcorn Twitter Plug-in Demo</h1>
   <p>Twitter profile '@stevesong' widget will appear at 5 seconds and disappear at 15 seconds.</p>
   <p>More Twitter hash '#oilspill' widget will appear at 20 seconds and disappear at 45 seconds.</p>
   <div>
-    <video id='video' 
+    <video id="video"
       controls
-      width= '250px'
-      poster="../../test/poster.png"> 
+      width= "250px"
+      poster="../../test/poster.png">
 
-      <source id='mp4'
+      <source id="mp4"
         src="../../test/trailer.mp4"
-        type='video/mp4; codecs="avc1, mp4a"'> 
+        type='video/mp4; codecs="avc1, mp4a"'>
 
-      <source id='ogv'
+      <source id="ogv"
         src="../../test/trailer.ogv"
-        type='video/ogg; codecs="theora, vorbis"'> 
+        type='video/ogg; codecs="theora, vorbis"'>
 
-      <p>Your user agent does not support the HTML5 Video element.</p> 
+      <p>Your user agent does not support the HTML5 Video element.</p>
 
-    </video> 
+    </video>
   </div>
   <div id="twitterdiv"></div>
 </body>
diff --git a/plugins/twitter/popcorn.twitter.js b/plugins/twitter/popcorn.twitter.js
index 490899cb9..885b3a32f 100755
--- a/plugins/twitter/popcorn.twitter.js
+++ b/plugins/twitter/popcorn.twitter.js
@@ -1,10 +1,10 @@
 // PLUGIN: TWITTER
 
-(function (Popcorn) {
+(function ( Popcorn ) {
   var scriptLoading = false;
 
   /**
-   * Twitter popcorn plug-in 
+   * Twitter popcorn plug-in
    * Appends a Twitter widget to an element on the page.
    * Options parameter will need a start, end, target and source.
    * Optional parameters are height and width.
@@ -15,9 +15,9 @@
    *  appended to, this target element must exist on the DOM
    * Height is the height of the widget, defaults to 200
    * Width is the width of the widget, defaults to 250
-   * 
+   *
    * @param {Object} options
-   * 
+   *
    * Example:
      var p = Popcorn('#video')
         .twitter({
@@ -35,18 +35,38 @@
 
       manifest: {
         about:{
-          name:    "Popcorn Twitter Plugin",
+          name: "Popcorn Twitter Plugin",
           version: "0.1",
-          author:  "Scott Downe",
+          author: "Scott Downe",
           website: "http://scottdowne.wordpress.com/"
         },
         options:{
-          start   : {elem:'input', type:'number', label:'In'},
-          end     : {elem:'input', type:'number', label:'Out'},
-          src     : {elem:'input', type:'text',   label:'Source'},
-          target  : 'twitter-container',
-          height  : {elem:'input', type:'number', label:'Height'},
-          width   : {elem:'input', type:'number', label:'Width'}
+          start: {
+            elem: "input",
+            type: "number",
+            label: "In"
+          },
+          end: {
+            elem: "input",
+            type: "number",
+            label: "Out"
+          },
+          src: {
+            elem: "input",
+            type: "text",
+            label: "Source"
+          },
+          target: "twitter-container",
+          height: {
+            elem: "input",
+            type: "number",
+            label: "Height"
+          },
+          width: {
+            elem: "input",
+            type: "number",
+            label: "Width"
+          }
         }
       },
 
@@ -54,15 +74,17 @@
 
         if ( !window.TWTR && !scriptLoading ) {
           scriptLoading = true;
-          Popcorn.getScript("http://widgets.twimg.com/j/2/widget.js");
+          Popcorn.getScript( "http://widgets.twimg.com/j/2/widget.js" );
         }
 
         var target = document.getElementById( options.target );
-
+        // create the div to store the widget
         // setup widget div that is unique per track
-        options.container = document.createElement( 'div' ); // create the div to store the widget
-        options.container.setAttribute('id', Popcorn.guid()); // use this id to connect it to the widget
-        options.container.style.display = "none"; // display none by default
+        options.container = document.createElement( "div" );
+        // use this id to connect it to the widget
+        options.container.setAttribute( "id", Popcorn.guid());
+        // display none by default
+        options.container.style.display = "none";
 
         if ( !target && Popcorn.plugin.debug ) {
           throw new Error( "target container doesn't exist" );
@@ -71,27 +93,28 @@
         target && target.appendChild( options.container );
 
         // setup info for the widget
-        var src     = options.src || "",
-            width   = options.width || 250,
-            height  = options.height || 200,
+        var src = options.src || "",
+            width = options.width || 250,
+            height = options.height || 200,
             profile = /^@/.test( src ),
-            hash    = /^#/.test( src ),
+            hash = /^#/.test( src ),
             widgetOptions = {
               version: 2,
-              id: options.container.getAttribute( 'id' ),  // use this id to connect it to the div
+              // use this id to connect it to the div
+              id: options.container.getAttribute( "id" ),
               rpp: 30,
               width: width,
               height: height,
               interval: 6000,
               theme: {
                 shell: {
-                  background: '#ffffff',
-                  color: '#000000'
+                  background: "#ffffff",
+                  color: "#000000"
                 },
                 tweets: {
-                  background: '#ffffff',
-                  color: '#444444',
-                  links: '#1985b5'
+                  background: "#ffffff",
+                  color: "#444444",
+                  links: "#1985b5"
                 }
               },
               features: {
@@ -135,9 +158,9 @@
       },
 
       /**
-       * @member Twitter 
-       * The start function will be executed when the currentTime 
-       * of the video  reaches the start time provided by the 
+       * @member Twitter
+       * The start function will be executed when the currentTime
+       * of the video  reaches the start time provided by the
        * options variable
        */
       start: function( event, options ) {
@@ -145,9 +168,9 @@
       },
 
       /**
-       * @member Twitter 
-       * The end function will be executed when the currentTime 
-       * of the video  reaches the end time provided by the 
+       * @member Twitter
+       * The end function will be executed when the currentTime
+       * of the video  reaches the end time provided by the
        * options variable
        */
       end: function( event, options ) {
diff --git a/plugins/twitter/popcorn.twitter.unit.html b/plugins/twitter/popcorn.twitter.unit.html
index e03f454ce..394085f38 100755
--- a/plugins/twitter/popcorn.twitter.unit.html
+++ b/plugins/twitter/popcorn.twitter.unit.html
@@ -4,15 +4,13 @@
   <title>Popcorn API</title>
   <link rel="stylesheet" href="../../test/qunit/qunit.css" type="text/css" media="screen">
   <script src="../../test/qunit/qunit.js"></script>
-  <!-- 
-    do not move - this must be called immediately prior to 
+  <!--
+    do not move - this must be called immediately prior to
     popcorn-api-draft.js
   -->
-  
   <script src="../../popcorn.js"></script>
   <script src="http://widgets.twimg.com/j/2/widget.js"></script>
   <script src="popcorn.twitter.js"></script>
-
   <script src="popcorn.twitter.unit.js"></script>
 </head>
 <body>
@@ -23,23 +21,23 @@ <h2 id="qunit-banner"></h2>
   <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
   <div id="qunit-fixture">  </div>
-  
-  <video id='video' 
-    controls 
-    width= '250px'
-    poster="../../test/poster.png"> 
 
-    <source id='mp4'
+  <video id="video"
+    controls
+    width= "250px"
+    poster="../../test/poster.png">
+
+    <source id="mp4"
       src="../../test/trailer.mp4"
-      type='video/mp4; codecs="avc1, mp4a"'> 
+      type='video/mp4; codecs="avc1, mp4a"'>
 
-    <source id='ogv'
+    <source id="ogv"
       src="../../test/trailer.ogv"
-      type='video/ogg; codecs="theora, vorbis"'> 
+      type='video/ogg; codecs="theora, vorbis"'>
 
-    <p>Your user agent does not support the HTML5 Video element.</p> 
+    <p>Your user agent does not support the HTML5 Video element.</p>
 
-  </video> 
-  <div id="twitterdiv"></div>  
+  </video>
+  <div id="twitterdiv"></div>
 </body>
 </html>
diff --git a/plugins/twitter/popcorn.twitter.unit.js b/plugins/twitter/popcorn.twitter.unit.js
index 9ec9d7b80..b2571a65c 100755
--- a/plugins/twitter/popcorn.twitter.unit.js
+++ b/plugins/twitter/popcorn.twitter.unit.js
@@ -1,40 +1,40 @@
-test("Popcorn Twitter Plugin", function () {
-  
-  var popped = Popcorn("#video"),
-      expects = 7, 
+test( "Popcorn Twitter Plugin", function () {
+
+  var popped = Popcorn( "#video" ),
+      expects = 7,
       count = 0,
       setupId,
-      twitterdiv = document.getElementById('twitterdiv');
-  
+      twitterdiv = document.getElementById( "twitterdiv" );
+
   expect( expects );
-  
+
   function plus() {
-    if ( ++count === expects) {
+    if ( ++count === expects ) {
       start();
     }
   }
 
-  stop();   
- 
-  ok('twitter' in popped, "twitter is a method of the popped instance");
+  stop();
+
+  ok( "twitter" in popped, "twitter is a method of the popped instance" );
   plus();
 
   equals ( twitterdiv.innerHTML, "", "initially, there is nothing inside the twitterdiv" );
   plus();
-  
+
   try {
-    
-    ok( TWTR, "Twitter constructor exists");
+
+    ok( TWTR, "Twitter constructor exists" );
     plus();
-    
-  } catch (e) {};
+
+  } catch ( e ) {};
 
   popped.twitter({
-    start: 1, // seconds
-    end: 2, // seconds
-    title: 'Steve Song',
-    src: '@stevesong',
-    target: 'twitterdiv',
+    start: 1,
+    end: 2,
+    title: "Steve Song",
+    src: "@stevesong",
+    target: "twitterdiv",
   });
 
   setupId = popped.getLastTrackEventId();
@@ -51,10 +51,10 @@ test("Popcorn Twitter Plugin", function () {
     plus();
 
     popped.pause().removeTrackEvent( setupId );
-    ok( !twitterdiv.children[0], "removed twitter was properly destroyed" );
+    ok( !twitterdiv.children[ 0 ], "removed twitter was properly destroyed" );
     plus();
   });
-  
+
   popped.play();
-  
+
 });
diff --git a/plugins/webpage/popcorn.webpage.html b/plugins/webpage/popcorn.webpage.html
index 5f0ce0663..272a0efdf 100644
--- a/plugins/webpage/popcorn.webpage.html
+++ b/plugins/webpage/popcorn.webpage.html
@@ -6,8 +6,8 @@
   <script src="../../popcorn.js"></script>
   <script src="popcorn.webpage.js"></script>
   <script>
-    document.addEventListener('DOMContentLoaded', function () {
-      var p = Popcorn('#video')
+    document.addEventListener( "DOMContentLoaded", function () {
+      var p = Popcorn( "#video" )
       .volume( 0 )
       .play()
       .webpage({
@@ -41,11 +41,11 @@ <h1 id="qunit-header">Popcorn WebPage Plug-in Demo</h1>
 
       <source id="mp4"
         src="../../test/trailer.mp4"
-        type="video/mp4; codecs='avc1, mp4a'">
+        type='video/mp4; codecs="avc1, mp4a"'>
 
       <source id="ogv"
         src="../../test/trailer.ogv"
-        type="video/ogg; codecs='theora, vorbis'">
+        type='video/ogg; codecs="theora, vorbis"'>
 
       <p>Your user agent does not support the HTML5 Video element.</p>
 
diff --git a/plugins/webpage/popcorn.webpage.js b/plugins/webpage/popcorn.webpage.js
index 7bd2feb5c..33b95b5ea 100755
--- a/plugins/webpage/popcorn.webpage.js
+++ b/plugins/webpage/popcorn.webpage.js
@@ -28,18 +28,34 @@
    */
   Popcorn.plugin( "webpage" , {
     manifest: {
-      about:{
+      about: {
         name: "Popcorn Webpage Plugin",
         version: "0.1",
         author: "@annasob",
         website: "annasob.wordpress.com"
       },
-      options:{
-        id     : {elem:'input', type:'text', label:'Id'},
-        start  : {elem:'input', type:'text', label:'In'},
-        end    : {elem:'input', type:'text', label:'Out'},
-        src    : {elem:'input', type:'text', label:'Src'},
-        target : 'iframe-container'
+      options: {
+        id: {
+          elem: "input",
+          type: "text",
+          label: "Id"
+        },
+        start: {
+          elem: "input",
+          type: "text",
+          label: "In"
+        },
+        end: {
+          elem: "input",
+          type: "text",
+          label: "Out"
+        },
+        src: {
+          elem: "input",
+          type: "text",
+          label: "Src"
+        },
+        target: "iframe-container"
       }
     },
     _setup : function( options ) {
@@ -47,41 +63,41 @@
       var target = document.getElementById( options.target );
 
       // make an iframe
-      options._iframe  = document.createElement( 'iframe' );
-      options._iframe.setAttribute('width', "100%");
-      options._iframe.setAttribute('height', "100%");
-      options._iframe.id  = options.id;
+      options._iframe = document.createElement( "iframe" );
+      options._iframe.setAttribute( "width", "100%" );
+      options._iframe.setAttribute( "height", "100%" );
+      options._iframe.id = options.id;
       options._iframe.src = options.src;
-      options._iframe.style.display = 'none';
+      options._iframe.style.display = "none";
 
       if ( !target && Popcorn.plugin.debug ) {
         throw new Error( "target container doesn't exist" );
       }
 
       // add the hidden iframe to the DOM
-      target && target.appendChild(options._iframe);
-      
+      target && target.appendChild( options._iframe );
+
     },
     /**
-     * @member webpage 
-     * The start function will be executed when the currentTime 
-     * of the video  reaches the start time provided by the 
+     * @member webpage
+     * The start function will be executed when the currentTime
+     * of the video  reaches the start time provided by the
      * options variable
      */
-    start: function(event, options){
+    start: function( event, options ){
       // make the iframe visible
       options._iframe.src = options.src;
-      options._iframe.style.display = 'inline';
+      options._iframe.style.display = "inline";
     },
     /**
-     * @member webpage 
-     * The end function will be executed when the currentTime 
-     * of the video  reaches the end time provided by the 
+     * @member webpage
+     * The end function will be executed when the currentTime
+     * of the video  reaches the end time provided by the
      * options variable
      */
-    end: function(event, options){
+    end: function( event, options ){
       // make the iframe invisible
-      options._iframe.style.display = 'none';
+      options._iframe.style.display = "none";
     },
     _teardown: function( options ) {
 
diff --git a/plugins/webpage/popcorn.webpage.unit.html b/plugins/webpage/popcorn.webpage.unit.html
index 238ff9d67..c5149d459 100755
--- a/plugins/webpage/popcorn.webpage.unit.html
+++ b/plugins/webpage/popcorn.webpage.unit.html
@@ -4,11 +4,11 @@
   <title>Popcorn API</title>
   <link rel="stylesheet" href="../../test/qunit/qunit.css" type="text/css" media="screen">
   <script src="../../test/qunit/qunit.js"></script>
-  <!-- 
-    do not move - this must be called immediately prior to 
+  <!--
+    do not move - this must be called immediately prior to
     popcorn-api-draft.js
   -->
-  
+
   <script src="../../popcorn.js"></script>
   <script src="popcorn.webpage.js"></script>
 
@@ -21,23 +21,23 @@ <h2 id="qunit-banner"></h2>
   <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
   <div id="qunit-fixture">  </div>
-  
-  <video id='video' 
-    controls preload='none' 
-    width= '250px'
-    poster="../../test/poster.png"> 
 
-    <source id='mp4'
+  <video id="video"
+    controls preload="none"
+    width= "250px"
+    poster="../../test/poster.png">
+
+    <source id="mp4"
       src="../../test/trailer.mp4"
-      type='video/mp4; codecs="avc1, mp4a"'> 
+      type='video/mp4; codecs="avc1, mp4a"'>
 
-    <source id='ogv'
+    <source id="ogv"
       src="../../test/trailer.ogv"
-      type='video/ogg; codecs="theora, vorbis"'> 
+      type='video/ogg; codecs="theora, vorbis"'>
 
-    <p>Your user agent does not support the HTML5 Video element.</p> 
+    <p>Your user agent does not support the HTML5 Video element.</p>
 
-  </video> 
-  <div id="webpagediv"></div>  
+  </video>
+  <div id="webpagediv"></div>
 </body>
 </html>
diff --git a/plugins/wikipedia/popcorn.wikipedia.html b/plugins/wikipedia/popcorn.wikipedia.html
index 2ee3583e4..dab08b636 100755
--- a/plugins/wikipedia/popcorn.wikipedia.html
+++ b/plugins/wikipedia/popcorn.wikipedia.html
@@ -6,24 +6,23 @@
   <script src="../../popcorn.js"></script>
   <script src="popcorn.wikipedia.js"></script>
   <script>
-    document.addEventListener('DOMContentLoaded', function () {
-      var p = Popcorn('#video')
-      .volume(0)
+    document.addEventListener( "DOMContentLoaded", function () {
+      var p = Popcorn( "#video' )
+      .volume( 0 )
       .play() 
       .wikipedia({
-        start: 0, // seconds
-        end: 10, // seconds
-        src: 'http://en.wikipedia.org/wiki/Cape_Town',
+        start: 0,
+        end: 10,
+        src: "http://en.wikipedia.org/wiki/Cape_Town",
         title: "this is an article",
-        target: 'wikidiv'
+        target: "wikidiv"
       })
       .wikipedia({
-        start: 7, // seconds
-        end: 20, // seconds
-        src: 'http://en.wikipedia.org/wiki/S%C3%A3o_Paulo',
-        target: 'wikidiv'
-      } );
-
+        start: 7,
+        end: 20,
+        src: "http://en.wikipedia.org/wiki/S%C3%A3o_Paulo",
+        target: "wikidiv"
+      });
     }, false);
 
   </script>
@@ -33,16 +32,16 @@ <h1 id="qunit-header">Popcorn Wikipedia Plug-in Demo</h1>
   <p> A Wiki article about Cape Town will appear at 0 seconds and disappear at 10 seconds.</p>
   <p> A Wiki article about Sao Paolo will appear at 7 seconds and disappear at 20 seconds.</p>
   <div>
-    <video id='video' 
+    <video id="video" 
       controls 
-      width= '250px'
+      width= "250px"
       poster="../../test/poster.png"> 
 
-      <source id='mp4'
+      <source id="mp4"
         src="../../test/trailer.mp4"
         type='video/mp4; codecs="avc1, mp4a"'> 
 
-      <source id='ogv'
+      <source id="ogv"
         src="../../test/trailer.ogv"
         type='video/ogg; codecs="theora, vorbis"'> 
 
diff --git a/plugins/wikipedia/popcorn.wikipedia.js b/plugins/wikipedia/popcorn.wikipedia.js
index 0d6ddf07a..525bbdcda 100755
--- a/plugins/wikipedia/popcorn.wikipedia.js
+++ b/plugins/wikipedia/popcorn.wikipedia.js
@@ -122,7 +122,7 @@ var wikiCallback;
       
       if ( options.src ) {
         Popcorn.getScript( "http://" + options.lang + ".wikipedia.org/w/api.php?action=parse&props=text&page=" + 
-          options.src.slice( options.src.lastIndexOf("/")+1)  + "&format=json&callback=wikiCallback" + _guid);
+          options.src.slice( options.src.lastIndexOf( "/" ) + 1 )  + "&format=json&callback=wikiCallback" + _guid );
       } else if ( Popcorn.plugin.debug ) {
         throw new Error( "Wikipedia plugin needs a 'src'" );
       }
diff --git a/plugins/wikipedia/popcorn.wikipedia.unit.html b/plugins/wikipedia/popcorn.wikipedia.unit.html
index 43cdc4b0d..c85ea6658 100755
--- a/plugins/wikipedia/popcorn.wikipedia.unit.html
+++ b/plugins/wikipedia/popcorn.wikipedia.unit.html
@@ -22,16 +22,16 @@ <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
   <div id="qunit-fixture">  </div>
   
-  <video id='video' 
+  <video id="video" 
     controls 
-    width= '250px'
+    width= "250px"
     poster="../../test/poster.png"> 
 
-    <source id='mp4'
+    <source id="mp4"
       src="../../test/trailer.mp4"
       type='video/mp4; codecs="avc1, mp4a"'> 
 
-    <source id='ogv'
+    <source id="ogv"
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'> 
 
diff --git a/plugins/wikipedia/popcorn.wikipedia.unit.js b/plugins/wikipedia/popcorn.wikipedia.unit.js
index 80bb046ea..6cc1680c1 100755
--- a/plugins/wikipedia/popcorn.wikipedia.unit.js
+++ b/plugins/wikipedia/popcorn.wikipedia.unit.js
@@ -1,9 +1,9 @@
-test("Popcorn wikipedia Plugin", function () {
+test( "Popcorn wikipedia Plugin", function () {
   
-  var popped        = Popcorn( "#video" ),
-      expects       = 13, 
-      count         = 0,
-      theArticle    = document.getElementById( "wikidiv" );
+  var popped = Popcorn( "#video" ),
+      expects = 13, 
+      count = 0,
+      theArticle = document.getElementById( "wikidiv" );
        
   expect( expects );
   
@@ -22,21 +22,21 @@ test("Popcorn wikipedia Plugin", function () {
   plus();
   
   popped.wikipedia({
-      start: 1, // seconds
-      end: 3, // seconds
+      start: 1,
+      end: 3,
       src: "http://en.wikipedia.org/wiki/Cape_Town",
       title: "this is an article",
       target: "wikidiv",
       numberofwords: 22
-    } )
+    })
     .wikipedia({
-      start: 4, // seconds
-      end: 5, // seconds
+      start: 4,
+      end: 5,
       src: "http://en.wikipedia.org/wiki/S%C3%A3o_Paulo",
       target: "wikidiv",
       numberofwords: 43
-    } )
-    .volume(0)
+    })
+    .volume( 0 )
     .play();
     
   popped.exec( 2, function() {
@@ -84,7 +84,7 @@ test("Popcorn wikipedia Plugin", function () {
   try {
     popped.wikipedia({});
   } catch( e ) {
-    ok(true, 'empty event was caught by debug');
+    ok( true, "empty event was caught by debug" );
     plus();
   }
 });
diff --git a/plugins/wordriver/popcorn.wordriver.html b/plugins/wordriver/popcorn.wordriver.html
index 748942248..3aa709c3a 100755
--- a/plugins/wordriver/popcorn.wordriver.html
+++ b/plugins/wordriver/popcorn.wordriver.html
@@ -2,46 +2,42 @@
 <html>
 <head>
   <title>Popcorn Wordriver Plug-in Demo</title>
-  
   <script src="../../popcorn.js"></script>
-
   <script src="popcorn.wordriver.js"></script>
   <script>
-    document.addEventListener('DOMContentLoaded', function () {
-      var p = Popcorn('#video')
-      .volume(0)
+    document.addEventListener( "DOMContentLoaded", function () {
+      var p = Popcorn( "#video" )
+      .volume( 0 )
       .play()
       .wordriver({
-				start: 1, // seconds
-				end: 3, // seconds
+				start: 1,
+				end: 3,
 				text: "hello",
 				target: "wordriverdiv",
 				color: "red"
       })
       .wordriver({
-				start: 3, // seconds
-				end: 6, // seconds
+				start: 3,
+				end: 6,
 				text: "world",
 				target: "wordriverdiv",
 				color: "blue"
       })
       .wordriver({
-				start: 1, // seconds
-				end: 4, // seconds
+				start: 1,
+				end: 4,
 				text: "hello",
 				target: "wordriverdiv2",
 				color: "red"
       })
       .wordriver({
-				start: 2, // seconds
-				end: 4, // seconds
+				start: 2,
+				end: 4,
 				text: "world",
 				target: "wordriverdiv2",
 				color: "blue"
       });
-
     }, false);
-
   </script>
 </head>
 <body>
@@ -49,21 +45,21 @@ <h1 id="qunit-header">Popcorn Word River Plug-in Demo</h1>
   <p> A "hello world" word river will appear from 1 to 6.</p>
   <div>
 
-    <video id='video' 
+    <video id="video"
       controls height="480" width="854"
-      poster="../../test/poster.png"> 
+      poster="../../test/poster.png">
 
-      <source id='mp4'
+      <source id="mp4"
         src="../../test/trailer.mp4"
-        type='video/mp4; codecs="avc1, mp4a"'> 
+        type='video/mp4; codecs="avc1, mp4a"'>
 
-      <source id='ogv'
+      <source id="ogv"
         src="../../test/trailer.ogv"
-        type='video/ogg; codecs="theora, vorbis"'> 
+        type='video/ogg; codecs="theora, vorbis"'>
 
-      <p>Your user agent does not support the HTML5 Video element.</p> 
+      <p>Your user agent does not support the HTML5 Video element.</p>
 
-    </video> 
+    </video>
   </div>
   <div id="wordriverdiv" style="height: 200px; width: 200px;"></div>
   <div id="wordriverdiv2" style="height: 200px; width: 200px;"></div>
diff --git a/plugins/wordriver/popcorn.wordriver.js b/plugins/wordriver/popcorn.wordriver.js
index e727c735d..a217c4c19 100755
--- a/plugins/wordriver/popcorn.wordriver.js
+++ b/plugins/wordriver/popcorn.wordriver.js
@@ -1,6 +1,6 @@
 // PLUGIN: Wordriver
 
-(function (Popcorn) {
+(function ( Popcorn ) {
 
   var container = {},
       spanLocation = 0,
@@ -10,10 +10,10 @@
 
         var t = document.getElementById( target );
         t && t.appendChild( container[ target ] );
-        
+
         container[ target ].style.height = "100%";
         container[ target ].style.position = "relative";
-        
+
         return container[ target ];
       },
       // creates an object of supported, cross platform css transitions
@@ -43,13 +43,13 @@
   document.getElementsByTagName( "head" )[ 0 ].appendChild( span );
 
   /**
-   * Word River popcorn plug-in 
-   * Displays a string of text, fading it in and out 
+   * Word River popcorn plug-in
+   * Displays a string of text, fading it in and out
    * while transitioning across the height of the parent container
    * for the duration of the instance  (duration = end - start)
-   *  
+   *
    * @param {Object} options
-   * 
+   *
    * Example:
      var p = Popcorn( '#video' )
         .wordriver({
@@ -63,17 +63,33 @@
    */
 
   Popcorn.plugin( "wordriver" , {
-    
+
       manifest: {
         about:{
           name: "Popcorn WordRiver Plugin"
         },
-        options:{
-          start    : {elem:'input', type:'text', label:'In'},
-          end      : {elem:'input', type:'text', label:'Out'},
-          target  :  'wordriver-container',
-          text     : {elem:'input', type:'text', label:'Text'},
-          color    : {elem:'input', type:'text', label:'Color'}
+        options: {
+          start: {
+            elem: "input",
+            type: "text",
+            label: "In"
+          },
+          end: {
+            elem: "input",
+            type: "text",
+            label: "Out"
+          },
+          target:  "wordriver-container",
+          text: {
+            elem: "input",
+            type: "text",
+            label: "Text"
+          },
+          color: {
+            elem: "input",
+            type: "text",
+            label: "Color"
+          }
         }
       },
 
@@ -81,7 +97,7 @@
 
         if ( !document.getElementById( options.target ) && Popcorn.plugin.debug ) {
           throw new Error( "target container doesn't exist" );
-        } 
+        }
 
         options._duration = options.end - options.start;
         options._container = container[ options.target ] || setupContainer( options.target );
diff --git a/plugins/wordriver/popcorn.wordriver.unit.html b/plugins/wordriver/popcorn.wordriver.unit.html
index 532f3defa..cc78d2cbb 100755
--- a/plugins/wordriver/popcorn.wordriver.unit.html
+++ b/plugins/wordriver/popcorn.wordriver.unit.html
@@ -4,14 +4,12 @@
   <title>Popcorn Word River Plugin</title>
   <link rel="stylesheet" href="../../test/qunit/qunit.css" type="text/css" media="screen">
   <script src="../../test/qunit/qunit.js"></script>
-  <!-- 
-    do not move - this must be called immediately prior to 
+  <!--
+    do not move - this must be called immediately prior to
     popcorn-api-draft.js
   -->
-  
   <script src="../../popcorn.js"></script>
   <script src="popcorn.wordriver.js"></script>
-
   <script src="popcorn.wordriver.unit.js"></script>
 </head>
 <body>
@@ -21,23 +19,23 @@ <h2 id="qunit-banner"></h2>
   <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
   <div id="qunit-fixture">  </div>
-  
-  <video id='video' 
-    controls preload='none' 
-    width= '250px'
-    poster="../../test/poster.png"> 
 
-    <source id='mp4'
+  <video id="video"
+    controls preload="none"
+    width= "250px"
+    poster="../../test/poster.png">
+
+    <source id="mp4"
       src="../../test/trailer.mp4"
-      type='video/mp4; codecs="avc1, mp4a"'> 
+      type='video/mp4; codecs="avc1, mp4a"'>
 
-    <source id='ogv'
+    <source id="ogv"
       src="../../test/trailer.ogv"
-      type='video/ogg; codecs="theora, vorbis"'> 
+      type='video/ogg; codecs="theora, vorbis"'>
 
-    <p>Your user agent does not support the HTML5 Video element.</p> 
+    <p>Your user agent does not support the HTML5 Video element.</p>
 
-  </video> 
-  <div id="wordriverdiv" style="height: 200px; width: 200px;"></div>  
+  </video>
+  <div id="wordriverdiv" style="height: 200px; width: 200px;"></div>
 </body>
 </html>
diff --git a/plugins/wordriver/popcorn.wordriver.unit.js b/plugins/wordriver/popcorn.wordriver.unit.js
index 0d7a020ee..281c9ccad 100755
--- a/plugins/wordriver/popcorn.wordriver.unit.js
+++ b/plugins/wordriver/popcorn.wordriver.unit.js
@@ -1,32 +1,31 @@
 test( "Popcorn wordriver Plugin", function () {
-  
+
   var popped = Popcorn( "#video" ),
-      expects = 17, 
+      expects = 17,
       count = 0,
       firstTrack,
       secondTrack,
       wordriverdiv = document.getElementById( "wordriverdiv" );
 
-  expect(expects);
-  
+  expect( expects );
+
   function plus() {
-    if ( ++count === expects) {
+    if ( ++count === expects ) {
       start();
     }
   }
-  
+
   stop();
-   
+
   ok ( "wordriver" in popped, "wordriver is a method of the popped instance" );
   plus();
-  
+
   equals ( wordriverdiv.childElementCount, 0, "initially, there is nothing inside the wordriverdiv" );
   plus();
-  
-  
+
   popped.wordriver({
-		start: 0, // seconds
-		end: 2, // seconds
+		start: 0,
+		end: 2,
 		text: "hello",
 		target: "wordriverdiv",
 		color: "red"
@@ -35,8 +34,8 @@ test( "Popcorn wordriver Plugin", function () {
   firstTrack = popped.getLastTrackEventId();
 
   popped.wordriver({
-		start: 2, // seconds
-		end: 4, // seconds
+		start: 2,
+		end: 4,
 		text: "world",
 		target: "wordriverdiv",
 		color: "blue"
@@ -45,48 +44,48 @@ test( "Popcorn wordriver Plugin", function () {
   secondTrack = popped.getLastTrackEventId();
 
   popped.wordriver({
-		start: 20, // seconds
-		end: 24, // seconds
+		start: 20,
+		end: 24,
 		text: "nothing here",
 		target: "wordriverdiv",
 		color: "green"
   })
-  .volume(0);
+  .volume( 0 );
 
   popped.exec( 0, function() {
-    equals( wordriverdiv.children[0].childElementCount, 1, "wordriverdiv now has one inner element" );
+    equals( wordriverdiv.children[ 0 ].childElementCount, 1, "wordriverdiv now has one inner element" );
     plus();
-    equals( wordriverdiv.children[0].children[0].style.opacity, 1, "first word is visible on the page" );
+    equals( wordriverdiv.children[ 0 ].children[ 0 ].style.opacity, 1, "first word is visible on the page" );
     plus();
-    equals( wordriverdiv.children[0].children[0].innerHTML, "hello", "first word content is correct" );
+    equals( wordriverdiv.children[ 0 ].children[ 0 ].innerHTML, "hello", "first word content is correct" );
     plus();
-    ok( !wordriverdiv.children[0].children[1], "second word does not exist yet" );
+    ok( !wordriverdiv.children[ 0 ].children[ 1 ], "second word does not exist yet" );
     plus();
   });
-  
+
   popped.exec( 2, function() {
-    equals( wordriverdiv.children[0].childElementCount, 2, "wordriverdiv now has two inner elements" );
+    equals( wordriverdiv.children[ 0 ].childElementCount, 2, "wordriverdiv now has two inner elements" );
     plus();
-    equals( wordriverdiv.children[0].children[0].style.opacity, 0, "first word is not visible on the page" );
+    equals( wordriverdiv.children[ 0 ].children[ 0 ].style.opacity, 0, "first word is not visible on the page" );
     plus();
-    equals( wordriverdiv.children[0].children[0].innerHTML, "hello", "first word content is correct" );
+    equals( wordriverdiv.children[ 0 ].children[ 0 ].innerHTML, "hello", "first word content is correct" );
     plus();
-    equals( wordriverdiv.children[0].children[1].style.opacity, 1, "second word is visible on the page" );
+    equals( wordriverdiv.children[ 0 ].children[ 1 ].style.opacity, 1, "second word is visible on the page" );
     plus();
-    equals( wordriverdiv.children[0].children[1].innerHTML, "world", "second word content is correct" );
+    equals( wordriverdiv.children[ 0 ].children[ 1 ].innerHTML, "world", "second word content is correct" );
     plus();
   });
-  
+
   popped.exec( 4, function() {
-    equals( wordriverdiv.children[0].children[0].style.opacity, 0, "first word is not visible on the page" );
+    equals( wordriverdiv.children[ 0 ].children[ 0 ].style.opacity, 0, "first word is not visible on the page" );
     plus();
-    equals( wordriverdiv.children[0].children[1].style.opacity, 0, "second word is not visible on the page" );
+    equals( wordriverdiv.children[ 0 ].children[ 1 ].style.opacity, 0, "second word is not visible on the page" );
     plus();
 
     popped.pause().removeTrackEvent( firstTrack );
-    equals( wordriverdiv.children[0].childElementCount, 1, "wordriverdiv now has one inner element" );
+    equals( wordriverdiv.children[ 0 ].childElementCount, 1, "wordriverdiv now has one inner element" );
     plus();
-    equals( wordriverdiv.children[0].children[0].innerHTML, "world", "first word content is changed" );
+    equals( wordriverdiv.children[ 0 ].children[ 0 ].innerHTML, "world", "first word content is changed" );
     plus();
 
     popped.pause().removeTrackEvent( secondTrack );
@@ -102,10 +101,10 @@ test( "Popcorn wordriver Plugin", function () {
   try {
     popped.wordriver({});
   } catch( e ) {
-    ok(true, 'empty event was caught by debug');
+    ok( true, "empty event was caught by debug" );
     plus();
   }
-  
+
   popped.play();
 
 });

From 8c50c1e56db013faabf3d1eda941aee919cde7f7 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Mon, 12 Sep 2011 20:23:13 -0400
Subject: [PATCH 037/140] fixed ninja tabs. moved cue tests into new test
 block.

---
 test/popcorn.unit.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 5d8c188ef..60a3ed969 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -511,7 +511,7 @@ test("exec", function() {
       hasLooped = false,
       loop = 0;
 
-  expect( expects + 4 );
+  expect( expects + 1 );
 
   function plus(){
     if ( ++count == expects ) {
@@ -519,9 +519,6 @@ test("exec", function() {
       setTimeout( function() {
 
         equals( loop, expects, "exec callback repeat check, only called twice" );
-        ok( Popcorn.p.cue, "Popcorn.p.cue exists" );
-				equal( typeof Popcorn.p.cue, "function", "Popcorn.p.cue is a function" );
-				deepEqual( Popcorn.p.cue, Popcorn.p.exec, "Popcorn.p.cue equals Popcorn.p.exec" );
         Popcorn.removePlugin( popped, "exec" );
         start();
 
@@ -545,6 +542,13 @@ test("exec", function() {
 
 });
 
+test( "cue (alias of exec)", function() {
+  expect( 3 );
+  ok( Popcorn.p.cue, "Popcorn.p.cue exists" );	
+  equal( typeof Popcorn.p.cue, "function", "Popcorn.p.cue is a function" );
+  deepEqual( Popcorn.p.cue, Popcorn.p.exec, "Popcorn.p.cue equals Popcorn.p.exec" );
+});
+
 test("mute", function() {
 
   var video = Popcorn("#video"),

From 88d65d40295502959b68fb5eb99b00e814601996 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Mon, 12 Sep 2011 20:28:42 -0400
Subject: [PATCH 038/140] Accidentally added .swp file

---
 plugins/googlefeed/.swp | Bin 12288 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 plugins/googlefeed/.swp

diff --git a/plugins/googlefeed/.swp b/plugins/googlefeed/.swp
deleted file mode 100644
index d3b0a86be26b7df2e4a161e6c205fd0d7729ecbf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI%u?vDg6vy#rTQn5)4_M8L<<J_@(jc_heyM>ZTx7KNfA+^zCwZ%jpv(8bdw9p=
z_xNn$IXE36cjJd*)}-40YqS+f%PhaxgNC|S&pa)?NF_V1uio*l{X!?IXlUUI0R%c1
z7{=jx6;!dy#oV1u<IX1_5CH@bKmY**5I_I{1o{(r+#GqC_(45_txo-JYkw1xi~s@%
zAb<b@2q1s}0tg_000M0VR4Vcwi+s#e{r|V$|6hC7Hh_Kv5I_I{1Q0*~0R#|0009IL
H=w09kY?c+y


From 45a2401b810d4e933ef2606e0208d7813e8ba966 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Tue, 13 Sep 2011 12:04:53 -0400
Subject: [PATCH 039/140] Moved unit tests a bit

---
 test/popcorn.unit.js | 96 ++++++++++++++++++++++++--------------------
 1 file changed, 52 insertions(+), 44 deletions(-)

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 14405220d..f5928ca37 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -52,7 +52,7 @@ test("API", function () {
 test("Popcorn.* Static Methods", function () {
 
   var statics = [ "forEach", "extend", "error", "guid", "sizeOf", "nop",
-                  "addTrackEvent", "removeTrackEvent", "getTrackEvents", "getTrackEvent", "position", "disable", "enable" ],
+                  "addTrackEvent", "removeTrackEvent", "getTrackEvents", "getTrackEvent", "position", "disable", "enable", "timeUpdate" ],
     substatics = [ "addTrackEvent", "removeTrackEvent", "getTrackEvents", "getTrackEvent"];
 
   expect(statics.length + substatics.length);
@@ -1647,6 +1647,57 @@ test("Update Timer", function () {
 
 });
 
+
+test("timeUpdate add track event while paused", function() {
+
+  var $pop = Popcorn( "#video" ),
+    count = 0,
+    expects = 3;
+
+  expect( expects );
+
+  function plus() {
+    if ( ++count === expects ) {
+      Popcorn.removePlugin( "timeUpdateTester" );
+      Popcorn.removeInstance( $pop );
+    }
+  }
+
+  Popcorn.plugin("timeUpdateTester", function() {
+    return {
+      start: function () {
+        var div = document.createElement("div");
+        div.id = "timeUpdate-test";
+
+        document.body.appendChild(div);
+      },
+      end: function () {
+        document.getElementById("timeUpdate-test").parentNode.removeChild(document.getElementById("timeUpdate-test"));
+      }
+    };
+  });
+
+  $pop.currentTime(40).pause();
+
+  equals( $pop.getTrackEvents().length, 0, "Initially no trackEvents" );
+  plus();
+
+  $pop.timeUpdateTester({
+    id:"timeUpdateID",
+    start:40,
+    end: 41
+  });
+
+  equals( $pop.getTrackEvents().length, 1, "trackEvent successfully added" );
+  plus();
+
+  ok( document.getElementById( "timeUpdate-test" ), "trackEvent successfully added, content was displayed while video was paused" );
+  plus();
+
+  $pop.removeTrackEvent( "timeUpdateID" );
+
+});
+
 test("Plugin Factory", function () {
 
   QUnit.reset();
@@ -2627,49 +2678,6 @@ test("Index Integrity", function () {
 
 });
 
-test("timeUpdate functionality", function() {
-
-  var $pop = Popcorn( "#video" ),
-    count = 0,
-    expects = 4;
-
-  expect( expects );
-
-  Popcorn.plugin("timeUpdateTester", function() {
-    return {
-      start: function () {
-        var div = document.createElement("div");
-        div.id = "timeUpdate-test";
-
-        document.body.appendChild(div);
-      },
-      end: function () {
-        document.getElementById("timeUpdate-test").parentNode.removeChild(document.getElementById("timeUpdate-test"));
-      }
-    };
-  });
-
-  equals( typeof Popcorn.timeUpdate, "function", "timeUpdate is a function of Popcorn" );
-
-  $pop.currentTime(40).pause();
-
-  equals( $pop.getTrackEvents().length, 0, "Initially no trackEvents" );
-  
-  $pop.timeUpdateTester({
-    id:"timeUpdateID",
-    start:40,
-    end: 41
-  });
-
-  equals( $pop.getTrackEvents().length, 1, "trackEvent successfully added" );
-
-  ok( document.getElementById( "timeUpdate-test" ), "trackEvent successfully added, content was displayed while video was paused" );
-
-  $pop.removeTrackEvent( "timeUpdateID" );
-  Popcorn.removeInstance( $pop );
-
-});
-
 test("Popcorn.disable/enable/toggle", function() {
 
 

From 4719e9eae63c35f3e4e0e74e5b84b3a8f9f2a801 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Tue, 13 Sep 2011 15:03:19 -0400
Subject: [PATCH 040/140] Fixed missed style fixes

---
 plugins/attribution/popcorn.attribution.html  |  4 +--
 .../attribution/popcorn.attribution.unit.js   | 22 ++++++-------
 plugins/code/popcorn.code.html                |  2 +-
 plugins/code/popcorn.code.unit.html           |  2 +-
 plugins/code/popcorn.code.unit.js             |  6 ++--
 plugins/facebook/popcorn.facebook.html        |  2 +-
 plugins/facebook/popcorn.facebook.unit.html   |  2 +-
 plugins/facebook/popcorn.facebook.unit.js     | 20 ++++++------
 plugins/flickr/popcorn.flickr.html            |  2 +-
 plugins/flickr/popcorn.flickr.unit.html       |  2 +-
 plugins/flickr/popcorn.flickr.unit.js         |  4 +--
 plugins/footnote/popcorn.footnote.unit.js     | 22 ++++++-------
 plugins/gml/popcorn.gml.html                  |  4 +--
 plugins/gml/popcorn.gml.unit.html             |  2 +-
 plugins/gml/popcorn.gml.unit.js               | 14 ++++----
 plugins/googlefeed/popcorn.googlefeed.html    |  6 ++--
 plugins/googlefeed/popcorn.googlefeed.js      |  4 +--
 .../googlefeed/popcorn.googlefeed.unit.html   |  2 +-
 plugins/googlefeed/popcorn.googlefeed.unit.js | 14 ++++----
 plugins/googlemap/popcorn.googlemap.html      |  4 +--
 plugins/googlemap/popcorn.googlemap.unit.html |  2 +-
 plugins/googlemap/popcorn.googlemap.unit.js   | 22 ++++++-------
 plugins/image/popcorn.image.unit.js           |  2 +-
 plugins/lastfm/popcorn.lastfm.html            |  4 +--
 plugins/lastfm/popcorn.lastfm.js              |  2 +-
 plugins/lastfm/popcorn.lastfm.unit.html       |  2 +-
 plugins/lastfm/popcorn.lastfm.unit.js         | 18 +++++------
 plugins/linkedin/popcorn.linkedin.unit.js     |  4 +--
 plugins/lowerthird/popcorn.lowerthird.html    |  4 +--
 plugins/lowerthird/popcorn.lowerthird.js      |  8 ++---
 .../lowerthird/popcorn.lowerthird.unit.html   |  2 +-
 plugins/lowerthird/popcorn.lowerthird.unit.js | 14 ++++----
 plugins/mustache/popcorn.mustache.js          |  2 +-
 plugins/mustache/popcorn.mustache.unit.html   |  2 +-
 plugins/mustache/popcorn.mustache.unit.js     |  2 +-
 plugins/openmap/popcorn.openmap.html          |  4 +--
 plugins/openmap/popcorn.openmap.js            |  2 +-
 plugins/openmap/popcorn.openmap.unit.html     |  2 +-
 plugins/openmap/popcorn.openmap.unit.js       | 30 ++++++++---------
 plugins/pause/popcorn.pause.html              |  4 +--
 plugins/pause/popcorn.pause.unit.html         |  4 +--
 plugins/pause/popcorn.pause.unit.js           | 16 +++++-----
 plugins/processing/popcorn.processing.html    |  2 +-
 .../processing/popcorn.processing.unit.html   |  2 +-
 plugins/processing/popcorn.processing.unit.js |  4 +--
 plugins/subtitle/popcorn.subtitle.html        |  2 +-
 plugins/subtitle/popcorn.subtitle.unit.html   |  4 +--
 plugins/subtitle/popcorn.subtitle.unit.js     | 14 ++++----
 .../tagthisperson/popcorn.tagthisperson.html  |  4 +--
 .../popcorn.tagthisperson.unit.js             |  2 +-
 plugins/timeline/popcorn.timeline.html        |  2 +-
 plugins/timeline/popcorn.timeline.unit.html   |  2 +-
 plugins/timeline/popcorn.timeline.unit.js     | 32 +++++++++----------
 plugins/twitter/popcorn.twitter.html          |  4 +--
 plugins/twitter/popcorn.twitter.js            |  4 +--
 plugins/twitter/popcorn.twitter.unit.html     |  2 +-
 plugins/twitter/popcorn.twitter.unit.js       |  2 +-
 plugins/webpage/popcorn.webpage.html          |  4 +--
 plugins/webpage/popcorn.webpage.js            |  2 +-
 plugins/webpage/popcorn.webpage.unit.html     |  2 +-
 plugins/webpage/popcorn.webpage.unit.js       |  2 +-
 plugins/wikipedia/popcorn.wikipedia.html      |  6 ++--
 plugins/wikipedia/popcorn.wikipedia.unit.js   |  6 ++--
 plugins/wordriver/popcorn.wordriver.html      |  2 +-
 plugins/wordriver/popcorn.wordriver.js        |  2 +-
 plugins/wordriver/popcorn.wordriver.unit.html |  2 +-
 plugins/wordriver/popcorn.wordriver.unit.js   |  6 ++--
 67 files changed, 204 insertions(+), 204 deletions(-)

diff --git a/plugins/attribution/popcorn.attribution.html b/plugins/attribution/popcorn.attribution.html
index 14ccbf892..0a6788c9d 100755
--- a/plugins/attribution/popcorn.attribution.html
+++ b/plugins/attribution/popcorn.attribution.html
@@ -39,12 +39,12 @@ <h1 id="qunit-header">Popcorn Attribution Plug-in Demo</h1>
   <div>
     <video id="video"
       controls preload="none"
-      width= "250px"
+      width="250px"
       poster="../../test/poster.png">
 
       <source id="mp4"
         src="../../test/trailer.mp4"
-        type='viden/mp4; codecs="avc1, mp4a"'>
+        type='video/mp4; codecs="avc1, mp4a"'>
 
       <source id="ogv"
         src="../../test/trailer.ogv"
diff --git a/plugins/attribution/popcorn.attribution.unit.js b/plugins/attribution/popcorn.attribution.unit.js
index 81359cec3..98e733882 100755
--- a/plugins/attribution/popcorn.attribution.unit.js
+++ b/plugins/attribution/popcorn.attribution.unit.js
@@ -1,6 +1,6 @@
-test("Popcorn attribution Plugin", function () {
+test( "Popcorn attribution Plugin", function() {
 
-  var popped = Popcorn("#video"),
+  var popped = Popcorn( "#video" ),
       expects = 10,
       count = 0,
       setupId,
@@ -9,17 +9,17 @@ test("Popcorn attribution Plugin", function () {
   expect( expects );
 
   function plus() {
-    if ( ++count===expects ) {
+    if ( ++count === expects ) {
       start();
     }
   }
 
   stop();
 
-  ok ( "attribution" in popped, "attribution is a method of the popped instance" );
+  ok( "attribution" in popped, "attribution is a method of the popped instance" );
   plus();
 
-  equals ( attributiondiv.childElementCount, 0, "initially, there is nothing inside the attributiondiv" );
+  equals( attributiondiv.childElementCount, 0, "initially, there is nothing inside the attributiondiv" );
   plus();
 
   popped.attribution({
@@ -45,9 +45,9 @@ test("Popcorn attribution Plugin", function () {
   setupId = popped.getLastTrackEventId();
 
   popped.exec( 0, function() {
-    equals ( attributiondiv.childElementCount, 2, "attributiondiv now has two inner elements" );
+    equals( attributiondiv.childElementCount, 2, "attributiondiv now has two inner elements" );
     plus();
-    equals ( attributiondiv.children[ 0 ].style.display , "inline", "attribution is visible on the page" );
+    equals( attributiondiv.children[ 0 ].style.display , "inline", "attribution is visible on the page" );
     plus();
   });
 
@@ -56,17 +56,17 @@ test("Popcorn attribution Plugin", function () {
     ok( /target="_blank"/.test( attributiondiv.innerHTML ), "attributions create anchors that target=_blank" );
     plus();
 
-    equals ( attributiondiv.children[ 1 ].style.display , "inline", "second attribution is visible on the page" );
+    equals( attributiondiv.children[ 1 ].style.display, "inline", "second attribution is visible on the page" );
     plus();
 
-    equals ( typeof popped.data.trackEvents.byStart[ 1 ]._license, "undefined", "undefined license is properly being handled" );
+    equals( typeof popped.data.trackEvents.byStart[ 1 ]._license, "undefined", "undefined license is properly being handled" );
     plus();
   });
 
   popped.exec( 4, function() {
-    equals( attributiondiv.children[ 1 ].style.display , "none", "second attribution is no longer visible on the page" );
+    equals( attributiondiv.children[ 1 ].style.display, "none", "second attribution is no longer visible on the page" );
     plus();
-    equals( attributiondiv.children[ 0 ].style.display , "none", "first attribution is no longer visible on the page" );
+    equals( attributiondiv.children[ 0 ].style.display, "none", "first attribution is no longer visible on the page" );
     plus();
 
     popped.pause().removeTrackEvent( setupId );
diff --git a/plugins/code/popcorn.code.html b/plugins/code/popcorn.code.html
index fe0b1b0a2..fd83a01e3 100755
--- a/plugins/code/popcorn.code.html
+++ b/plugins/code/popcorn.code.html
@@ -65,7 +65,7 @@ <h1 id="qunit-header">Popcorn Code Plugin Demo</h1>
       autobuffer
       preload="auto"
       controls
-      width= "250px"
+      width="250px"
       poster="../../test/poster.png">
 
       <source id="mp4"
diff --git a/plugins/code/popcorn.code.unit.html b/plugins/code/popcorn.code.unit.html
index 5c5b7c9ce..edeef04e0 100755
--- a/plugins/code/popcorn.code.unit.html
+++ b/plugins/code/popcorn.code.unit.html
@@ -28,7 +28,7 @@ <h2 id="qunit-userAgent"></h2>
     autobuffer
     preload="auto"
     controls
-    width= "250px"
+    width="250px"
     poster="../../test/poster.png">
 
     <source id="mp4"
diff --git a/plugins/code/popcorn.code.unit.js b/plugins/code/popcorn.code.unit.js
index 441074747..5dd8abc8d 100755
--- a/plugins/code/popcorn.code.unit.js
+++ b/plugins/code/popcorn.code.unit.js
@@ -1,4 +1,4 @@
-test( "Popcorn Code Plugin", function () {
+test( "Popcorn Code Plugin", function() {
 
   var popped = Popcorn( "#video" ),
       expects = 9,
@@ -9,7 +9,7 @@ test( "Popcorn Code Plugin", function () {
   expect( expects );
 
   function plus() {
-    if ( ++count === expects) {
+    if ( ++count === expects ) {
       start();
     }
   }
@@ -19,7 +19,7 @@ test( "Popcorn Code Plugin", function () {
   ok( "code" in popped, "code is a method of the popped instance" );
   plus();
 
-  equals ( codeDiv.innerHTML, "", "initially, there is nothing inside the code-div" );
+  equals( codeDiv.innerHTML, "", "initially, there is nothing inside the code-div" );
   plus();
 
   popped.code({
diff --git a/plugins/facebook/popcorn.facebook.html b/plugins/facebook/popcorn.facebook.html
index 2098e9680..4a4fbbdd7 100755
--- a/plugins/facebook/popcorn.facebook.html
+++ b/plugins/facebook/popcorn.facebook.html
@@ -69,7 +69,7 @@ <h1 id="qunit-header">Popcorn Facebook Plug-in Demo</h1>
   <div>
     <video id="video"
       controls preload="none"
-      width= "350px"
+      width="350px"
       poster="../../test/poster.png">
 
       <source id="mp4"
diff --git a/plugins/facebook/popcorn.facebook.unit.html b/plugins/facebook/popcorn.facebook.unit.html
index ec90985c4..be9e4e287 100755
--- a/plugins/facebook/popcorn.facebook.unit.html
+++ b/plugins/facebook/popcorn.facebook.unit.html
@@ -26,7 +26,7 @@ <h2 id="qunit-userAgent"></h2>
   </div>
   <video id="video"
     controls preload="none"
-    width= "250px"
+    width="250px"
     poster="../../test/poster.png">
 
     <source id="mp4"
diff --git a/plugins/facebook/popcorn.facebook.unit.js b/plugins/facebook/popcorn.facebook.unit.js
index bc36a27e3..40dd43e27 100755
--- a/plugins/facebook/popcorn.facebook.unit.js
+++ b/plugins/facebook/popcorn.facebook.unit.js
@@ -1,4 +1,4 @@
-test( "Popcorn Facebook Plugin", function () {
+test( "Popcorn Facebook Plugin", function() {
 
   var popped = Popcorn( "#video" ),
       expects = 9,
@@ -12,7 +12,7 @@ test( "Popcorn Facebook Plugin", function () {
   expect( expects );
 
   function plus() {
-    if ( ++count===expects ) {
+    if ( ++count === expects ) {
       start();
     }
   }
@@ -52,35 +52,35 @@ test( "Popcorn Facebook Plugin", function () {
     .volume( 0 )
     .play();
 
-  ok ( document.getElementById( "likediv" ), "likediv exists on the page" );
+  ok( document.getElementById( "likediv" ), "likediv exists on the page" );
   plus();
-  ok ( document.getElementById( "likeboxdiv" ), "likeboxdiv exists on the page" );
+  ok( document.getElementById( "likeboxdiv" ), "likeboxdiv exists on the page" );
   plus();
-  ok ( document.getElementById( "activitydiv" ), "activitydiv exists on the page" );
+  ok( document.getElementById( "activitydiv" ), "activitydiv exists on the page" );
   plus();
-  ok ( document.getElementById( "facepilediv" ), "facepilediv exists on the page" );
+  ok( document.getElementById( "facepilediv" ), "facepilediv exists on the page" );
   plus();
 
   // I inspected the html genterated by facebook, and found that there are no uniquely identifying attributes between plug-in types
   // so right now, we just check ot make sure that facebook is returning a plugin and displaying it at the correct time.
 
   popped.exec( 2, function() {
-    ok ( document.getElementById( "likediv" ).innerHTML, "likediv is not empty at 0:02 (expected)" );
+    ok( document.getElementById( "likediv" ).innerHTML, "likediv is not empty at 0:02 (expected)" );
     plus();
   });
 
   popped.exec( 3, function() {
-    ok ( document.getElementById( "likeboxdiv" ).innerHTML, "likeboxdiv is not empty at 0:03 (expected)" );
+    ok( document.getElementById( "likeboxdiv" ).innerHTML, "likeboxdiv is not empty at 0:03 (expected)" );
     plus();
   });
 
   popped.exec( 4, function() {
-    ok ( document.getElementById( "activitydiv" ).innerHTML, "Activitydiv is not empty at 0:04 (expected)" );
+    ok( document.getElementById( "activitydiv" ).innerHTML, "Activitydiv is not empty at 0:04 (expected)" );
     plus();
   });
 
   popped.exec( 5, function() {
-    ok ( document.getElementById( "facepilediv" ).innerHTML, "Facepilediv is not empty at 0:05 (expected)" );
+    ok( document.getElementById( "facepilediv" ).innerHTML, "Facepilediv is not empty at 0:05 (expected)" );
     plus();
   });
 });
diff --git a/plugins/flickr/popcorn.flickr.html b/plugins/flickr/popcorn.flickr.html
index 50d3ee69d..9d991f16d 100755
--- a/plugins/flickr/popcorn.flickr.html
+++ b/plugins/flickr/popcorn.flickr.html
@@ -56,7 +56,7 @@ <h1 id="qunit-header">Popcorn Flickr Plug-in Demo</h1>
   <div>
     <video id="video"
       controls
-      width= "250px"
+      width="250px"
       poster="../../test/poster.png">
 
       <source id="mp4"
diff --git a/plugins/flickr/popcorn.flickr.unit.html b/plugins/flickr/popcorn.flickr.unit.html
index dd98cdcb1..58626bdd2 100755
--- a/plugins/flickr/popcorn.flickr.unit.html
+++ b/plugins/flickr/popcorn.flickr.unit.html
@@ -26,7 +26,7 @@ <h2 id="qunit-userAgent"></h2>
 
   <video id="video"
     controls
-    width= "250px"
+    width="250px"
     poster="../../test/poster.png">
 
     <source id="mp4"
diff --git a/plugins/flickr/popcorn.flickr.unit.js b/plugins/flickr/popcorn.flickr.unit.js
index 2e2c7adbb..305287a4c 100755
--- a/plugins/flickr/popcorn.flickr.unit.js
+++ b/plugins/flickr/popcorn.flickr.unit.js
@@ -1,4 +1,4 @@
-test("Popcorn Flickr Plugin", function () {
+test( "Popcorn Flickr Plugin", function() {
 
   var popped = Popcorn( "#video" ),
       expects = 11,
@@ -19,7 +19,7 @@ test("Popcorn Flickr Plugin", function () {
   ok( "flickr" in popped, "flickr is a method of the popped instance" );
   plus();
 
-  equals ( flickrdiv.innerHTML, "", "initially, there is nothing inside the flickrdiv" );
+  equals( flickrdiv.innerHTML, "", "initially, there is nothing inside the flickrdiv" );
   plus();
 
   popped.flickr({
diff --git a/plugins/footnote/popcorn.footnote.unit.js b/plugins/footnote/popcorn.footnote.unit.js
index d54cd717b..20b439967 100755
--- a/plugins/footnote/popcorn.footnote.unit.js
+++ b/plugins/footnote/popcorn.footnote.unit.js
@@ -1,4 +1,4 @@
-test( "Popcorn Footnote Plugin", function () {
+test( "Popcorn Footnote Plugin", function() {
 
   var popped = Popcorn( "#video" ),
       expects = 8,
@@ -9,17 +9,17 @@ test( "Popcorn Footnote Plugin", function () {
   expect( expects );
 
   function plus() {
-    if ( ++count===expects) {
+    if ( ++count===expects ) {
       start();
     }
   }
 
   stop();
 
-  ok ( "footnote" in popped, "footnote is a mehtod of the popped instance" );
+  ok( "footnote" in popped, "footnote is a mehtod of the popped instance" );
   plus();
 
-  equals ( footnotediv.childElementCount, 0, "initially, there is nothing inside the footnotediv" );
+  equals( footnotediv.childElementCount, 0, "initially, there is nothing inside the footnotediv" );
   plus();
 
   popped.footnote({
@@ -38,21 +38,21 @@ test( "Popcorn Footnote Plugin", function () {
   setupId = popped.getLastTrackEventId();
 
   popped.exec( 0, function() {
-    equals ( footnotediv.childElementCount, 2, "footnotediv now has two inner elements" );
+    equals( footnotediv.childElementCount, 2, "footnotediv now has two inner elements" );
     plus();
-    equals ( footnotediv.children[ 0 ].innerHTML , "This video made exclusively for drumbeat.org", "footnote displaing correct information" );
+    equals( footnotediv.children[ 0 ].innerHTML, "This video made exclusively for drumbeat.org", "footnote displaing correct information" );
     plus();
-    equals ( footnotediv.children[ 0 ].style.display , "inline", "footnote is visible on the page" );
+    equals( footnotediv.children[ 0 ].style.display, "inline", "footnote is visible on the page" );
     plus();
   });
 
   popped.exec( 3, function() {
-    equals ( footnotediv.children[ 1 ].style.display , "inline", "second footnote is visible on the page" );
+    equals( footnotediv.children[ 1 ].style.display, "inline", "second footnote is visible on the page" );
     plus();
   });
 
   popped.exec( 4, function() {
-    ok ( footnotediv.children[ 1 ].style.display === "none" &&  footnotediv.children[0].style.display === 'none', "footnote are no longer vidible on the page" );
+    ok( footnotediv.children[ 1 ].style.display === "none" &&  footnotediv.children[ 0 ].style.display === 'none', "footnote are no longer vidible on the page" );
     plus();
 
     popped.pause().removeTrackEvent( setupId );
@@ -64,7 +64,7 @@ test( "Popcorn Footnote Plugin", function () {
 });
 
 
-test( "Popcorn Text Plugin", function () {
+test( "Popcorn Text Plugin", function() {
 
   var popped = Popcorn( "#video" ),
       expects = 2,
@@ -94,7 +94,7 @@ test( "Popcorn Text Plugin", function () {
 
   popped.exec( 2, function() {
 
-    equal( textdiv.children[ 0 ].innerHTML , "I am an alias", "I am an alias set by Popcorn.p.text" );
+    equal( textdiv.children[ 0 ].innerHTML, "I am an alias", "I am an alias set by Popcorn.p.text" );
     plus();
 
   }).currentTime( 1 ).play();
diff --git a/plugins/gml/popcorn.gml.html b/plugins/gml/popcorn.gml.html
index d3b9f1d83..e1f7e60f8 100755
--- a/plugins/gml/popcorn.gml.html
+++ b/plugins/gml/popcorn.gml.html
@@ -5,7 +5,7 @@
   <script src="../../popcorn.js"></script>
   <script src="popcorn.gml.js"></script>
   <script>
-    document.addEventListener( "DOMContentLoaded", function () {
+    document.addEventListener( "DOMContentLoaded", function() {
       var p = Popcorn( "#video" )
       .play()
       .volume( 0 )
@@ -39,7 +39,7 @@ <h1 id="qunit-header">Popcorn GML Plug-in Demo</h1>
   <div>
     <video id="video"
       controls preload="none"
-      width= "250px"
+      width="250px"
       poster="../../test/poster.png">
 
       <source id="mp4"
diff --git a/plugins/gml/popcorn.gml.unit.html b/plugins/gml/popcorn.gml.unit.html
index d16eab853..eca2a621b 100755
--- a/plugins/gml/popcorn.gml.unit.html
+++ b/plugins/gml/popcorn.gml.unit.html
@@ -22,7 +22,7 @@ <h2 id="qunit-userAgent"></h2>
 
   <video id="video"
     controls preload="none"
-    width= "250px"
+    width="250px"
     poster="../../test/poster.png">
 
     <source id="mp4"
diff --git a/plugins/gml/popcorn.gml.unit.js b/plugins/gml/popcorn.gml.unit.js
index 48d9ad238..0ae489b98 100755
--- a/plugins/gml/popcorn.gml.unit.js
+++ b/plugins/gml/popcorn.gml.unit.js
@@ -1,4 +1,4 @@
-test( "Popcorn GML Plugin", function () {
+test( "Popcorn GML Plugin", function() {
 
   var popped = Popcorn( "#video" ),
       expects = 8,
@@ -9,17 +9,17 @@ test( "Popcorn GML Plugin", function () {
   expect( expects );
 
   function plus() {
-    if ( ++count===expects ) {
+    if ( ++count === expects ) {
       start();
     }
   }
 
   stop( 10000 );
 
-  ok ( "gml" in popped, "gml is a method of the popped instance" );
+  ok( "gml" in popped, "gml is a method of the popped instance" );
   plus();
 
-  equals ( gmldiv.childElementCount, 0, "initially, there is nothing inside the gmldiv" );
+  equals( gmldiv.childElementCount, 0, "initially, there is nothing inside the gmldiv" );
   plus();
 
   popped.gml({
@@ -43,14 +43,14 @@ test( "Popcorn GML Plugin", function () {
   });
 
   popped.exec( 3, function() {
-    equals( gmldiv.children[ 1 ].style.display , "block", "second GML is visible on the page" );
+    equals( gmldiv.children[ 1 ].style.display, "block", "second GML is visible on the page" );
     plus();
   });
 
   popped.exec( 4, function() {
-    equals( gmldiv.children[ 1 ].style.display , "none", "second GML is no longer visible on the page" );
+    equals( gmldiv.children[ 1 ].style.display, "none", "second GML is no longer visible on the page" );
     plus();
-    equals( gmldiv.children[ 0 ].style.display , "none", "first GML is no longer visible on the page" );
+    equals( gmldiv.children[ 0 ].style.display, "none", "first GML is no longer visible on the page" );
     plus();
 
     popped.pause().removeTrackEvent( setupId );
diff --git a/plugins/googlefeed/popcorn.googlefeed.html b/plugins/googlefeed/popcorn.googlefeed.html
index f3bb0b912..290de5903 100755
--- a/plugins/googlefeed/popcorn.googlefeed.html
+++ b/plugins/googlefeed/popcorn.googlefeed.html
@@ -6,8 +6,8 @@
   <script src="../../popcorn.js"></script>
   <script src="popcorn.googlefeed.js"></script>
   <script>
-    document.addEventListener("DOMContentLoaded", function () {
-      var p = Popcorn("#video")
+    document.addEventListener( "DOMContentLoaded", function() {
+      var p = Popcorn( "#video" )
       .volume( 0 )
       .play()
       .googlefeed({
@@ -36,7 +36,7 @@ <h1 id="qunit-header">Popcorn Google Feed Plug-in Demo</h1>
   <div>
     <video id="video"
       controls
-      width= "250px"
+      width="250px"
       poster="../../test/poster.png">
 
       <source id="mp4"
diff --git a/plugins/googlefeed/popcorn.googlefeed.js b/plugins/googlefeed/popcorn.googlefeed.js
index 1d84f6be9..769031c68 100755
--- a/plugins/googlefeed/popcorn.googlefeed.js
+++ b/plugins/googlefeed/popcorn.googlefeed.js
@@ -79,7 +79,7 @@
   *
   */
 
-  Popcorn.plugin( "googlefeed" , function( options ) {
+  Popcorn.plugin( "googlefeed", function( options ) {
 
     // create a new div and append it to the parent div so nothing
     // that already exists in the parent div gets overwritten
@@ -176,7 +176,7 @@
       },
       orientation: {
         elem: "select",
-        options: [ "Vertical","Horizontal" ],
+        options: [ "Vertical", "Horizontal" ],
         label: "orientation"
       }
     }
diff --git a/plugins/googlefeed/popcorn.googlefeed.unit.html b/plugins/googlefeed/popcorn.googlefeed.unit.html
index 2f63a8a7b..a0cade802 100755
--- a/plugins/googlefeed/popcorn.googlefeed.unit.html
+++ b/plugins/googlefeed/popcorn.googlefeed.unit.html
@@ -23,7 +23,7 @@ <h2 id="qunit-userAgent"></h2>
 
   <video id="video"
     controls preload="none"
-    width= "250px"
+    width="250px"
     poster="../../test/poster.png">
 
     <source id="mp4"
diff --git a/plugins/googlefeed/popcorn.googlefeed.unit.js b/plugins/googlefeed/popcorn.googlefeed.unit.js
index 0ae174369..3b8817f3e 100755
--- a/plugins/googlefeed/popcorn.googlefeed.unit.js
+++ b/plugins/googlefeed/popcorn.googlefeed.unit.js
@@ -1,4 +1,4 @@
-test("Popcorn Google Feed Plugin", function () {
+test( "Popcorn Google Feed Plugin", function() {
 
   var popped = Popcorn( "#video" ),
       expects = 13,
@@ -8,7 +8,7 @@ test("Popcorn Google Feed Plugin", function () {
   expect( expects );
 
   function plus() {
-    if ( ++count === expects) {
+    if ( ++count === expects ) {
       start();
     }
   }
@@ -46,7 +46,7 @@ test("Popcorn Google Feed Plugin", function () {
     plus();
     ok( GFdynamicFeedControl, "Dynamic Feed Control Available" );
     plus();
-    ok ( document.getElementById( "_feed1" ), "First feed is on the page" );
+    ok( document.getElementById( "_feed1" ), "First feed is on the page" );
     plus();
     equals ( document.getElementById( "_feed1" ).offsetParent.id, "feed", "First feed is inside the 'feed' div" );
     plus();
@@ -54,18 +54,18 @@ test("Popcorn Google Feed Plugin", function () {
     plus();
   });
   popped.exec( 2, function() {
-    ok ( document.getElementById( "_feed2" ), "Second feed is on the page" );
+    ok( document.getElementById( "_feed2" ), "Second feed is on the page" );
     plus();
-    equals ( document.getElementById( "_feed2" ).offsetParent.id, "feed1", "Second feed is inside the 'feed2' div" );
+    equals( document.getElementById( "_feed2" ).offsetParent.id, "feed1", "Second feed is inside the 'feed2' div" );
     plus();
   });
   popped.exec( 3, function() {
-    ok ( document.getElementById( "_feed2" ).style.display === "none" &&
+    ok( document.getElementById( "_feed2" ).style.display === "none" &&
         document.getElementById( "_feed1" ).style.display === "none", "Both feeds are no lnger visible" );
 	  plus();
 
     popped.pause().removeTrackEvent( setupId );
-    ok( !document.getElementById( "feed1" ).children[ 0 ], "removed feed was properly destroyed"  );
+    ok( !document.getElementById( "feed1" ).children[ 0 ], "removed feed was properly destroyed" );
     plus();
   });
 
diff --git a/plugins/googlemap/popcorn.googlemap.html b/plugins/googlemap/popcorn.googlemap.html
index a14b6f17d..40030ad65 100755
--- a/plugins/googlemap/popcorn.googlemap.html
+++ b/plugins/googlemap/popcorn.googlemap.html
@@ -6,7 +6,7 @@
   <script src="../../popcorn.js"></script>
   <script src="popcorn.googlemap.js"></script>
   <script type="text/javascript">
-    document.addEventListener( "DOMContentLoaded", function () {
+    document.addEventListener( "DOMContentLoaded", function() {
       var p = Popcorn( "#video" )
       .volume( 0 )
       .play()
@@ -155,7 +155,7 @@ <h1 id="qunit-header">Popcorn google Map Plug-in Demo</h1>
 
     <video id="video"
       controls
-      width= "250px"
+      width="250px"
       poster="../../test/poster.png">
 
       <source id="mp4"
diff --git a/plugins/googlemap/popcorn.googlemap.unit.html b/plugins/googlemap/popcorn.googlemap.unit.html
index 11db41634..3cd1cf44c 100755
--- a/plugins/googlemap/popcorn.googlemap.unit.html
+++ b/plugins/googlemap/popcorn.googlemap.unit.html
@@ -24,7 +24,7 @@ <h2 id="qunit-userAgent"></h2>
 
   <video id="video"
     controls preload="none"
-    width= "250px"
+    width="250px"
     poster="../../test/poster.png">
 
     <source id="mp4"
diff --git a/plugins/googlemap/popcorn.googlemap.unit.js b/plugins/googlemap/popcorn.googlemap.unit.js
index f242bb6f7..4b5c822e8 100755
--- a/plugins/googlemap/popcorn.googlemap.unit.js
+++ b/plugins/googlemap/popcorn.googlemap.unit.js
@@ -1,4 +1,4 @@
-test( "Popcorn Google Map Plugin", function () {
+test( "Popcorn Google Map Plugin", function() {
 
   var popped = Popcorn( "#video" ),
       expects = 15,
@@ -15,16 +15,16 @@ test( "Popcorn Google Map Plugin", function () {
 
   stop();
 
-  ok ( "googlemap" in popped, "googlemap is a mehtod of the popped instance" );
+  ok( "googlemap" in popped, "googlemap is a method of the popped instance" );
   plus();
 
-  ok ( document.getElementById( "map" ).innerHTML === "", "initially, there is nothing inside the map" );
+  ok( document.getElementById( "map" ).innerHTML === "", "initially, there is nothing inside the map" );
   plus();
 
-  ok ( document.getElementById( "map2" ).innerHTML === "", "initially, there is nothing inside the map2" );
+  ok( document.getElementById( "map2" ).innerHTML === "", "initially, there is nothing inside the map2" );
   plus();
 
-  ok ( document.getElementById( "map3" ).innerHTML === "", "initially, there is nothing inside the map3" );
+  ok( document.getElementById( "map3" ).innerHTML === "", "initially, there is nothing inside the map3" );
   plus();
 
   popped.googlemap({
@@ -64,28 +64,28 @@ test( "Popcorn Google Map Plugin", function () {
     plus();
     ok( google.maps.Geocoder, "Google maps Geocoder is available" );
     plus();
-    ok ( document.getElementById( "actualmap1" ), "First map is on the page" );
+    ok( document.getElementById( "actualmap1" ), "First map is on the page" );
     plus();
-    equals ( document.getElementById( "actualmap1" ).offsetParent.id, "map", "First map is inside the 'map' div" );
+    equals( document.getElementById( "actualmap1" ).offsetParent.id, "map", "First map is inside the 'map' div" );
     plus();
     equals( popped.data.trackEvents.byStart[ 1 ].zoom, 8, "Defaulting to zoom of 8" );
     plus();
   });
 
   popped.exec( 1, function() {
-    ok ( document.getElementById( "actualmap2" ), "Second map is on the page" );
+    ok( document.getElementById( "actualmap2" ), "Second map is on the page" );
     plus();
-    equals ( document.getElementById( "actualmap2" ).offsetParent.id, "map2", "Second map is inside the 'map2' div" );
+    equals( document.getElementById( "actualmap2" ).offsetParent.id, "map2", "Second map is inside the 'map2' div" );
     plus();
   });
 
   popped.exec( 3, function() {
-    equals ( document.getElementById( "actualmap3" ).offsetParent.id, "map3", "Tweening map is inside the 'map3' div" );
+    equals( document.getElementById( "actualmap3" ).offsetParent.id, "map3", "Tweening map is inside the 'map3' div" );
     plus();
   });
 
   popped.exec( 5, function() {
-    ok ( document.getElementById( "actualmap2" ).style.display === "none" && 
+    ok( document.getElementById( "actualmap2" ).style.display === "none" && 
         document.getElementById( "actualmap1" ).style.display === "none" &&
         document.getElementById( "actualmap3" ).style.display === "none", "All maps are no longer visible" );
     plus();
diff --git a/plugins/image/popcorn.image.unit.js b/plugins/image/popcorn.image.unit.js
index 447b17950..4dbbc435d 100755
--- a/plugins/image/popcorn.image.unit.js
+++ b/plugins/image/popcorn.image.unit.js
@@ -1,4 +1,4 @@
-test( "Popcorn Image Plugin", function () {
+test( "Popcorn Image Plugin", function() {
 
   var popped = Popcorn( "#video" ),
       expects = 9,
diff --git a/plugins/lastfm/popcorn.lastfm.html b/plugins/lastfm/popcorn.lastfm.html
index c3876c498..695117c03 100755
--- a/plugins/lastfm/popcorn.lastfm.html
+++ b/plugins/lastfm/popcorn.lastfm.html
@@ -13,7 +13,7 @@
   <script src="../../popcorn.js"></script>
   <script src="popcorn.lastfm.js"></script>
   <script>
-    document.addEventListener( "DOMContentLoaded", function () {
+    document.addEventListener( "DOMContentLoaded", function() {
       var p = Popcorn( "#video" )
       .volume( 0 )
       .play()
@@ -65,7 +65,7 @@ <h1 id="qunit-header">Popcorn LastFM Plug-in Demo</h1>
   <div>
     <video id="video"
       controls preload="none"
-      width= "250px"
+      width="250px"
       poster="../../test/poster.png">
 
       <source id="mp4"
diff --git a/plugins/lastfm/popcorn.lastfm.js b/plugins/lastfm/popcorn.lastfm.js
index d4f0dee34..af26ebf5e 100755
--- a/plugins/lastfm/popcorn.lastfm.js
+++ b/plugins/lastfm/popcorn.lastfm.js
@@ -7,7 +7,7 @@
         if ( data.artist ) {
           var htmlString = "";
 
-          htmlString = "<h3>"+data.artist.name+"</h3>";
+          htmlString = "<h3>" + data.artist.name + "</h3>";
           htmlString += "<a href='" + data.artist.url + "' target='_blank' style='float:left;margin:0 10px 0 0;'><img src='" + data.artist.image[ 2 ][ "#text"] + "' alt=''></a>";
           htmlString += "<p>" + data.artist.bio.summary + "</p>";
           htmlString += "<hr /><p><h4>Tags</h4><ul>";
diff --git a/plugins/lastfm/popcorn.lastfm.unit.html b/plugins/lastfm/popcorn.lastfm.unit.html
index ad4c9e344..cfe5f5430 100755
--- a/plugins/lastfm/popcorn.lastfm.unit.html
+++ b/plugins/lastfm/popcorn.lastfm.unit.html
@@ -26,7 +26,7 @@ <h2 id="qunit-userAgent"></h2>
 
   <video id="video"
     controls
-    width= "250px"
+    width="250px"
     poster="../../test/poster.png">
 
     <source id="mp4"
diff --git a/plugins/lastfm/popcorn.lastfm.unit.js b/plugins/lastfm/popcorn.lastfm.unit.js
index c20aaf1f2..586c0527d 100755
--- a/plugins/lastfm/popcorn.lastfm.unit.js
+++ b/plugins/lastfm/popcorn.lastfm.unit.js
@@ -1,4 +1,4 @@
-test( "Popcorn LastFM Plugin", function () {
+test( "Popcorn LastFM Plugin", function() {
   /*
     ATTENTION
 
@@ -24,7 +24,7 @@ test( "Popcorn LastFM Plugin", function () {
   ok( "lastfm" in popped, "lastfm is a method of the popped instance" );
   plus();
 
-  equals ( lastfmdiv.innerHTML, "", "initially, there is nothing inside the lastfmdiv" );
+  equals( lastfmdiv.innerHTML, "", "initially, there is nothing inside the lastfmdiv" );
   plus();
 
   popped.lastfm({
@@ -51,23 +51,23 @@ test( "Popcorn LastFM Plugin", function () {
   setupId = popped.getLastTrackEventId();
 
   popped.exec( 2, function() {
-    equals ( lastfmdiv.childElementCount, 3, "lastfmdiv now has three inner elements" );
+    equals( lastfmdiv.childElementCount, 3, "lastfmdiv now has three inner elements" );
     plus();
-    equals ( lastfmdiv.children[0].style.display , "inline", "yachtdiv is visible on the page" );
+    equals( lastfmdiv.children[ 0 ].style.display , "inline", "yachtdiv is visible on the page" );
     plus();
   });
 
   popped.exec( 3, function() {
-    equals ( lastfmdiv.children[ 0 ].style.display , "inline", "yachtdiv is still visible on the page" );
+    equals( lastfmdiv.children[ 0 ].style.display , "inline", "yachtdiv is still visible on the page" );
     plus();
-    equals ( lastfmdiv.children[ 1 ].style.display , "inline", "beatlesdiv is visible on the page" );
+    equals( lastfmdiv.children[ 1 ].style.display , "inline", "beatlesdiv is visible on the page" );
     plus();
-    equals ( lastfmdiv.children[ 2 ].style.display , "none", "nulldiv is not visible on the page" );
+    equals( lastfmdiv.children[ 2 ].style.display , "none", "nulldiv is not visible on the page" );
     plus();
   });
 
   popped.exec( 5, function() {
-    equals ( lastfmdiv.children[ 2 ].innerHTML , "Unknown Artist", "Artist information could not be found" );
+    equals( lastfmdiv.children[ 2 ].innerHTML , "Unknown Artist", "Artist information could not be found" );
     plus();
 
     popped.pause().removeTrackEvent( setupId );
@@ -83,7 +83,7 @@ test( "Popcorn LastFM Plugin", function () {
   try {
     popped.lastfm({});
   } catch( e ) {
-    ok ( true, "empty event was caught by debug" );
+    ok( true, "empty event was caught by debug" );
     plus();
   }
 
diff --git a/plugins/linkedin/popcorn.linkedin.unit.js b/plugins/linkedin/popcorn.linkedin.unit.js
index 2791f8863..3c0cdd63b 100755
--- a/plugins/linkedin/popcorn.linkedin.unit.js
+++ b/plugins/linkedin/popcorn.linkedin.unit.js
@@ -1,4 +1,4 @@
-test ("Popcorn LinkedIn Plugin", function () {
+test( "Popcorn LinkedIn Plugin", function() {
 
   if ( /localhost/.test( location.hostname ) ) {
 
@@ -170,7 +170,7 @@ test ("Popcorn LinkedIn Plugin", function () {
 
       // Make sure _teardown functionality works
       popped.pause().removeTrackEvent( setupId );
-      ok( !companyprofilediv.children[ 1 ], "companyprofilediv plugin was properly destroyed"  );
+      ok( !companyprofilediv.children[ 1 ], "companyprofilediv plugin was properly destroyed" );
       plus();
     });
 
diff --git a/plugins/lowerthird/popcorn.lowerthird.html b/plugins/lowerthird/popcorn.lowerthird.html
index 60750c378..77696faf1 100755
--- a/plugins/lowerthird/popcorn.lowerthird.html
+++ b/plugins/lowerthird/popcorn.lowerthird.html
@@ -7,9 +7,9 @@
 
   <script src="popcorn.lowerthird.js"></script>
   <script>
-    document.addEventListener("DOMContentLoaded", function () {
+    document.addEventListener( "DOMContentLoaded", function() {
 
-      var p = Popcorn("#video")
+      var p = Popcorn( "#video" )
       .play()
       .lowerthird({
         start: 5,
diff --git a/plugins/lowerthird/popcorn.lowerthird.js b/plugins/lowerthird/popcorn.lowerthird.js
index 429a6dc03..d14c261e2 100755
--- a/plugins/lowerthird/popcorn.lowerthird.js
+++ b/plugins/lowerthird/popcorn.lowerthird.js
@@ -29,7 +29,7 @@
    *
    */
 
-  Popcorn.plugin( "lowerthird" , {
+  Popcorn.plugin( "lowerthird", {
 
       manifest: {
         about:{
@@ -60,7 +60,7 @@
             type: "text",
             label: "Text"
           },
-          role : {
+          role: {
             elem: "input",
             type: "text",
             label: "Text"
@@ -119,9 +119,9 @@
        * of the video reaches the end time provided by the
        * options variable
        */
-      end: function(event, options) {
+      end: function( event, options ) {
         options.container.innerHTML = "";
       }
 
-  } );
+  });
 })( Popcorn );
diff --git a/plugins/lowerthird/popcorn.lowerthird.unit.html b/plugins/lowerthird/popcorn.lowerthird.unit.html
index 714584070..a1c459bdd 100755
--- a/plugins/lowerthird/popcorn.lowerthird.unit.html
+++ b/plugins/lowerthird/popcorn.lowerthird.unit.html
@@ -24,7 +24,7 @@ <h2 id="qunit-userAgent"></h2>
 
   <video id="video"
     controls preload"none"
-    width= "250px"
+    width="250px"
     poster="../../test/poster.png">
 
     <source id="mp4"
diff --git a/plugins/lowerthird/popcorn.lowerthird.unit.js b/plugins/lowerthird/popcorn.lowerthird.unit.js
index 29fa1c82a..b0a630b4c 100755
--- a/plugins/lowerthird/popcorn.lowerthird.unit.js
+++ b/plugins/lowerthird/popcorn.lowerthird.unit.js
@@ -1,4 +1,4 @@
-test( "Popcorn lower third Plugin", function () {
+test( "Popcorn lower third Plugin", function() {
 
   var popped = Popcorn( "#video" ),
       expects = 8,
@@ -8,14 +8,14 @@ test( "Popcorn lower third Plugin", function () {
   expect( expects );
 
   function plus() {
-    if ( ++count===expects ) {
+    if ( ++count === expects ) {
       start();
     }
   }
 
   stop();
 
-  ok ( "lowerthird" in popped, "lowerthird is a method of the popped instance" );
+  ok( "lowerthird" in popped, "lowerthird is a method of the popped instance" );
   plus();
 
   equals ( lowerthirddiv.innerHTML, "", "initially, there is nothing inside the lowerthirddiv" );
@@ -56,19 +56,19 @@ test( "Popcorn lower third Plugin", function () {
     .volume( 0 );
 
   popped.exec( 1, function() {
-    equals ( popped.container.innerHTML, "Mr Hyde<br>Monster", "first lowerthird is visible" );
+    equals( popped.container.innerHTML, "Mr Hyde<br>Monster", "first lowerthird is visible" );
     plus();
   });
 
   popped.exec( 3, function() {
-    equals ( lowerthirddiv.innerHTML, "<div>Dr Jekyll<br>Person</div>", "second lowerthird is visible" );
+    equals( lowerthirddiv.innerHTML, "<div>Dr Jekyll<br>Person</div>", "second lowerthird is visible" );
     plus();
   });
 
   popped.exec( 5, function() {
-    equals ( popped.container.innerHTML, "", "first lowerthird is empty" );
+    equals( popped.container.innerHTML, "", "first lowerthird is empty" );
     plus();
-    equals ( lowerthirddiv.innerHTML, "<div></div>", "second lowerthird is empty" );
+    equals( lowerthirddiv.innerHTML, "<div></div>", "second lowerthird is empty" );
     plus();
   });
 
diff --git a/plugins/mustache/popcorn.mustache.js b/plugins/mustache/popcorn.mustache.js
index ed34b7e48..0eb836080 100755
--- a/plugins/mustache/popcorn.mustache.js
+++ b/plugins/mustache/popcorn.mustache.js
@@ -84,7 +84,7 @@
   *
   */
 
-  Popcorn.plugin( "mustache" , function( options ) {
+  Popcorn.plugin( "mustache" , function( options ){
 
     var getData, data, getTemplate, template;
 
diff --git a/plugins/mustache/popcorn.mustache.unit.html b/plugins/mustache/popcorn.mustache.unit.html
index 64d54a053..6ac07350d 100755
--- a/plugins/mustache/popcorn.mustache.unit.html
+++ b/plugins/mustache/popcorn.mustache.unit.html
@@ -27,7 +27,7 @@ <h2 id="qunit-userAgent"></h2>
     autobuffer
     preload="auto"
     controls
-    width= "250px"
+    width="250px"
     poster="../../test/poster.png">
 
     <source id="mp4"
diff --git a/plugins/mustache/popcorn.mustache.unit.js b/plugins/mustache/popcorn.mustache.unit.js
index 2a331ce44..1829511f5 100755
--- a/plugins/mustache/popcorn.mustache.unit.js
+++ b/plugins/mustache/popcorn.mustache.unit.js
@@ -1,4 +1,4 @@
-test( "Popcorn Mustache Plugin", function () {
+test( "Popcorn Mustache Plugin", function() {
 
   var popped = Popcorn( "#video" ),
       expects = 6,
diff --git a/plugins/openmap/popcorn.openmap.html b/plugins/openmap/popcorn.openmap.html
index 204023f5e..54abeb898 100755
--- a/plugins/openmap/popcorn.openmap.html
+++ b/plugins/openmap/popcorn.openmap.html
@@ -5,7 +5,7 @@
   <script src="../../popcorn.js"></script>
   <script src="popcorn.openmap.js"></script>
   <script>
-    document.addEventListener( "DOMContentLoaded", function () {
+    document.addEventListener( "DOMContentLoaded", function() {
       Popcorn( "#video" )
       .volume( 0 )
       .play()
@@ -61,7 +61,7 @@ <h1 id="qunit-header">Popcorn Open Map Plug-in Demo</h1>
   <div>
     <video id="video"
       controls
-      width= "250px"
+      width="250px"
       poster="../../test/poster.png">
 
       <source id="mp4"
diff --git a/plugins/openmap/popcorn.openmap.js b/plugins/openmap/popcorn.openmap.js
index f0c93562f..72811cc04 100755
--- a/plugins/openmap/popcorn.openmap.js
+++ b/plugins/openmap/popcorn.openmap.js
@@ -110,7 +110,7 @@
           displayProjection = new OpenLayers.Projection( "EPSG:4326" );
           projection = new OpenLayers.Projection( "EPSG:4326" );
           options.map = new OpenLayers.Map( {div: newdiv, projection: projection } );
-          var relief = new OpenLayers.Layer.WMS( "USGS Terraserver", "http://terraserver-usa.org/ogcmap.ashx?", { layers: 'DRG' } );
+          var relief = new OpenLayers.Layer.WMS( "USGS Terraserver", "http://terraserver-usa.org/ogcmap.ashx?", { layers: "DRG" } );
           options.map.addLayer( relief );
         } else {
           // add OpenStreetMap layer
diff --git a/plugins/openmap/popcorn.openmap.unit.html b/plugins/openmap/popcorn.openmap.unit.html
index 00f1a3179..87bdffcb9 100755
--- a/plugins/openmap/popcorn.openmap.unit.html
+++ b/plugins/openmap/popcorn.openmap.unit.html
@@ -22,7 +22,7 @@ <h2 id="qunit-userAgent"></h2>
 
   <video id="video"
     controls preload="none"
-    width= "250px"
+    width="250px"
     poster="../../test/poster.png">
 
     <source id="mp4"
diff --git a/plugins/openmap/popcorn.openmap.unit.js b/plugins/openmap/popcorn.openmap.unit.js
index 20cf25621..21cd6aa93 100755
--- a/plugins/openmap/popcorn.openmap.unit.js
+++ b/plugins/openmap/popcorn.openmap.unit.js
@@ -1,4 +1,4 @@
-test( "Popcorn OpenMap Plugin", function () {
+test( "Popcorn OpenMap Plugin", function() {
 
   var popped = Popcorn( "#video" ),
      expects = 15,
@@ -7,23 +7,23 @@ test( "Popcorn OpenMap Plugin", function () {
   expect( expects );
 
   function plus() {
-    if ( ++count===expects ) {
+    if ( ++count === expects ) {
       start();
     }
   }
 
   stop();
 
-  ok ( "openmap" in popped, "openmap is a method of the popped instance" );
+  ok( "openmap" in popped, "openmap is a method of the popped instance" );
   plus();
 
-  ok ( document.getElementById( "map" ).innerHTML === "", "initially, there is nothing inside map" );
+  ok( document.getElementById( "map" ).innerHTML === "", "initially, there is nothing inside map" );
   plus();
 
-  ok ( document.getElementById( "map2" ).innerHTML === "", "initially, there is nothing inside map2" );
+  ok( document.getElementById( "map2" ).innerHTML === "", "initially, there is nothing inside map2" );
   plus();
 
-  ok ( document.getElementById( "map3" ).innerHTML === "", "initially, there is nothing inside map3" );
+  ok( document.getElementById( "map3" ).innerHTML === "", "initially, there is nothing inside map3" );
   plus();
 
   popped.openmap({
@@ -70,32 +70,32 @@ test( "Popcorn OpenMap Plugin", function () {
     ok( OpenLayers, "OpenLayers is available" );
     plus();
 
-    ok ( document.getElementById( "openmapdiv1" ), "First map is on the page" );
+    ok( document.getElementById( "openmapdiv1" ), "First map is on the page" );
     plus();
 
-    equals ( document.getElementById( "openmapdiv1" ).offsetParent.id, "map", "First map is inside the 'map' div" );
+    equals( document.getElementById( "openmapdiv1" ).offsetParent.id, "map", "First map is inside the 'map' div" );
     plus();
 
-    ok ( document.getElementById( "openmapdiv2" ), "Second map is on the page" );
+    ok( document.getElementById( "openmapdiv2" ), "Second map is on the page" );
     plus();
 
-    equals ( document.getElementById( "openmapdiv2" ).offsetParent.id, "map2", "Second map is inside the 'map2' div" );
+    equals( document.getElementById( "openmapdiv2" ).offsetParent.id, "map2", "Second map is inside the 'map2' div" );
     plus();
 
-    ok ( document.getElementById( "openmapdiv3" ), "Third map is on the page" );
+    ok( document.getElementById( "openmapdiv3" ), "Third map is on the page" );
     plus();
 
-    equals ( document.getElementById( "openmapdiv3" ).offsetParent.id, "map3", "Third map is inside the 'map3' div" );
+    equals( document.getElementById( "openmapdiv3" ).offsetParent.id, "map3", "Third map is inside the 'map3' div" );
     plus();
 
-    ok ( document.getElementById( "openmapdiv4" ), "Fourth map is on the page" );
+    ok( document.getElementById( "openmapdiv4" ), "Fourth map is on the page" );
     plus();
-    equals ( document.getElementById( "openmapdiv4" ).offsetParent.id, "map4", "Fourth map is inside the 'map4' div" );
+    equals( document.getElementById( "openmapdiv4" ).offsetParent.id, "map4", "Fourth map is inside the 'map4' div" );
     plus();
 
   } )
   .exec( 5, function() {
-    ok ( document.getElementById( "openmapdiv2" ).style.display === "none" &&
+    ok( document.getElementById( "openmapdiv2" ).style.display === "none" &&
         document.getElementById( "openmapdiv3" ).style.display === "none" &&
         document.getElementById( "openmapdiv4" ).style.display === "none" &&
         document.getElementById( "openmapdiv1" ).style.display === "none", "All three maps are no longer visible" );
diff --git a/plugins/pause/popcorn.pause.html b/plugins/pause/popcorn.pause.html
index 018bba2a3..cd77accbb 100755
--- a/plugins/pause/popcorn.pause.html
+++ b/plugins/pause/popcorn.pause.html
@@ -8,7 +8,7 @@
   <script>
     var output;
 
-    document.addEventListener( "DOMContentLoaded", function () {
+    document.addEventListener( "DOMContentLoaded", function() {
       var p = Popcorn( "#video" , {
         pauseOnLinkClicked: true
       })
@@ -21,7 +21,7 @@ <h1 id="qunit-header">Popcorn Code Plugin Demo</h1>
   <p>The video pauses when links (anchor elements) are clicked</p>
   <div>
     <video id="video"
-      autobuffer = "autobuffer"
+      autobuffer="autobuffer"
       preload="auto"
       controls="controls"
       width="250px"
diff --git a/plugins/pause/popcorn.pause.unit.html b/plugins/pause/popcorn.pause.unit.html
index ec84b1ddd..683a643e8 100755
--- a/plugins/pause/popcorn.pause.unit.html
+++ b/plugins/pause/popcorn.pause.unit.html
@@ -27,7 +27,7 @@ <h2 id="qunit-userAgent"></h2>
     autobuffer="autobuffer"
     preload="auto"
     controls="controls"
-    width= "250px"
+    width="250px"
     poster="../../test/poster.png">
 
     <source id="mp4"
@@ -44,7 +44,7 @@ <h2 id="qunit-userAgent"></h2>
     autobuffer="autobuffer"
     preload="auto"
     controls="controls"
-    width= "250px"
+    width="250px"
     poster="../../test/poster.png">
 
     <source id="mp4"
diff --git a/plugins/pause/popcorn.pause.unit.js b/plugins/pause/popcorn.pause.unit.js
index 8a5997c9a..5af94ac01 100755
--- a/plugins/pause/popcorn.pause.unit.js
+++ b/plugins/pause/popcorn.pause.unit.js
@@ -1,4 +1,4 @@
-test( "Popcorn Pause Plugin", function () {
+test( "Popcorn Pause Plugin", function() {
 
   var expectedTests = 3 ,
       anchorA = document.getElementById( "anchorA" ),
@@ -7,7 +7,7 @@ test( "Popcorn Pause Plugin", function () {
 
   var simulateClickOn = function ( paramElement ) {
 
-    if ( typeof paramElement.click == "Function" ) {
+    if ( typeof paramElement.click === "Function" ) {
       paramElement.click() ;
       return ;
     }
@@ -25,12 +25,12 @@ test( "Popcorn Pause Plugin", function () {
 
   var otherVideo = Popcorn( "#video2" , {
         pauseOnLinkClicked: true
-      });
+  });
   otherVideo.play() ;
 
   var popped = Popcorn( "#video" , {
         pauseOnLinkClicked: true
-      });
+  });
 
   popped.code ({
     start: 2.000,
@@ -38,7 +38,7 @@ test( "Popcorn Pause Plugin", function () {
     onStart: function ( options ) {
       var currentTime = popped.currentTime() ;
       simulateClickOn( anchorA ) ;
-      ok (
+      ok(
         ( currentTime + tolerance >= 2 ) && ( currentTime - tolerance <= 2 ) ,
         "Video successfully stopped with a click on an anchor at " +
         "second 2 approximately (" + currentTime + ")"
@@ -53,10 +53,10 @@ test( "Popcorn Pause Plugin", function () {
     onStart: function ( options ) {
       var currentTime = popped.currentTime() ;
       simulateClickOn( anchorB ) ;
-      ok (
+      ok(
         ( currentTime + tolerance >= 5.561 ) && ( currentTime - tolerance <= 5.561 ) ,
-        'Video successfully stopped with a click on an anchor at ' +
-        'second 5.561 approximately (' + currentTime + ')'
+        "Video successfully stopped with a click on an anchor at " +
+        "second 5.561 approximately (" + currentTime + ")"
       );
     start() ;
     }
diff --git a/plugins/processing/popcorn.processing.html b/plugins/processing/popcorn.processing.html
index 41a32b76e..e625c9774 100644
--- a/plugins/processing/popcorn.processing.html
+++ b/plugins/processing/popcorn.processing.html
@@ -48,7 +48,7 @@ <h1 id="qunit-header">Popcorn processing Plug-in Simple Demo</h1>
   <div>
     <video id="video"
       controls preload="auto"
-      width= "250px"
+      width="250px"
       poster="../../test/poster.png">
 
       <source id="mp4"
diff --git a/plugins/processing/popcorn.processing.unit.html b/plugins/processing/popcorn.processing.unit.html
index 446d658c7..3d5aac456 100644
--- a/plugins/processing/popcorn.processing.unit.html
+++ b/plugins/processing/popcorn.processing.unit.html
@@ -19,7 +19,7 @@ <h2 id="qunit-userAgent"></h2>
   <div>
     <video id="video"
       controls preload="none"
-      width= "250px"
+      width="250px"
       poster="../../test/poster.png">
 
       <source id="mp4"
diff --git a/plugins/processing/popcorn.processing.unit.js b/plugins/processing/popcorn.processing.unit.js
index 881b74058..d4da15b14 100644
--- a/plugins/processing/popcorn.processing.unit.js
+++ b/plugins/processing/popcorn.processing.unit.js
@@ -101,7 +101,7 @@ test( "Processing plugin tests", function() {
     var idx = 5;
     while ( --idx ) {
       popped.removeTrackEvent( trackids.pop() );
-      ok ( !document.getElementById( "processing-div-" + ( idx ) ).children[ 0 ], "track event was removed" );
+      ok( !document.getElementById( "processing-div-" + ( idx ) ).children[ 0 ], "track event was removed" );
       plus();
     }
   });
@@ -140,7 +140,7 @@ test( "Processing plugin tests", function() {
   try {
     popped.processing({});
   } catch( e ) {
-    ok(true, 'empty event was caught by debug');
+    ok( true, "empty event was caught by debug" );
     plus();
   }
 
diff --git a/plugins/subtitle/popcorn.subtitle.html b/plugins/subtitle/popcorn.subtitle.html
index 811fcb49e..c6c956dd1 100755
--- a/plugins/subtitle/popcorn.subtitle.html
+++ b/plugins/subtitle/popcorn.subtitle.html
@@ -5,7 +5,7 @@
   <script src="../../popcorn.js"></script>
   <script src="popcorn.subtitle.js"></script>
   <script>
-    document.addEventListener( "DOMContentLoaded", function () {
+    document.addEventListener( "DOMContentLoaded", function() {
       var p = Popcorn( "#video" )
       .volume( 0 )
       .play()
diff --git a/plugins/subtitle/popcorn.subtitle.unit.html b/plugins/subtitle/popcorn.subtitle.unit.html
index 45daaf3aa..ba113b630 100755
--- a/plugins/subtitle/popcorn.subtitle.unit.html
+++ b/plugins/subtitle/popcorn.subtitle.unit.html
@@ -22,7 +22,7 @@ <h2 id="qunit-userAgent"></h2>
 
   <video id="video"
     controls preload="none"
-    width= "250px"
+    width="250px"
     poster="../../test/poster.png">
 
     <source id="mp4"
@@ -38,7 +38,7 @@ <h2 id="qunit-userAgent"></h2>
   </video>
   <video id="video2"
     controls preload="none"
-    width= "250px"
+    width="250px"
     poster="../../test/poster.png">
 
     <source id="mp4"
diff --git a/plugins/subtitle/popcorn.subtitle.unit.js b/plugins/subtitle/popcorn.subtitle.unit.js
index 2bdabb5ce..82a8b2906 100755
--- a/plugins/subtitle/popcorn.subtitle.unit.js
+++ b/plugins/subtitle/popcorn.subtitle.unit.js
@@ -1,4 +1,4 @@
-test( "Popcorn Subtitle Plugin", function () {
+test( "Popcorn Subtitle Plugin", function() {
 
   var popped = Popcorn( "#video" ),
       popped2 = Popcorn( "#video2" ),
@@ -19,7 +19,7 @@ test( "Popcorn Subtitle Plugin", function () {
 
   stop( 12000 );
 
-  ok ( "subtitle" in popped, "subtitle is a method of the popped instance" );
+  ok( "subtitle" in popped, "subtitle is a method of the popped instance" );
   plus();
 
   popped.subtitle({
@@ -98,7 +98,7 @@ test( "Popcorn Subtitle Plugin", function () {
     ok( Popcorn.position( subtitlediv ).top > popped.position().top, "subtitle top position moved" );
     plus();
 
-    equals ( subtitlediv.children[ 1 ].innerHTML, "this is the second subtitle of 2011", "subtitle displaying correct information" );
+    equals( subtitlediv.children[ 1 ].innerHTML, "this is the second subtitle of 2011", "subtitle displaying correct information" );
     plus();
 
     popped.media.play();
@@ -108,7 +108,7 @@ test( "Popcorn Subtitle Plugin", function () {
   popped.exec( 4, function() {
 
     popped.media.pause();
-    equals ( subtitlediv.children[ 1 ].innerHTML, "", "subtitle is clear" );
+    equals( subtitlediv.children[ 1 ].innerHTML, "", "subtitle is clear" );
     plus();
 
     popped.media.play();
@@ -123,16 +123,16 @@ test( "Popcorn Subtitle Plugin", function () {
   popped2.exec( 8, function() {
     popped2.media.pause();
 
-    equals ( subtitlediv.children[ 3 ].innerHTML, "instance one test", "subtitle displaying correct information" );
+    equals( subtitlediv.children[ 3 ].innerHTML, "instance one test", "subtitle displaying correct information" );
     plus();
-    equals ( subtitle2div.children[ 0 ].innerHTML, "instance two test", "subtitle displaying correct information" );
+    equals( subtitle2div.children[ 0 ].innerHTML, "instance two test", "subtitle displaying correct information" );
     plus();
 
     popped.media.play();
   });
 
   popped.exec( 10, function() {
-    ok ( document.getElementById( "subtitle-0" ).style.display === "none" &&
+    ok( document.getElementById( "subtitle-0" ).style.display === "none" &&
         document.getElementById( "subtitle-1" ).style.display === "none" &&
         document.getElementById( "subtitle-2" ).style.display === "none", "All subtitles are no longer visible" );
     plus();
diff --git a/plugins/tagthisperson/popcorn.tagthisperson.html b/plugins/tagthisperson/popcorn.tagthisperson.html
index c07bccb29..06eeeb1d9 100755
--- a/plugins/tagthisperson/popcorn.tagthisperson.html
+++ b/plugins/tagthisperson/popcorn.tagthisperson.html
@@ -6,7 +6,7 @@
   <script src="../../popcorn.js"></script>
   <script src="popcorn.tagthisperson.js"></script>
   <script>
-    document.addEventListener( "DOMContentLoaded", function () {
+    document.addEventListener( "DOMContentLoaded", function() {
       var p = Popcorn( "#video" )
       .play() 
       .volume( 0 )
@@ -43,7 +43,7 @@ <h1 id="qunit-header">Popcorn tagthisperson Plug-in Demo</h1>
   <div>
     <video id="video"
       controls preload="none"
-      width= "250px"
+      width="250px"
       poster="../../test/poster.png">
 
       <source id="mp4"
diff --git a/plugins/tagthisperson/popcorn.tagthisperson.unit.js b/plugins/tagthisperson/popcorn.tagthisperson.unit.js
index da2f20701..bd1a1b390 100755
--- a/plugins/tagthisperson/popcorn.tagthisperson.unit.js
+++ b/plugins/tagthisperson/popcorn.tagthisperson.unit.js
@@ -1,4 +1,4 @@
-test( "Popcorn tagthisperson Plugin", function () {
+test( "Popcorn tagthisperson Plugin", function() {
 
   var popped = Popcorn( "#video" ),
       expects = 8,
diff --git a/plugins/timeline/popcorn.timeline.html b/plugins/timeline/popcorn.timeline.html
index 08b7934fb..de62239a4 100644
--- a/plugins/timeline/popcorn.timeline.html
+++ b/plugins/timeline/popcorn.timeline.html
@@ -69,7 +69,7 @@ <h1 id="qunit-header">Popcorn Timeline Plug-in Demo</h1>
   <div>
     <video id="video"
       controls
-      width= "250px"
+      width="250px"
       poster="../../test/poster.png">
 
       <source id="mp4"
diff --git a/plugins/timeline/popcorn.timeline.unit.html b/plugins/timeline/popcorn.timeline.unit.html
index 902c6b56c..fefbe6258 100644
--- a/plugins/timeline/popcorn.timeline.unit.html
+++ b/plugins/timeline/popcorn.timeline.unit.html
@@ -24,7 +24,7 @@ <h2 id="qunit-userAgent"></h2>
 
   <video id="video"
     controls preload="none"
-    width= "250px"
+    width="250px"
     poster="../../test/poster.png"
     style="float: left;">
 
diff --git a/plugins/timeline/popcorn.timeline.unit.js b/plugins/timeline/popcorn.timeline.unit.js
index a4c76183b..ec054680b 100644
--- a/plugins/timeline/popcorn.timeline.unit.js
+++ b/plugins/timeline/popcorn.timeline.unit.js
@@ -1,4 +1,4 @@
-test( "Popcorn Timeline Plugin", function () {
+test( "Popcorn Timeline Plugin", function() {
 
   var popped = Popcorn( "#video" ),
       expects = 17,
@@ -17,11 +17,11 @@ test( "Popcorn Timeline Plugin", function () {
 
   stop();
 
-    ok ( "timeline" in popped, "timeline is a method of the popped instance" );
+    ok( "timeline" in popped, "timeline is a method of the popped instance" );
     plus();
-    equals ( document.getElementById( "timeline-up" ).firstChild, undefined, "initially, there is nothing inside the 'timeline-up' feed" );
+    equals( document.getElementById( "timeline-up" ).firstChild, undefined, "initially, there is nothing inside the 'timeline-up' feed" );
     plus();
-    equals ( document.getElementById( "timeline-down" ).firstChild, undefined, "initially, there is nothing inside the 'timeline-down' feed" );
+    equals( document.getElementById( "timeline-down" ).firstChild, undefined, "initially, there is nothing inside the 'timeline-down' feed" );
     plus();
 
     popped.timeline({
@@ -66,15 +66,15 @@ test( "Popcorn Timeline Plugin", function () {
 
   popped.exec( 1.5, function() {
     //up
-    ok ( document.getElementById( "timelineDiv1" ), "First timeline is on the page" );
+    ok( document.getElementById( "timelineDiv1" ), "First timeline is on the page" );
     plus();
-    equals ( document.getElementById("timelineDiv1" ).parentNode.parentNode.id, "timeline-up", "First timeline is inside the 'timeline-up' div" );
+    equals( document.getElementById("timelineDiv1" ).parentNode.parentNode.id, "timeline-up", "First timeline is inside the 'timeline-up' div" );
     plus();
 
     //down
-    ok ( document.getElementById( "timelineDiv3" ), "First timeline is on the page" );
+    ok( document.getElementById( "timelineDiv3" ), "First timeline is on the page" );
     plus();
-    equals ( document.getElementById("timelineDiv3" ).parentNode.parentNode.id, "timeline-down", "First Timeline is inside the 'timeline-down' div" );
+    equals( document.getElementById("timelineDiv3" ).parentNode.parentNode.id, "timeline-down", "First Timeline is inside the 'timeline-down' div" );
     plus();
 
   });
@@ -82,28 +82,28 @@ test( "Popcorn Timeline Plugin", function () {
    //up
     var timelinediv2 = document.getElementById( "timelineDiv2" ),
         timelinediv4 = document.getElementById( "timelineDiv4" );
-    ok ( timelinediv2, "Second timeline is on the page" );
+    ok( timelinediv2, "Second timeline is on the page" );
     plus();
-    equals ( timelinediv2 && timelinediv2.parentNode.parentNode.id, "timeline-up", "Second timelineDiv2 is inside the 'timeline-up' div" );
+    equals( timelinediv2 && timelinediv2.parentNode.parentNode.id, "timeline-up", "Second timelineDiv2 is inside the 'timeline-up' div" );
     plus();
-    equals ( timelineUp.firstChild.firstChild.id,  "timelineDiv2", "'timelineDiv2' is the first child in 'timeline-up'" );
+    equals( timelineUp.firstChild.firstChild.id,  "timelineDiv2", "'timelineDiv2' is the first child in 'timeline-up'" );
     plus();
 
     //down
 
-    ok ( timelinediv4, "Second down timeline is on the page" );
+    ok( timelinediv4, "Second down timeline is on the page" );
     plus();
-    equals ( timelinediv4.parentNode.parentNode.id, "timeline-down", "timelineDiv4 is inside the 'timeline-down' div" );
+    equals( timelinediv4.parentNode.parentNode.id, "timeline-down", "timelineDiv4 is inside the 'timeline-down' div" );
     plus();
-    equals ( timelineDown.firstChild.firstChild.id, "timelineDiv3", "'timelineDiv3' is the first child in 'timeline-down'" );
+    equals( timelineDown.firstChild.firstChild.id, "timelineDiv3", "'timelineDiv3' is the first child in 'timeline-down'" );
     plus();
   });
   popped.exec( 4, function() {
-    ok ( document.getElementById( "timelineDiv1" ).style.display !== "none" &&
+    ok( document.getElementById( "timelineDiv1" ).style.display !== "none" &&
         document.getElementById( "timelineDiv2" ).style.display !== "none", "Both timelines in 'timeline-up are not visible" );
 	  plus();
 
-	  ok ( document.getElementById( "timelineDiv3" ).style.display !== "none" &&
+	  ok( document.getElementById( "timelineDiv3" ).style.display !== "none" &&
         document.getElementById( "timelineDiv4" ).style.display !== "none", "Both timelines in 'timeline-down' are not visible" );
 	  plus();
 
diff --git a/plugins/twitter/popcorn.twitter.html b/plugins/twitter/popcorn.twitter.html
index d189505a4..9c70f3ebc 100755
--- a/plugins/twitter/popcorn.twitter.html
+++ b/plugins/twitter/popcorn.twitter.html
@@ -5,7 +5,7 @@
   <script src="../../popcorn.js"></script>
   <script src="popcorn.twitter.js"></script>
   <script>
-    document.addEventListener( "DOMContentLoaded", function () {
+    document.addEventListener( "DOMContentLoaded", function() {
       var p = Popcorn( "#video" )
       .twitter({
         start: 5,
@@ -32,7 +32,7 @@ <h1 id="qunit-header">Popcorn Twitter Plug-in Demo</h1>
   <div>
     <video id="video"
       controls
-      width= "250px"
+      width="250px"
       poster="../../test/poster.png">
 
       <source id="mp4"
diff --git a/plugins/twitter/popcorn.twitter.js b/plugins/twitter/popcorn.twitter.js
index 885b3a32f..661448067 100755
--- a/plugins/twitter/popcorn.twitter.js
+++ b/plugins/twitter/popcorn.twitter.js
@@ -34,7 +34,7 @@
   Popcorn.plugin( "twitter" , {
 
       manifest: {
-        about:{
+        about: {
           name: "Popcorn Twitter Plugin",
           version: "0.1",
           author: "Scott Downe",
@@ -82,7 +82,7 @@
         // setup widget div that is unique per track
         options.container = document.createElement( "div" );
         // use this id to connect it to the widget
-        options.container.setAttribute( "id", Popcorn.guid());
+        options.container.setAttribute( "id", Popcorn.guid() );
         // display none by default
         options.container.style.display = "none";
 
diff --git a/plugins/twitter/popcorn.twitter.unit.html b/plugins/twitter/popcorn.twitter.unit.html
index 394085f38..2f9f49dca 100755
--- a/plugins/twitter/popcorn.twitter.unit.html
+++ b/plugins/twitter/popcorn.twitter.unit.html
@@ -24,7 +24,7 @@ <h2 id="qunit-userAgent"></h2>
 
   <video id="video"
     controls
-    width= "250px"
+    width="250px"
     poster="../../test/poster.png">
 
     <source id="mp4"
diff --git a/plugins/twitter/popcorn.twitter.unit.js b/plugins/twitter/popcorn.twitter.unit.js
index b2571a65c..90d27f222 100755
--- a/plugins/twitter/popcorn.twitter.unit.js
+++ b/plugins/twitter/popcorn.twitter.unit.js
@@ -1,4 +1,4 @@
-test( "Popcorn Twitter Plugin", function () {
+test( "Popcorn Twitter Plugin", function() {
 
   var popped = Popcorn( "#video" ),
       expects = 7,
diff --git a/plugins/webpage/popcorn.webpage.html b/plugins/webpage/popcorn.webpage.html
index 272a0efdf..cc932c8cd 100644
--- a/plugins/webpage/popcorn.webpage.html
+++ b/plugins/webpage/popcorn.webpage.html
@@ -6,7 +6,7 @@
   <script src="../../popcorn.js"></script>
   <script src="popcorn.webpage.js"></script>
   <script>
-    document.addEventListener( "DOMContentLoaded", function () {
+    document.addEventListener( "DOMContentLoaded", function() {
       var p = Popcorn( "#video" )
       .volume( 0 )
       .play()
@@ -36,7 +36,7 @@ <h1 id="qunit-header">Popcorn WebPage Plug-in Demo</h1>
   <div>
     <video id="video"
       controls preload="none"
-      width= "250px"
+      width="250px"
       poster="../../test/poster.png">
 
       <source id="mp4"
diff --git a/plugins/webpage/popcorn.webpage.js b/plugins/webpage/popcorn.webpage.js
index 33b95b5ea..62049821f 100755
--- a/plugins/webpage/popcorn.webpage.js
+++ b/plugins/webpage/popcorn.webpage.js
@@ -58,7 +58,7 @@
         target: "iframe-container"
       }
     },
-    _setup : function( options ) {
+    _setup: function( options ) {
 
       var target = document.getElementById( options.target );
 
diff --git a/plugins/webpage/popcorn.webpage.unit.html b/plugins/webpage/popcorn.webpage.unit.html
index c5149d459..5901156fa 100755
--- a/plugins/webpage/popcorn.webpage.unit.html
+++ b/plugins/webpage/popcorn.webpage.unit.html
@@ -24,7 +24,7 @@ <h2 id="qunit-userAgent"></h2>
 
   <video id="video"
     controls preload="none"
-    width= "250px"
+    width="250px"
     poster="../../test/poster.png">
 
     <source id="mp4"
diff --git a/plugins/webpage/popcorn.webpage.unit.js b/plugins/webpage/popcorn.webpage.unit.js
index 803e6a1ad..7491bbf5c 100755
--- a/plugins/webpage/popcorn.webpage.unit.js
+++ b/plugins/webpage/popcorn.webpage.unit.js
@@ -61,7 +61,7 @@ test( "Popcorn Webpage Plugin", function() {
   });
 
   popped.exec( 2, function() {
-    ok (theiFrame[ 0 ].style.display === "none" && theiFrame[ 1 ].style.display === "none", "both iframes are hidden" );
+    ok( theiFrame[ 0 ].style.display === "none" && theiFrame[ 1 ].style.display === "none", "both iframes are hidden" );
     plus();
 
     popped.pause().removeTrackEvent( setupId );
diff --git a/plugins/wikipedia/popcorn.wikipedia.html b/plugins/wikipedia/popcorn.wikipedia.html
index dab08b636..8ca85b793 100755
--- a/plugins/wikipedia/popcorn.wikipedia.html
+++ b/plugins/wikipedia/popcorn.wikipedia.html
@@ -6,8 +6,8 @@
   <script src="../../popcorn.js"></script>
   <script src="popcorn.wikipedia.js"></script>
   <script>
-    document.addEventListener( "DOMContentLoaded", function () {
-      var p = Popcorn( "#video' )
+    document.addEventListener( "DOMContentLoaded", function() {
+      var p = Popcorn( "#video" )
       .volume( 0 )
       .play() 
       .wikipedia({
@@ -34,7 +34,7 @@ <h1 id="qunit-header">Popcorn Wikipedia Plug-in Demo</h1>
   <div>
     <video id="video" 
       controls 
-      width= "250px"
+      width="250px"
       poster="../../test/poster.png"> 
 
       <source id="mp4"
diff --git a/plugins/wikipedia/popcorn.wikipedia.unit.js b/plugins/wikipedia/popcorn.wikipedia.unit.js
index 6cc1680c1..62e501050 100755
--- a/plugins/wikipedia/popcorn.wikipedia.unit.js
+++ b/plugins/wikipedia/popcorn.wikipedia.unit.js
@@ -1,4 +1,4 @@
-test( "Popcorn wikipedia Plugin", function () {
+test( "Popcorn wikipedia Plugin", function() {
   
   var popped = Popcorn( "#video" ),
       expects = 13, 
@@ -15,10 +15,10 @@ test( "Popcorn wikipedia Plugin", function () {
   
   stop();
    
-  ok ( "wikipedia" in popped, "wikipedia is a mehtod of the popped instance" );
+  ok( "wikipedia" in popped, "wikipedia is a mehtod of the popped instance" );
   plus();
   
-  equals ( theArticle.innerHTML, "", "initially, there is nothing in the wikidiv" );
+  equals( theArticle.innerHTML, "", "initially, there is nothing in the wikidiv" );
   plus();
   
   popped.wikipedia({
diff --git a/plugins/wordriver/popcorn.wordriver.html b/plugins/wordriver/popcorn.wordriver.html
index 3aa709c3a..96e944913 100755
--- a/plugins/wordriver/popcorn.wordriver.html
+++ b/plugins/wordriver/popcorn.wordriver.html
@@ -5,7 +5,7 @@
   <script src="../../popcorn.js"></script>
   <script src="popcorn.wordriver.js"></script>
   <script>
-    document.addEventListener( "DOMContentLoaded", function () {
+    document.addEventListener( "DOMContentLoaded", function() {
       var p = Popcorn( "#video" )
       .volume( 0 )
       .play()
diff --git a/plugins/wordriver/popcorn.wordriver.js b/plugins/wordriver/popcorn.wordriver.js
index a217c4c19..dad03661a 100755
--- a/plugins/wordriver/popcorn.wordriver.js
+++ b/plugins/wordriver/popcorn.wordriver.js
@@ -79,7 +79,7 @@
             type: "text",
             label: "Out"
           },
-          target:  "wordriver-container",
+          target: "wordriver-container",
           text: {
             elem: "input",
             type: "text",
diff --git a/plugins/wordriver/popcorn.wordriver.unit.html b/plugins/wordriver/popcorn.wordriver.unit.html
index cc78d2cbb..1d35b4421 100755
--- a/plugins/wordriver/popcorn.wordriver.unit.html
+++ b/plugins/wordriver/popcorn.wordriver.unit.html
@@ -22,7 +22,7 @@ <h2 id="qunit-userAgent"></h2>
 
   <video id="video"
     controls preload="none"
-    width= "250px"
+    width="250px"
     poster="../../test/poster.png">
 
     <source id="mp4"
diff --git a/plugins/wordriver/popcorn.wordriver.unit.js b/plugins/wordriver/popcorn.wordriver.unit.js
index 281c9ccad..9628c056d 100755
--- a/plugins/wordriver/popcorn.wordriver.unit.js
+++ b/plugins/wordriver/popcorn.wordriver.unit.js
@@ -1,4 +1,4 @@
-test( "Popcorn wordriver Plugin", function () {
+test( "Popcorn wordriver Plugin", function() {
 
   var popped = Popcorn( "#video" ),
       expects = 17,
@@ -17,10 +17,10 @@ test( "Popcorn wordriver Plugin", function () {
 
   stop();
 
-  ok ( "wordriver" in popped, "wordriver is a method of the popped instance" );
+  ok( "wordriver" in popped, "wordriver is a method of the popped instance" );
   plus();
 
-  equals ( wordriverdiv.childElementCount, 0, "initially, there is nothing inside the wordriverdiv" );
+  equals( wordriverdiv.childElementCount, 0, "initially, there is nothing inside the wordriverdiv" );
   plus();
 
   popped.wordriver({

From 00faeda0f5a6b3b9bb6d1b7cf0a34ab34f949fdb Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Tue, 13 Sep 2011 15:42:13 -0400
Subject: [PATCH 041/140] Removed broken demo

---
 demos/popcorn/index.html   |  86 ---------------------------------
 demos/popcorn/style.css    |  95 -------------------------------------
 demos/popcorn/team.jpg     | Bin 23087 -> 0 bytes
 demos/popcorn/xml/data.xml |  76 -----------------------------
 4 files changed, 257 deletions(-)
 delete mode 100755 demos/popcorn/index.html
 delete mode 100755 demos/popcorn/style.css
 delete mode 100644 demos/popcorn/team.jpg
 delete mode 100755 demos/popcorn/xml/data.xml

diff --git a/demos/popcorn/index.html b/demos/popcorn/index.html
deleted file mode 100755
index 9928985a8..000000000
--- a/demos/popcorn/index.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <script src="../../popcorn.js"></script>
-  <link href="style.css" rel="stylesheet" type="text/css" />
-  
-  <!-- This is needed for google maps api -->
-  <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
-  <!-- These two are needed for google news api -->
-  <script src="http://google.com/jsapi"></script>
-  <script>google.load("elements", "1", {packages : ["newsshow"]});</script>
-  <!-- This is needed for language translation -->
-  <script>google.load("language", "1");</script>
-</head>
-<body>
-  <!-- Start Contents -->
-  <div id="contents">
-    <!-- Start Left Contents -->
-    <div class="left-content">
-      <!-- Start Video Div -->
-      <br />
-      <div id="videoContainer" class="video-div">
-        <video src="http://scotland.proximity.on.ca/sdowne/popcornIntroDemo/demo.ogg" data-timeline-sources="xml/data.xml" style="-moz-transform: scaleX(1.2); height:300px;" controls></video>
-      <div id="translateinfo"style="z-index:2;position:absolute;color:white;textShadow:black 2px 2px 6px;font-size:18px;font-family:arial;max-width:480px;font-weight:bold;top: 230px;left:-20px"></div>
-      <div id="translateinfofrench" style="z-index:2;position:absolute;color:white;textShadow:black 2px 2px 6px;font-style:italic;font-family:arial;max-width:480px;font-size:18px;font-weight:bold;top:260px;left:-20px"></div>
-      </div>
-      
-      <div class="video-info" style="display:none">
-        <!-- Start Choose Language -->
-        <div class="choose-language">
-          <h2>Choose your language</h2>
-          <select id="language">
-              <option value="zh">Chinese</option>
-              <option value="fr" selected="selected">French</option>
-              <option value="de">German</option>
-              <option value="it">Italian</option>
-              <option value="ja">Japanese</option>
-              <option value="ko">Korean</option>
-              <option value="fa">Persian</option>
-              <option value="pl">Polish</option>
-              <option value="pt">Portuguese</option>
-              <option value="es">Spanish</option>
-          </select>
-          <span id="credit">
-              with help from
-              <a href="http://google.com/translate">Google Translate</a> and <a href="http://jquery.com">
-              jQuery</a>
-          </span>
-        </div>
-        <!-- End Choose Language -->
-      </div>
-      <!-- End Video Info -->
-      <div id="attribinfo" style="display:none;background:white;width:409px;height:100px;text-align:left;padding-left:4px;"></div>  
-      </div><br />
-      
-    </div><!-- End Video Div -->
-    <div class="right-content">
-      <h1>Google Maps</h1>
-      <div id="mapinfo" style="width:400px;height:250px" ></div>     
-  
-      <div id="imageinfo" style="display:none;top:330px;width:400px;text-align:left;"> <!--needed for imageCommand -->
-        <h1>Popcorn-js Team</h1>
-      </div>
-  
-      <div id="wikiinfo" style="display:none;top:330px;background:black;color:white;width:400px;height:220px;text-align:left;padding-left:4px;position:absolute;">
-     <h1>Wikipedia</h1><br>
-      </div>
-      <div id="flickrinfo" style="display:none;top:330px;color:white;background:black;width:400px;height:220px;text-align:left;position:absolute">
-        <h1>Flickr</h1>
-      </div>
-      <div id="twitterinfo" style="display:none;top:330px;color:white;background:white;width:400px;height:100px;text-align:left;align:left">
-      <br />
-      </div>
-      
-    </div>
-    <br />
-    <div class="full-content">
-    
-       <div id="iframeinfo"></div>
-       <div id="iframeinfo"></div>
- 
-    </div>
-  </div>
-  </body>
-</html>
-
diff --git a/demos/popcorn/style.css b/demos/popcorn/style.css
deleted file mode 100755
index d79182726..000000000
--- a/demos/popcorn/style.css
+++ /dev/null
@@ -1,95 +0,0 @@
-html, body{
-height: 100%;
-}
-
-body {
-	line-height: 1;
-	font-family: Helvetica, Arial, "Lucida Grande";
-	font-size: 15px;
-}
-a{
-  text-decoration: none;
-  color: #cc433d;
-}
-
-a:hover{
-  color: #f27c77;
-}
-/* Layout */
-
-body{
-  background-color: #000000;
-}
-
-.left-content{
-  width:520px;
-  float: left;
-  padding-left:20px
-}
-.right-content{
-  float: left;
-  width:400px;
-  padding-left:0px;
-  padding-top: 0px;
-}
-.full-content{
-  width:960px;
-  padding-left:20px;
-}
-.video-div{
-  position:relative;
-  border-style: "groove";
-  margin-bottom: 20px;
-  margin-right: 20px;
-  margin-left: 45px;
-  clear: both;
-  font-size: 15px !important;
-}
-
-h1{
-  border: 1px solid #9f9f9f;
-  background-color:#1c749d;
-  -moz-border-radius:8px;
-  border-radius:8px;
-  -webkit-border-radius:8px;
-  background-image: -moz-linear-gradient(top, #3d96c0, #1a729b);/* Firefox 3.6 */
-  background-image: -webkit-gradient(linear,left bottom,left top,color-stop(0, #1a729b),color-stop(1, #3d96c0));/* Safari & Chrome */
-  padding: 5px 20px 6px 12px;
-  min-width:365px;
-  font-size:15px;
-  color: #FFF;
-  font-weight: normal;
-  display: inline-block;
-  border-bottom-color: #1c749d;
-  /*box-shadow:inset 0 0 1px #FFF;
-  -moz-box-shadow:inset 0 1px 0 #6fb9db;*/
-}
-.choose-language h2, .choose-language div{
-color: #FFF;
-opacity:.8;
-}
-
-.choose-language h2{
-font-size: 12px;
-padding-bottom: 3px;
-}
-
-.choose-language a{
-font-weight: bold;
-color: #FFF;
-text-decoration: underline;
-}
-
-.choose-language a:hover{
-opacity:1;
-}
-
-#credit{
-padding: 5px 0;
-font-size: 10px;
-color: #FFF;
-}
-.choose-language select,.choose-language span, .choose-language select *{
-color: #000;
-font-size: 12px;
-}
\ No newline at end of file
diff --git a/demos/popcorn/team.jpg b/demos/popcorn/team.jpg
deleted file mode 100644
index f80a2ea3599abeeec8cbc6caa2f0fe6ea6cbbf70..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 23087
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

diff --git a/demos/popcorn/xml/data.xml b/demos/popcorn/xml/data.xml
deleted file mode 100755
index c23ccaf33..000000000
--- a/demos/popcorn/xml/data.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<popcorn>
-	<timeline>
-    <subtitles language="en" target="translateinfo">
-		  <subtitle in="00:00:00:00" out="00:00:02:00">I am one of the lead developers of </subtitle>
-		  <subtitle in="00:00:02:00" out="00:00:05:00">popcorn a JavaScript library that adds </subtitle>
-		  <subtitle in="00:00:05:00" out="00:00:07:00">timeline based data to any video.</subtitle>
-		  <subtitle in="00:00:08:00" out="00:00:09:00">I am going to show you what popcorn</subtitle>
-		  <subtitle in="00:00:09:00" out="00:00:12:00">can do. Right now all you see is me</subtitle>
-		  <subtitle in="00:00:12:00" out="00:00:14:00">talking on the screen you can’t really</subtitle>
-		  <subtitle in="00:00:14:00" out="00:00:17:00">do anything but watch. Let’s make this </subtitle>
-		  <subtitle in="00:00:17:00" out="00:00:19:00">video more exciting. Let me add </subtitle>
-		  <subtitle in="00:00:19:00" out="00:00:22:00">some French subtitles. Popcorn uses</subtitle>
-		  <subtitle in="00:00:22:00" out="00:00:24:00">Google Translate to translate subtitles</subtitle>
-		  <subtitle in="00:00:24:00" out="00:00:27:00">to any language. You might be curious</subtitle>
-		  <subtitle in="00:00:27:00" out="00:00:29:00">to know that this video was filmed in</subtitle>
-		  <subtitle in="00:00:29:00" out="00:00:32:00">Toronto, Ontario. If you don’t know </subtitle>
-		  <subtitle in="00:00:32:00" out="00:00:34:00">exactly where that is feel free to </subtitle>
-		  <subtitle in="00:00:34:00" out="00:00:36:00">pause this video and investigate the</subtitle>
-		  <subtitle in="00:00:36:00" out="00:00:39:00">map. Popcorn was built by five people,</subtitle>
-      <subtitle in="00:00:39:00" out="00:00:42:00">there they are. We collaborated with </subtitle>
-      <subtitle in="00:00:42:00" out="00:00:44:00">filmmakers and artists to ensure that</subtitle>
-      <subtitle in="00:00:44:00" out="00:00:47:00">popcorn is easy to use. Let me show</subtitle>
-      <subtitle in="00:00:47:00" out="00:00:49:00">you some other cool features. Keep in</subtitle>
-      <subtitle in="00:00:49:00" out="00:00:51:00">mind that you can have any feature </subtitle>
-      <subtitle in="00:00:51:00" out="00:00:54:00">appear and disappear at any time</subtitle>
-      <subtitle in="00:00:54:00" out="56.5">during the video. Popcorn makes it </subtitle>
-      <subtitle in="56.5" out="00:00:59:00">possible to pull data from twitter.</subtitle>
-      <subtitle in="00:00:59:00" out="00:01:01:00">Let’s see what people are saying </subtitle>
-      <subtitle in="00:01:01:00" out="00:01:02:00">about popcorn right now.</subtitle>
-      <subtitle in="00:01:03:00" out="00:01:04:00">You can also showcase your work </subtitle>
-      <subtitle in="00:01:04:00" out="00:01:07:00">by pulling data from a flicker account.</subtitle>
-      <subtitle in="00:01:07:00" out="00:01:09:00">Here are some pictures I posted.</subtitle>
-      <subtitle in="00:01:09:00" out="00:01:10:00">If you are not quite sure what</subtitle>
-      <subtitle in="00:01:10:00" out="00:01:12:00">Flicker is take a second to read</subtitle>
-      <subtitle in="00:01:12:00" out="00:01:15:00">about it on Wikipedia. To try</subtitle>
-      <subtitle in="00:01:15:00" out="00:01:17:00">out popcorn visit our homepage,</subtitle>
-      <subtitle in="00:01:17:00" >it is displayed just below me. </subtitle>
-	  
-    </subtitles>
-    <subtitles language="en" target="translateinfofrench" languagesrc="language">
-		  <subtitle in="00:00:19:00" out="00:00:22:00">some French subtitles. Popcorn uses</subtitle>
-		  <subtitle in="00:00:22:00" out="00:00:24:00">Google Translate to translate subtitles</subtitle>
-		  <subtitle in="00:00:24:00" out="00:00:27:00">to any language. You might be curious</subtitle>
-		  <subtitle in="00:00:27:00" out="00:00:29:00">to know that this video was filmed in</subtitle>
-		  <subtitle in="00:00:29:00" out="00:00:32:00">Toronto, Ontario. If you don’t know </subtitle>
-		  <subtitle in="00:00:32:00" out="00:00:34:00">exactly where that is feel free to </subtitle>
-		  <subtitle in="00:00:34:00" out="00:00:36:00">pause this video and investigate the</subtitle>
-		  <subtitle in="00:00:36:00" out="00:00:39:00">map. Popcorn was built by five people,</subtitle>
-      <subtitle in="00:00:39:00" out="00:00:42:00">there they are. We collaborated with </subtitle>
-      <subtitle in="00:00:42:00" out="00:00:44:00">filmmakers and artists to ensure that</subtitle>
-      <subtitle in="00:00:44:00" out="00:00:47:00">popcorn is easy to use. Let me show</subtitle>
-      <subtitle in="00:00:47:00" out="00:00:49:00">you some other cool features. Keep in</subtitle>
-      <subtitle in="00:00:49:00" out="00:00:51:00">mind that you can have any feature </subtitle>
-      <subtitle in="00:00:51:00" out="00:00:54:00">appear and disappear at any time</subtitle>
-      <subtitle in="00:00:54:00" out="56.5">during the video. Popcorn makes it </subtitle>
-      <subtitle in="56.5" out="00:00:59:00">possible to pull data from twitter.</subtitle>
-      <subtitle in="00:00:59:00" out="00:01:01:00">Let’s see what people are saying </subtitle>
-      <subtitle in="00:01:01:00" out="00:01:02:00">about popcorn right now.</subtitle>
-      <subtitle in="00:01:03:00" out="00:01:04:00">You can also showcase your work </subtitle>
-      <subtitle in="00:01:04:00" out="00:01:07:00">by pulling data from a flicker account.</subtitle>
-      <subtitle in="00:01:07:00" out="00:01:09:00">Here are some pictures I posted.</subtitle>
-      <subtitle in="00:01:09:00" out="00:01:10:00">If you are not quite sure what</subtitle>
-      <subtitle in="00:01:10:00" out="00:01:12:00">Flicker is take a second to read</subtitle>
-      <subtitle in="00:01:12:00" out="00:01:15:00">about it on Wikipedia. To try</subtitle>
-      <subtitle in="00:01:15:00" out="00:01:17:00">out popcorn visit our homepage,</subtitle>
-      <subtitle in="00:01:17:00" >it is displayed just below me. </subtitle>
-    </subtitles>
-    <location in="00:00:29:00"  long="-79.403323" lat="43.665429" target="mapinfo" zoom="16"/>
-    <wiki in="00:01:12:00" out="00:01:15:00" src="http://en.wikipedia.org/wiki/Metadata" description="Metadata" numberOfWords="250" lang="en" target="wikiinfo"/>
-    <flickr in="00:01:06:00" out="00:01:10:00" target="flickrinfo" userid="54210095@N08" numberofimages="3" height="80" width="115" padding="8px"/>
-    <twitter in="00:00:59:00" out="00:01:05:00" title="&lt;b&gt;popcorn-js&lt;/b&gt;" source="popcorn-js" target="twitterinfo" width="400" height="120"/>
-    <image in="00:00:40:00" out="00:00:50:00" src="team.jpg" width="400"  target="imageinfo"/>
-    <webpage in="00:01:15:00" target="iframeinfo" width="920" height="200" src="http://webmademovies.org" description="WebMadeMovies"></webpage>
-    
-	</timeline>
-</popcorn>

From 156c8d9ffa47756a2895c51e196a35eb2a2262fb Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Tue, 13 Sep 2011 16:45:59 -0400
Subject: [PATCH 042/140] [#718] Removes script from head when script load is
 complete

---
 popcorn.js | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index 8ce92f606..d653cfb07 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1637,27 +1637,21 @@
 
     }
 
-    script.onload = script.onreadystatechange = function() {
+    script.onload = function() {
 
-      if ( !script.readyState || /loaded|complete/.test( script.readyState ) ) {
-
-        //  Handling remote script loading callbacks
-        if ( isScript ) {
-
-          //  getScript
-          success && success();
-        }
-
-        //  Executing for JSONP requests
-        if ( isFired ) {
-
-          //  Garbage collect the callback
-          delete window[ callback ];
+      //  Handling remote script loading callbacks
+      if ( isScript ) {
+        //  getScript
+        success && success();
+      }
 
-          //  Garbage collect the script resource
-          head.removeChild( script );
-        }
+      //  Executing for JSONP requests
+      if ( isFired ) {
+        //  Garbage collect the callback
+        delete window[ callback ];
       }
+      //  Garbage collect the script resource
+      head.removeChild( script );
     };
 
     script.src = url;
@@ -1794,7 +1788,7 @@
       }
     }
   };
-  
+
   // alias for exec function
   Popcorn.p.cue = Popcorn.p.exec;
 

From 9c5a35ba12a8e2673486b94b01f22a6bc36c6af6 Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Tue, 13 Sep 2011 16:58:42 -0400
Subject: [PATCH 043/140] [#718] Do not attempt to reuse remote scripts.
 Includes tests

---
 popcorn.js           | 20 +-------------------
 test/popcorn.unit.js | 40 ++++++++++++----------------------------
 2 files changed, 13 insertions(+), 47 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index d653cfb07..e2c7320a7 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1579,21 +1579,6 @@
 
   Popcorn.xhr.getJSONP = function( url, success, isScript ) {
 
-    //  If this is a script request, ensure that we do not call something that has already been loaded
-    if ( isScript ) {
-
-      var scripts = document.querySelectorAll( "script[src=\"" + url + "\"]" );
-
-      //  If there are scripts with this url loaded, early return
-      if ( scripts.length ) {
-
-        //  Execute success callback and pass "exists" flag
-        success && success( true );
-
-        return;
-      }
-    }
-
     var head = document.head || document.getElementsByTagName( "head" )[ 0 ] || document.documentElement,
       script = document.createElement( "script" ),
       paramStr = url.split( "?" )[ 1 ],
@@ -1619,22 +1604,19 @@
 
       //  If a callback name already exists
       if ( !!window[ callback ] ) {
-
         //  Create a new unique callback name
         callback = Popcorn.guid( callback );
       }
 
       //  Define the JSONP success callback globally
       window[ callback ] = function( data ) {
-
+        // Fire success callbacks
         success && success( data );
         isFired = true;
-
       };
 
       //  Replace callback param and callback name
       url = url.replace( parts.join( "=" ), parts[ 0 ] + "=" + callback );
-
     }
 
     script.onload = function() {
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 60a3ed969..01d741aae 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -544,7 +544,7 @@ test("exec", function() {
 
 test( "cue (alias of exec)", function() {
   expect( 3 );
-  ok( Popcorn.p.cue, "Popcorn.p.cue exists" );	
+  ok( Popcorn.p.cue, "Popcorn.p.cue exists" );
   equal( typeof Popcorn.p.cue, "function", "Popcorn.p.cue is a function" );
   deepEqual( Popcorn.p.cue, Popcorn.p.exec, "Popcorn.p.cue equals Popcorn.p.exec" );
 });
@@ -3276,39 +3276,23 @@ test("Popcorn.getScript()", function() {
       ok( ("has" in window) , "Popcorn.getScript https://github.com/rwldrn/has.js/raw/master/has.js loaded: `has` is available");
       plus();
 
-
       delete window["has"];
     }
   );
 
 
+	var cb = function( id ) {
+		if ( window.testFunction ) {
+			ok( true, "testFunction called by plugin id#: " + id );
+			plus();
+		} else {
+			ok( false, "testFunction called by plugin id#: " + id );
+			plus();
+		}
+	}
 
-  Popcorn.xhr({
-
-    url: "data/remoteA.js",
-
-    dataType: "script",
-
-    success: function( exists ) {
-
-      ok( exists, "Success, remoteA loaded once");
-      plus()
-    }
-  });
-
-  Popcorn.getScript(
-
-    "data/remoteB.js",
-
-    function( exists ) {
-
-      ok( exists, "Success, remoteB loaded once");
-      plus()
-
-    }
-  );
-
-
+	Popcorn.getScript( "testfunction.js", function() { cb( 1 ); } );
+	Popcorn.getScript( "testfunction.js", function() { cb( 2 ); } );
 });
 
 

From c7bdb42541745d9ae2f46f5577420e3cbe39764d Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Tue, 13 Sep 2011 17:02:11 -0400
Subject: [PATCH 044/140] [#718] Adds test/data/testfunction.js

---
 test/data/testfunction.js | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 test/data/testfunction.js

diff --git a/test/data/testfunction.js b/test/data/testfunction.js
new file mode 100644
index 000000000..3b2d561b4
--- /dev/null
+++ b/test/data/testfunction.js
@@ -0,0 +1,3 @@
+(function() {
+window.testFunction = function() {};
+})();
\ No newline at end of file

From 398b54a9f234c93022597e090eccfd451beca397 Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Tue, 13 Sep 2011 17:18:27 -0400
Subject: [PATCH 045/140] call testfunction.js from data/

---
 test/popcorn.unit.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 01d741aae..4a87994a2 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -3291,8 +3291,8 @@ test("Popcorn.getScript()", function() {
 		}
 	}
 
-	Popcorn.getScript( "testfunction.js", function() { cb( 1 ); } );
-	Popcorn.getScript( "testfunction.js", function() { cb( 2 ); } );
+	Popcorn.getScript( "data/testfunction.js", function() { cb( 1 ); } );
+	Popcorn.getScript( "data/testfunction.js", function() { cb( 2 ); } );
 });
 
 

From c2ea52433a54a16d66c1a99d0733a9ce620f89c4 Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Tue, 13 Sep 2011 17:34:13 -0400
Subject: [PATCH 046/140] delete testFunction when done

---
 test/popcorn.unit.js | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 4a87994a2..6dfff8f49 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -3219,6 +3219,7 @@ test("Popcorn.getScript()", function() {
   function plus() {
     if ( ++count === expects ) {
       start();
+      delete window["testFunction"];
     }
   }
 
@@ -3281,18 +3282,18 @@ test("Popcorn.getScript()", function() {
   );
 
 
-	var cb = function( id ) {
-		if ( window.testFunction ) {
-			ok( true, "testFunction called by plugin id#: " + id );
-			plus();
-		} else {
-			ok( false, "testFunction called by plugin id#: " + id );
-			plus();
-		}
-	}
+  var cb = function( id ) {
+    if ( window.testFunction ) {
+      ok( true, "testFunction called by plugin id#: " + id );
+      plus();
+    } else {
+      ok( false, "testFunction called by plugin id#: " + id );
+      plus();
+    }
+  }
 
-	Popcorn.getScript( "data/testfunction.js", function() { cb( 1 ); } );
-	Popcorn.getScript( "data/testfunction.js", function() { cb( 2 ); } );
+  Popcorn.getScript( "data/testfunction.js", function() { cb( 1 ); } );
+  Popcorn.getScript( "data/testfunction.js", function() { cb( 2 ); } );
 });
 
 

From ae121756dc2047e23fc26df5b56d60309f1fbd18 Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Tue, 13 Sep 2011 18:00:16 -0400
Subject: [PATCH 047/140] [#713] Clean up for Index Integrity (both) and
 enable/disable tests

---
 test/popcorn.unit.js | 156 ++++++++++++-------------------------------
 1 file changed, 42 insertions(+), 114 deletions(-)

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 60a3ed969..94544fa00 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -544,7 +544,7 @@ test("exec", function() {
 
 test( "cue (alias of exec)", function() {
   expect( 3 );
-  ok( Popcorn.p.cue, "Popcorn.p.cue exists" );	
+  ok( Popcorn.p.cue, "Popcorn.p.cue exists" );
   equal( typeof Popcorn.p.cue, "function", "Popcorn.p.cue is a function" );
   deepEqual( Popcorn.p.cue, Popcorn.p.exec, "Popcorn.p.cue equals Popcorn.p.exec" );
 });
@@ -2757,78 +2757,24 @@ test("getTrackEvent", function() {
 
 });
 
-test("Index Integrity (timeupdate)", function() {
+test( "Index Integrity (frameAnimation)", function() {
 
-  var trackLen,
-    hasrun = false,
-    lastrun = false;
-
-  Popcorn.plugin("ff", function() {
-    return {
-      start: function() {
-        var div = document.createElement("div");
-        div.id = "index-test";
-        div.innerHTML = "foo";
-
-        document.body.appendChild(div);
-      },
-      end: function() {
-        document.getElementById("index-test").parentNode.removeChild(document.getElementById("index-test"));
-      }
-    };
-  });
-
-  var p = Popcorn("#video");
-
-  p.ff({
-    id: "removeable-track-event",
-    start: 40,
-    end: 41
-  });
-
-  p.currentTime(40).pause();
-
-  stop( 10000 );
-
-  equals(p.data.trackEvents.endIndex, 0, "p.data.trackEvents.endIndex is 0");
-  equals(p.data.trackEvents.startIndex, 0, "p.data.trackEvents.startIndex is 0");
-  equals(p.data.trackEvents.byStart.length, 3, "p.data.trackEvents.byStart.length is 3 - before play" );
-
-  p.listen("timeupdate", function() {
-
-    if ( p.roundTime() > 40 && p.roundTime() < 42 && hasrun && !lastrun ) {
-
-      lastrun = true;
+  var $pop = Popcorn( "#video", { frameAnimation: true }),
+      count = 0,
+      expects = 8;
 
-      equals( document.getElementById("index-test"), null, "document.getElementById('index-test') is null on second run - after removeTrackEvent" );
+  expect( expects );
 
+  function plus() {
+    if ( ++count === expects ) {
       start();
-    }
-
-    if ( p.roundTime() >= 42 && !hasrun ) {
-
-      hasrun  = true;
-      p.pause();
-
-      equals(p.data.trackEvents.byStart.length, 3, "p.data.trackEvents.byStart.length is 3 - after play, before removeTrackEvent" );
-      equals(p.data.trackEvents.startIndex, 2, "p.data.trackEvents.startIndex is 2 - after play, before removeTrackEvent");
-      equals(p.data.trackEvents.endIndex, 2, "p.data.trackEvents.endIndex is 2 - after play, before removeTrackEvent");
-
-      p.removeTrackEvent("removeable-track-event");
-
-      equals(p.data.trackEvents.byStart.length, 2, "p.data.trackEvents.byStart.length is 2 - after removeTrackEvent" );
-      equals(p.data.trackEvents.startIndex, 1, "p.data.trackEvents.startIndex is 1 - after removeTrackEvent");
-      equals(p.data.trackEvents.endIndex, 1, "p.data.trackEvents.endIndex is 1 - after removeTrackEvent");
-
-      p.currentTime(40).play();
 
+      Popcorn.removeInstance( $pop );
+      Popcorn.removePlugin( "ff" );
     }
-  });
-
-  p.play();
-});
+  }
 
-test("Index Integrity (frameAnimation)", function() {
+  stop();
 
   var trackLen,
     hasrun = false,
@@ -2837,72 +2783,56 @@ test("Index Integrity (frameAnimation)", function() {
   Popcorn.plugin("ff", function() {
     return {
       start: function() {
-        var div = document.createElement("div");
-        div.id = "index-test";
-        div.innerHTML = "foo";
-
-        document.body.appendChild(div);
       },
       end: function() {
-        document.getElementById("index-test").parentNode.removeChild(document.getElementById("index-test"));
       }
     };
   });
 
-  var p = Popcorn("#video", { frameAnimation: true });
-
-  p.ff({
-    id: "removeable-track-event",
-    start: 40,
-    end: 41
-  });
-
-  p.currentTime(40).pause();
 
   stop( 10000 );
 
-  equals(p.data.trackEvents.endIndex, 0, "p.data.trackEvents.endIndex is 0");
-  equals(p.data.trackEvents.startIndex, 0, "p.data.trackEvents.startIndex is 0");
-  equals(p.data.trackEvents.byStart.length, 3, "p.data.trackEvents.byStart.length is 3 - before play" );
-
-  p.listen("timeupdate", function() {
-
-    if ( p.roundTime() > 40 && p.roundTime() < 42 && hasrun && !lastrun ) {
-
-      lastrun = true;
-
-      equals( document.getElementById("index-test"), null, "document.getElementById('index-test') is null on second run - after removeTrackEvent" );
+  equal( $pop.data.trackEvents.endIndex, 0, "$pop.data.trackEvents.endIndex is 0");
+  plus();
 
-      start();
-    }
+  equal( $pop.data.trackEvents.startIndex, 0, "$pop.data.trackEvents.startIndex is 0");
+  plus();
 
-    if ( p.roundTime() >= 42 && !hasrun ) {
+  $pop.listen( "canplayall", function() {
 
-      hasrun  = true;
-      p.pause();
+    $pop.ff({
+      id: "removeable-track-event",
+      start: 40,
+      end: 41
+    });
 
-      equals(p.data.trackEvents.byStart.length, 3, "p.data.trackEvents.byStart.length is 3 - after play, before removeTrackEvent" );
-      equals(p.data.trackEvents.startIndex, 2, "p.data.trackEvents.startIndex is 2 - after play, before removeTrackEvent");
-      equals(p.data.trackEvents.endIndex, 2, "p.data.trackEvents.endIndex is 2 - after play, before removeTrackEvent");
+    $pop.exec( 42, function() {
+      // 4 track events: startpad, endpad, ff and exec
+      equal( $pop.data.trackEvents.byStart.length, 4, "$pop.data.trackEvents.byStart.length is 4 - after play, before removeTrackEvent" );
+      plus();
+      equal( $pop.data.trackEvents.startIndex, 2, "$pop.data.trackEvents.startIndex is 2 - after play, before removeTrackEvent");
+      plus();
+      equal( $pop.data.trackEvents.endIndex, 2, "$pop.data.trackEvents.endIndex is 2 - after play, before removeTrackEvent");
+      plus();
 
-      p.removeTrackEvent("removeable-track-event");
+      $pop.removeTrackEvent("removeable-track-event");
 
-      equals(p.data.trackEvents.byStart.length, 2, "p.data.trackEvents.byStart.length is 2 - after removeTrackEvent" );
-      equals(p.data.trackEvents.startIndex, 1, "p.data.trackEvents.startIndex is 1 - after removeTrackEvent");
-      equals(p.data.trackEvents.endIndex, 1, "p.data.trackEvents.endIndex is 1 - after removeTrackEvent");
+      equals( $pop.data.trackEvents.byStart.length, 3, "$pop.data.trackEvents.byStart.length is 3 - after removeTrackEvent" );
+      plus();
+      equals( $pop.data.trackEvents.startIndex, 1, "$pop.data.trackEvents.startIndex is 1 - after removeTrackEvent");
+      plus();
+      equals( $pop.data.trackEvents.endIndex, 1, "$pop.data.trackEvents.endIndex is 1 - after removeTrackEvent");
+      plus();
 
-      p.currentTime(40).play();
-    }
+    }).currentTime( 40 ).play();
   });
-
-  p.play();
 });
 
-test("Popcorn.disable/enable/toggle (timeupdate)", function() {
+test( "Popcorn.disable/enable/toggle (timeupdate)", function() {
 
   var $pop = Popcorn( "#video" ),
       count = 0,
-      expects = 5;
+      expects = 4;
 
   expect( expects );
 
@@ -2938,10 +2868,6 @@ test("Popcorn.disable/enable/toggle (timeupdate)", function() {
     ok( !document.getElementById("toggler-test"), "No toggler container, disabled toggler plugin correctly never ran" );
     plus();
 
-    // Test per-instance toggle on
-    $pop.toggle( "toggler" );
-    ok( $pop.data.disabled.indexOf("toggler") === -1, "toggle() plugin: toggler is re-enabled" );
-    plus();
   });
 
   $pop.toggler({
@@ -2970,6 +2896,8 @@ test("Popcorn.disable/enable/toggle (timeupdate)", function() {
   plus();
 
   stop( 10000 );
+
+	$pop.currentTime( 39 ).play();
 });
 
 module("Popcorn XHR");

From e01aea8b63f2f5165aab808aab42acc2a1ba1926 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Wed, 14 Sep 2011 11:23:41 -0400
Subject: [PATCH 048/140] Added in alias for in/out and added tests to support
 it

---
 popcorn.js           |  9 +++++++
 test/popcorn.unit.js | 60 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)

diff --git a/popcorn.js b/popcorn.js
index a17798293..8c04fb288 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1232,6 +1232,15 @@
 
       //  Ensure a manifest object, an empty object is a sufficient fallback
       options._natives.manifest = manifest;
+      
+      
+      if ( options[ "in" ] ) {
+          options.start = options[ "in" ];
+      }
+
+      if ( options[ "out" ] ) {
+          options.end = options[ "out" ];
+      }
 
       //  Checks for expected properties
       if ( !( "start" in options ) ) {
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 89855e7d5..f3fd67a21 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -2578,6 +2578,66 @@ test("Defaulting Empty End Values", function() {
   });
 });
 
+test( "In/Out aliases", function() {
+  var popcorn = Popcorn( "#video" ),
+      expects = 3,
+      count = 0,
+      aliasDiv = document.createElement( "div" );
+      
+  document.body.appendChild( aliasDiv );
+
+  expect( expects );
+  stop( 5000 );
+
+  function plus() {
+    if ( ++count === expects ) {
+      Popcorn.removePlugin( "aliasTester" );
+      document.body.removeChild( aliasDiv );
+      start();
+    }
+  }
+
+  aliasDiv.id = "aliasDiv";
+
+  Popcorn.plugin( "aliasTester", function() {
+
+    return {
+      start: function() {
+        var div = document.getElementById( "aliasDiv" );
+        div.style.display = "inline";
+        div.innerHTML = "Showing";       
+      },
+      end: function() {
+        var div = document.getElementById( "aliasDiv" );
+        div.innerHTML = "";
+        div.style.display = "none";   
+      }
+    };
+  });
+
+  popcorn.aliasTester({
+    in: 1,
+    out: 3
+  });
+
+  popcorn.currentTime( 0 ).pause();
+
+  equals( aliasDiv.innerHTML, "", "Container is initially empty" );
+  plus();
+
+  popcorn.exec( 2, function() {
+    equals( aliasDiv.innerHTML, "Showing", "Container is displaying 'Showing', in alias is working" );
+    plus();
+  });
+
+  popcorn.exec( 4, function() {
+    equals( aliasDiv.innerHTML, "", "Container is displaying nothing again, out alias is working" );
+    plus();
+  });
+
+  popcorn.play();
+});
+
 module("Popcorn TrackEvents");
 test("Functions", function() {
 

From 3e7e6d071cbe31914692baf6988a3c16da38df88 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Wed, 14 Sep 2011 12:18:17 -0400
Subject: [PATCH 049/140] Simplified unit tests and added warning being thrown
 by lint to its ignore list

---
 build/jslint-check.js |  3 ++-
 test/popcorn.unit.js  | 22 +++++++---------------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/build/jslint-check.js b/build/jslint-check.js
index 335efc78a..6a97e4a8a 100644
--- a/build/jslint-check.js
+++ b/build/jslint-check.js
@@ -10,7 +10,8 @@ var ok = {
   "Expected an assignment or function call and instead saw an expression.": true,
   "Expected a 'break' statement before 'case'.": true,
   "'e' is already defined.": true,
-  "Don't make functions within a loop.": true
+  "Don't make functions within a loop.": true,
+  "['out'] is better written in dot notation.": true
 };
 
 function check(src)
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index f3fd67a21..e448b2717 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -2582,9 +2582,7 @@ test( "In/Out aliases", function() {
   var popcorn = Popcorn( "#video" ),
       expects = 3,
       count = 0,
-      aliasDiv = document.createElement( "div" );
-      
-  document.body.appendChild( aliasDiv );
+      counter = 0; 
 
   expect( expects );
   stop( 5000 );
@@ -2592,25 +2590,19 @@ test( "In/Out aliases", function() {
   function plus() {
     if ( ++count === expects ) {
       Popcorn.removePlugin( "aliasTester" );
-      document.body.removeChild( aliasDiv );
+      Popcorn.removeInstance( popcorn );
       start();
     }
   }
 
-  aliasDiv.id = "aliasDiv";
-
   Popcorn.plugin( "aliasTester", function() {
 
     return {
       start: function() {
-        var div = document.getElementById( "aliasDiv" );
-        div.style.display = "inline";
-        div.innerHTML = "Showing";       
+        counter++;
       },
       end: function() {
-        var div = document.getElementById( "aliasDiv" );
-        div.innerHTML = "";
-        div.style.display = "none";   
+        counter++;
       }
     };
   });
@@ -2622,16 +2614,16 @@ test( "In/Out aliases", function() {
 
   popcorn.currentTime( 0 ).pause();
 
-  equals( aliasDiv.innerHTML, "", "Container is initially empty" );
+  equals( counter, 0, "Container is initially empty" );
   plus();
 
   popcorn.exec( 2, function() {
-    equals( aliasDiv.innerHTML, "Showing", "Container is displaying 'Showing', in alias is working" );
+    equals( counter, 1, "Container is displaying 'Showing', in alias is working" );
     plus();
   });
 
   popcorn.exec( 4, function() {
-    equals( aliasDiv.innerHTML, "", "Container is displaying nothing again, out alias is working" );
+    equals( counter, 2, "Container is displaying nothing again, out alias is working" );
     plus();
   });
 

From 46ff80e754d38a601349ca39a3370ccd76f4a1f6 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Wed, 14 Sep 2011 12:25:21 -0400
Subject: [PATCH 050/140] Fixed unit test messages

---
 test/popcorn.unit.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index e448b2717..d36bc0861 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -2614,16 +2614,16 @@ test( "In/Out aliases", function() {
 
   popcorn.currentTime( 0 ).pause();
 
-  equals( counter, 0, "Container is initially empty" );
+  equals( counter, 0, "Counter is at 0, neither in or out have been called" );
   plus();
 
   popcorn.exec( 2, function() {
-    equals( counter, 1, "Container is displaying 'Showing', in alias is working" );
+    equals( counter, 1, "Counter is at 1, in has been called" );
     plus();
   });
 
   popcorn.exec( 4, function() {
-    equals( counter, 2, "Container is displaying nothing again, out alias is working" );
+    equals( counter, 2, "Counter is at 2, out has been called" );
     plus();
   });
 

From 9370be8e12f4725e9859cb61cf898d6e85f7a912 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Thu, 8 Sep 2011 10:55:57 -0400
Subject: [PATCH 051/140] stopped the plugin from polling window.Processing in
 a setTimeout. now executes a callback in getScript or simply calls the
 function

---
 plugins/processing/popcorn.processing.js | 107 +++++++++++------------
 1 file changed, 51 insertions(+), 56 deletions(-)

diff --git a/plugins/processing/popcorn.processing.js b/plugins/processing/popcorn.processing.js
index e1ddc5c82..3d5501960 100644
--- a/plugins/processing/popcorn.processing.js
+++ b/plugins/processing/popcorn.processing.js
@@ -29,22 +29,8 @@
   Popcorn.plugin( "processing" , function ( options ) {
 
     var init = function( context ) {
-    
-      var initProcessing,
-        canvas;
-
-      if ( !window.Processing ) {
-
-        Popcorn.getScript( "http://processingjs.org/content/download/processing-js-1.2.1/processing-1.2.1.min.js" );
-      }
-
-      options.parentTarget = document.getElementById( options.target );
-      
-      if ( !options.parentTarget && Popcorn.plugin.debug ) {
-        throw new Error( "target container doesn't exist" );
-      }
-      
-      initProcessing = function() {
+        
+      function scriptReady() {
         var addListeners = function() {
           context.listen( "pause", function () {
             if ( options.canvas.style.display === "inline" ) {
@@ -58,52 +44,45 @@
           });
         };
         
-        if ( window.Processing ) {
+        if ( options.sketch ) {
+
+          Popcorn.xhr({
+            url: options.sketch,
+            dataType: "text",
+            success: function( responseCode ) {
+              options.codeReady = true;
+              options.processingCode = responseCode;
+              options.pjsInstance = new Processing( options.canvas, options.processingCode );
+              options.pjsInstance.noLoop();
+              options.seeking = false;
+              context.listen( "seeking", function() {
+                 options._running && options.canvas.style.display === "inline" && options.noPause && options.pjsInstance.loop();
+              });
 
-          options.pjsInstance = new Processing( options.canvas, options.processingCode );
-          options.pjsInstance.noLoop();
-          options.seeking = false;
-          context.listen( "seeking", function() {
-             options._running && options.canvas.style.display === "inline" && options.noPause && options.pjsInstance.loop();
-          });
+              options._running && !context.media.paused && options.pjsInstance.loop();
+              
+              options.noPause = options.noPause || false;
+              !options.noPause && addListeners(); 
+              options.codeReady = true;
 
-          options._running && !context.media.paused && options.pjsInstance.loop();
+            }
+          });
+        } else if ( Popcorn.plugin.debug ) {
           
-          options.noPause = options.noPause || false;
-          !options.noPause && addListeners(); 
-          options.codeReady = true;         
-        } else {
-          setTimeout ( function() {
-            initProcessing.call( this );
-            }, 10 );
-        }
-      };
-      
-      canvas = document.createElement( "canvas" );
-      canvas.id = Popcorn.guid( options.target + "-sketch-" );
-      canvas[ "data-processing-sources" ] =  options.sketch;
-      canvas.style.display = "none";   
-      options.canvas = canvas;
-      
-      options.parentTarget && options.parentTarget.appendChild( options.canvas );
-
-      if ( options.sketch ) {
-
-        Popcorn.xhr({
-          url: options.sketch,
-          dataType: "text",
-          success: function( responseCode ) {
-            options.codeReady = true;
-            options.processingCode = responseCode;
-            initProcessing();
-          }
-        });
-      } else {
-
-        if ( Popcorn.plugin.debug ) {
           throw new Error( "options.sketch is undefined" );
+          return;
         }
+        
       }
+
+      if ( !window.Processing ) {
+
+        Popcorn.getScript( "http://processingjs.org/content/download/processing-js-1.2.1/processing-1.2.1.min.js", scriptReady );
+      } else {
+      
+        scriptReady();
+      }
+
     };
 
     return {
@@ -111,6 +90,21 @@
       _setup: function( options ) {
         
         options.codeReady = false;
+        
+        options.parentTarget = document.getElementById( options.target );
+            
+        if ( !options.parentTarget && Popcorn.plugin.debug ) {
+          throw new Error( "target container doesn't exist" );
+        }
+        
+            
+        var canvas = document.createElement( "canvas" );
+        canvas.id = Popcorn.guid( options.target + "-sketch-" );
+        canvas[ "data-processing-sources" ] =  options.sketch;
+        canvas.style.display = "none";   
+        options.canvas = canvas;
+        
+        options.parentTarget && options.parentTarget.appendChild( options.canvas );
 
         init( this );
       },
@@ -119,6 +113,7 @@
 
         options.codeReady && !this.media.paused && options.pjsInstance.loop();
         options.canvas.style.display = "inline";
+
       },
 
       end: function( event, options ) {

From f40a068ab3185030af75bc440dd0089853a63978 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Thu, 8 Sep 2011 11:01:14 -0400
Subject: [PATCH 052/140] fix up whitespace in popcorn.processing.js

---
 plugins/processing/popcorn.processing.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/processing/popcorn.processing.js b/plugins/processing/popcorn.processing.js
index 3d5501960..272423cc6 100644
--- a/plugins/processing/popcorn.processing.js
+++ b/plugins/processing/popcorn.processing.js
@@ -50,11 +50,13 @@
             url: options.sketch,
             dataType: "text",
             success: function( responseCode ) {
+            
               options.codeReady = true;
               options.processingCode = responseCode;
               options.pjsInstance = new Processing( options.canvas, options.processingCode );
               options.pjsInstance.noLoop();
               options.seeking = false;
+              
               context.listen( "seeking", function() {
                  options._running && options.canvas.style.display === "inline" && options.noPause && options.pjsInstance.loop();
               });
@@ -96,7 +98,6 @@
         if ( !options.parentTarget && Popcorn.plugin.debug ) {
           throw new Error( "target container doesn't exist" );
         }
-        
             
         var canvas = document.createElement( "canvas" );
         canvas.id = Popcorn.guid( options.target + "-sketch-" );

From a281d0de2a8c08a7de5002022fd88f68cf43d031 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Thu, 8 Sep 2011 11:09:43 -0400
Subject: [PATCH 053/140] removed the Window.Processing timeout block. it now
 uses the popcorn.getScript() callback param

---
 plugins/gml/popcorn.gml.js | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/plugins/gml/popcorn.gml.js b/plugins/gml/popcorn.gml.js
index 17cf12f4e..228825007 100755
--- a/plugins/gml/popcorn.gml.js
+++ b/plugins/gml/popcorn.gml.js
@@ -165,28 +165,17 @@
 
       if ( !window.Processing ) {
 
-        Popcorn.getScript( "http://processingjs.org/content/download/processing-js-1.2.1/processing-1.2.1.min.js" );
-      }
-
-      // makes sure both processing.js and the gml data are loaded
-      var readyCheck = function() {
-
-        if ( window.Processing ) {
-
+        Popcorn.getScript( "http://processingjs.org/content/download/processing-js-1.2.1/processing-1.2.1.min.js", function() {
+          
           Popcorn.getJSONP( "http://000000book.com/data/" + options.gmltag + ".json?callback=", function( data ) {
 
             options.pjsInstance = new Processing( options.container, gmlPlayer );
             options.pjsInstance.construct( self.media, data, options );
             options._running && options.pjsInstance.loop();
           }, false );
+        });
+      }
 
-          return;
-        }
-
-        setTimeout( readyCheck, 5 );
-      };
-
-      readyCheck();
     },
     /**
      * @member gml 

From cd33f9f1b5f5cc44f476862971de8b7110d0a902 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Thu, 8 Sep 2011 12:03:56 -0400
Subject: [PATCH 054/140] working on bugs

---
 plugins/gml/popcorn.gml.js               | 22 +++++++++++++---------
 plugins/processing/popcorn.processing.js | 21 ++++++++++++---------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/plugins/gml/popcorn.gml.js b/plugins/gml/popcorn.gml.js
index 228825007..10db08311 100755
--- a/plugins/gml/popcorn.gml.js
+++ b/plugins/gml/popcorn.gml.js
@@ -162,18 +162,22 @@
         throw new Error( "target container doesn't exist" );
       }
       target && target.appendChild( options.container );
+      
+      var scriptReady = function() {
+        Popcorn.getJSONP( "http://000000book.com/data/" + options.gmltag + ".json?callback=", function( data ) {
 
-      if ( !window.Processing ) {
+          options.pjsInstance = new Processing( options.container, gmlPlayer );
+          options.pjsInstance.construct( self.media, data, options );
+          options._running && options.pjsInstance.loop();
+        }, false );
+      };
 
-        Popcorn.getScript( "http://processingjs.org/content/download/processing-js-1.2.1/processing-1.2.1.min.js", function() {
-          
-          Popcorn.getJSONP( "http://000000book.com/data/" + options.gmltag + ".json?callback=", function( data ) {
+      if ( !window.Processing ) {
 
-            options.pjsInstance = new Processing( options.container, gmlPlayer );
-            options.pjsInstance.construct( self.media, data, options );
-            options._running && options.pjsInstance.loop();
-          }, false );
-        });
+        Popcorn.getScript( "http://processingjs.org/content/download/processing-js-1.3.0/processing-1.3.0.min.js", scriptReady );
+      } else {
+      
+        scriptReady();
       }
 
     },
diff --git a/plugins/processing/popcorn.processing.js b/plugins/processing/popcorn.processing.js
index 272423cc6..9cef62826 100644
--- a/plugins/processing/popcorn.processing.js
+++ b/plugins/processing/popcorn.processing.js
@@ -51,21 +51,24 @@
             dataType: "text",
             success: function( responseCode ) {
             
-              options.codeReady = true;
-              options.processingCode = responseCode;
-              options.pjsInstance = new Processing( options.canvas, options.processingCode );
-              options.pjsInstance.noLoop();
+              options.codeReady = false;
+              
+              var s = new Processing.Sketch( responseCode );
+              s.onload = function() {
+                options.codeReady = true;
+                ( options._running && !context.media.paused && options.pjsInstance.loop() ) || options.pjsInstance.noLoop() ;
+              };
+              
+              options.pjsInstance = new Processing( options.canvas, s );
               options.seeking = false;
               
               context.listen( "seeking", function() {
                  options._running && options.canvas.style.display === "inline" && options.noPause && options.pjsInstance.loop();
               });
-
-              options._running && !context.media.paused && options.pjsInstance.loop();
-              
+  
               options.noPause = options.noPause || false;
               !options.noPause && addListeners(); 
-              options.codeReady = true;
+              
 
             }
           });
@@ -79,7 +82,7 @@
 
       if ( !window.Processing ) {
 
-        Popcorn.getScript( "http://processingjs.org/content/download/processing-js-1.2.1/processing-1.2.1.min.js", scriptReady );
+        Popcorn.getScript( "http://processingjs.org/content/download/processing-js-1.3.0/processing-1.3.0.min.js", scriptReady );
       } else {
       
         scriptReady();

From 4108651175db37b9a4c62fa21c993e15a0537ea2 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Thu, 8 Sep 2011 14:56:32 -0400
Subject: [PATCH 055/140] work on the ticket. blocked by processing ticket 1643

---
 plugins/processing/popcorn.processing.js | 37 +++++++++++++++++-------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/plugins/processing/popcorn.processing.js b/plugins/processing/popcorn.processing.js
index 9cef62826..de7923e6b 100644
--- a/plugins/processing/popcorn.processing.js
+++ b/plugins/processing/popcorn.processing.js
@@ -25,12 +25,14 @@
  */
 
 (function ( Popcorn ) {
+                
+  var called = false;
 
   Popcorn.plugin( "processing" , function ( options ) {
-
+  
     var init = function( context ) {
-        
-      function scriptReady() {
+
+      function scriptReady( options ) {
         var addListeners = function() {
           context.listen( "pause", function () {
             if ( options.canvas.style.display === "inline" ) {
@@ -53,8 +55,9 @@
             
               options.codeReady = false;
               
-              var s = new Processing.Sketch( responseCode );
-              s.onload = function() {
+              var s = Processing.compile( responseCode );
+              s.onLoad = function() {
+                console.log( "onLoad Called" );
                 options.codeReady = true;
                 ( options._running && !context.media.paused && options.pjsInstance.loop() ) || options.pjsInstance.noLoop() ;
               };
@@ -68,7 +71,6 @@
   
               options.noPause = options.noPause || false;
               !options.noPause && addListeners(); 
-              
 
             }
           });
@@ -80,12 +82,25 @@
         
       }
 
-      if ( !window.Processing ) {
+      if ( !window.Processing && !called ) {
 
-        Popcorn.getScript( "http://processingjs.org/content/download/processing-js-1.3.0/processing-1.3.0.min.js", scriptReady );
+        Popcorn.getScript( "http://processingjs.org/content/download/processing-js-1.3.0/processing-1.3.0.js", function() {
+          scriptReady( options )
+        });
+        called = true;
       } else {
-      
-        scriptReady();
+        readyCheck = function() {
+          if ( window.Processing ) {
+            scriptReady( options );
+            return;
+          }
+         
+          setTimeout( readyCheck, 5 ); 
+        
+        };
+        
+        readyCheck();
+        
       }
 
     };
@@ -104,7 +119,7 @@
             
         var canvas = document.createElement( "canvas" );
         canvas.id = Popcorn.guid( options.target + "-sketch-" );
-        canvas[ "data-processing-sources" ] =  options.sketch;
+        //canvas[ "data-processing-sources" ] =  options.sketch;
         canvas.style.display = "none";   
         options.canvas = canvas;
         

From bb93ef31087241c5646376e792294cece163bb4c Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Wed, 14 Sep 2011 14:12:26 -0400
Subject: [PATCH 056/140] processing plug-in no longer polls for Processing.

---
 plugins/processing/popcorn.processing.js | 69 +++++++++---------------
 1 file changed, 24 insertions(+), 45 deletions(-)

diff --git a/plugins/processing/popcorn.processing.js b/plugins/processing/popcorn.processing.js
index de7923e6b..f15656baf 100644
--- a/plugins/processing/popcorn.processing.js
+++ b/plugins/processing/popcorn.processing.js
@@ -2,9 +2,9 @@
  * Processing Popcorn Plug-In
  *
  * This plugin adds a Processing.js sketch to be added to a target div or canvas.
- * 
+ *
  * Options parameter needs to specify start, end, target and  sketch attributes
- * -Start is the time [in seconds] that you want the sketch to display and start looping. 
+ * -Start is the time [in seconds] that you want the sketch to display and start looping.
  * -End is the time [in seconds] you want the sketch to become hidden and stop looping.
  * -Target is the id of the div or canvas you want the target sketch to be displayed in. ( a target that is a div will have a canvas created and placed inside of it. )
  * -Sketch specifies the filename of the Procesing code to be loaded into Processing.js
@@ -25,11 +25,9 @@
  */
 
 (function ( Popcorn ) {
-                
-  var called = false;
 
   Popcorn.plugin( "processing" , function ( options ) {
-  
+
     var init = function( context ) {
 
       function scriptReady( options ) {
@@ -45,62 +43,44 @@
             }
           });
         };
-        
+
         if ( options.sketch ) {
 
           Popcorn.xhr({
             url: options.sketch,
             dataType: "text",
             success: function( responseCode ) {
-            
+
               options.codeReady = false;
-              
+
               var s = Processing.compile( responseCode );
-              s.onLoad = function() {
-                console.log( "onLoad Called" );
-                options.codeReady = true;
-                ( options._running && !context.media.paused && options.pjsInstance.loop() ) || options.pjsInstance.noLoop() ;
-              };
-              
               options.pjsInstance = new Processing( options.canvas, s );
               options.seeking = false;
-              
+              ( options._running && !context.media.paused && options.pjsInstance.loop() ) || options.pjsInstance.noLoop();
+
               context.listen( "seeking", function() {
                  options._running && options.canvas.style.display === "inline" && options.noPause && options.pjsInstance.loop();
               });
-  
-              options.noPause = options.noPause || false;
-              !options.noPause && addListeners(); 
 
+              options.noPause = options.noPause || false;
+              !options.noPause && addListeners();
+							options.codeReady = true;
             }
           });
         } else if ( Popcorn.plugin.debug ) {
-          
-          throw new Error( "options.sketch is undefined" );
+
+          throw new Error( "Popcorn.Processing: options.sketch is undefined" );
           return;
         }
-        
-      }
 
-      if ( !window.Processing && !called ) {
+      }
 
+      if (!window.Processing) {
         Popcorn.getScript( "http://processingjs.org/content/download/processing-js-1.3.0/processing-1.3.0.js", function() {
           scriptReady( options )
         });
-        called = true;
       } else {
-        readyCheck = function() {
-          if ( window.Processing ) {
-            scriptReady( options );
-            return;
-          }
-         
-          setTimeout( readyCheck, 5 ); 
-        
-        };
-        
-        readyCheck();
-        
+        scriptReady( options );
       }
 
     };
@@ -108,21 +88,20 @@
     return {
 
       _setup: function( options ) {
-        
+
         options.codeReady = false;
-        
+
         options.parentTarget = document.getElementById( options.target );
-            
+
         if ( !options.parentTarget && Popcorn.plugin.debug ) {
           throw new Error( "target container doesn't exist" );
         }
-            
+
         var canvas = document.createElement( "canvas" );
         canvas.id = Popcorn.guid( options.target + "-sketch-" );
-        //canvas[ "data-processing-sources" ] =  options.sketch;
-        canvas.style.display = "none";   
+        canvas.style.display = "none";
         options.canvas = canvas;
-        
+
         options.parentTarget && options.parentTarget.appendChild( options.canvas );
 
         init( this );
@@ -136,11 +115,11 @@
       },
 
       end: function( event, options ) {
-        
+
         options.pjsInstance && options.pjsInstance.noLoop();
         options.canvas.style.display = "none";
       },
-      
+
       _teardown: function( options ) {
         options.pjsInstance && options.pjsInstance.exit();
         options.parentTarget && options.parentTarget.removeChild( options.canvas );

From e07ec511d5dbcde05689289a675e2a37ca5e0f0b Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Thu, 15 Sep 2011 11:09:55 -0400
Subject: [PATCH 057/140] removed globalSize tests from the core unit tests
 [#720]

---
 test/index.html            | 15 +------------
 test/popcorn.unit.js       | 36 +------------------------------
 test/popcorn.unit.setup.js | 43 +-------------------------------------
 3 files changed, 3 insertions(+), 91 deletions(-)

diff --git a/test/index.html b/test/index.html
index dd533c38a..99a9c4455 100644
--- a/test/index.html
+++ b/test/index.html
@@ -5,15 +5,9 @@
   <link rel="stylesheet" href="qunit/qunit.css" type="text/css" media="screen">
   <script src="jquery.js"></script>
 
-
   <script src="qunit/qunit.js"></script>
 
-  <!--
-    do not move - this must be called immediately prior to
-    popcorn-api-draft.js
-  -->
   <script src="popcorn.unit.setup.js"></script>
-
   <script src="../popcorn.js"></script>
   <script src="popcorn.unit.js"></script>
 </head>
@@ -21,7 +15,7 @@
   <h1 id="qunit-header">
     Popcorn.js API
     <iframe id="archaic-tests" data-src="archaic.html" style="width:325px;height:60px;float:right;border:0px;margin:-10px 20px 0 -10px;background:#fff" ></iframe>
-    
+
     <iframe id="butter-tests" data-src="butter_test.html" style="width:325px;height:60px;float:right;border:0px;margin:-10px 20px 0 -10px;background:#fff" ></iframe>
 
     <iframe id="ready-tests" data-src="ready.html" style="width:325px;height:60px;float:right;border:0px;margin:-10px 20px 0 -10px;background:#fff" ></iframe>
@@ -33,10 +27,6 @@ <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
   <div id="qunit-fixture">
 
-
-
-
-
   </div>
 
   <video id='video'
@@ -61,9 +51,6 @@ <h2 id="qunit-userAgent"></h2>
     <source src="italia.ogg" type='audio/ogg; codecs="vorbis"'>
   </audio>
 
-
-
-
   <!-- Position Tests Adapted From jQuery offsets/dimensions Tests -->
   <style type="text/css" media="screen">
     #position-tests { display:none;margin:0; position: fixed;top:0px;left:0px;  }
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 6dfff8f49..da0e3606a 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -1,7 +1,7 @@
 module("Popcorn API");
 test("API", function() {
 
-  var expects = 4,
+  var expects = 3,
       count = 0;
 
   expect(expects);
@@ -26,14 +26,6 @@ test("API", function() {
 
   } catch (e) {};
 
-  try {
-
-    equals( Setup.getGlobalSize(), Setup.globalSize + 1 , "Popcorn API creates only 1 global reference");
-    plus();
-
-  } catch (e) {};
-
-
   try {
 
     Popcorn(function() {
@@ -3679,29 +3671,3 @@ test("Parser Support", function() {
 
   });
 });
-
-
-module("Popcorn Test Runner End");
-test("Last Check", function() {
-
-  //   ALWAYS RUN LAST
-  try {
-
-    equals( Setup.getGlobalSize(), Setup.globalSize + 1 , "Popcorn API did not leak");
-
-    if ( !Setup.globalDiff.length ) {
-      //console.log(Setup.globalDiff);
-    }
-
-  } catch (e) {};
-
-  //  Trigger follow-up tests to run in iframes
-  (function( $ ) {
-
-    $("iframe[data-src]").attr( "src", function() {
-      return $(this).data("src");
-    });
-
-  })( jQuery );
-
-});
diff --git a/test/popcorn.unit.setup.js b/test/popcorn.unit.setup.js
index e69f3db60..7f1d11acd 100644
--- a/test/popcorn.unit.setup.js
+++ b/test/popcorn.unit.setup.js
@@ -4,46 +4,7 @@ if ( !window[ "console" ] ) {
 
 (function( global ) {
 
-  //  Store the number of global properties that exist prior to Popcorn API definition
-  var Setup = {
-    hasRun: false,
-    globalSize: 0,
-    globalCache: [],
-    globalDiff: []
-  };
-
-  Setup.getGlobalSize = function() {
-
-    var size = 0, prop;
-
-    for ( prop in window ) {
-      if ( prop !== "_firebug" ) {
-        size++;
-
-        if ( !Setup.hasRun ) {
-          Setup.globalCache.push( prop );
-        } else {
-          if ( Setup.globalCache.indexOf( prop ) === -1 ) {
-            Setup.globalDiff.push( prop );
-          }
-        }
-      }
-    }
-
-    //  account for self
-    size++;
-
-    //  Store the number of global properties internally
-    if ( !Setup.globalSize ) {
-      Setup.globalSize = size;
-    }
-
-    if ( !Setup.hasRun ) {
-      Setup.hasRun = true;
-    }
-
-    return size;
-  };
+  var Setup = {};
 
   Setup.eventset = "loadstart progress suspend emptied stalled play pause " +
                    "loadedmetadata loadeddata waiting playing canplay canplaythrough " +
@@ -54,5 +15,3 @@ if ( !window[ "console" ] ) {
   global.Setup = Setup;
 
 })( window );
-
-Setup.getGlobalSize();
\ No newline at end of file

From d57ea08373d3fdc1afa556b3f7c845f3aacf8b02 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Thu, 15 Sep 2011 11:43:53 -0400
Subject: [PATCH 058/140] added make target for linting core tests [#608]

---
 Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Makefile b/Makefile
index 5ea413b2a..5bffbf44e 100644
--- a/Makefile
+++ b/Makefile
@@ -160,6 +160,10 @@ lint:
 	@@echo "Checking Popcorn against JSLint..."
 	@@$(call run_lint,popcorn.js)
 
+lint-core-tests:
+	@@echo "Checking core unit tests against JSLint..."
+	@@$(call run_lint,test/popcorn.unit.js)
+
 lint-plugins:
 	@@echo "Checking all plugins against JSLint..."
 	@@$(call run_lint,$(PLUGINS_SRC))

From 5d4ece2dbd74eec29d11f18a96181f7707276a63 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Thu, 15 Sep 2011 12:31:02 -0400
Subject: [PATCH 059/140] restored iframe runner stuffs as per review [#720]

---
 test/popcorn.unit.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index da0e3606a..3a7ab4be6 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -3671,3 +3671,14 @@ test("Parser Support", function() {
 
   });
 });
+
+module("Popcorn Test Runner End");
+test("Last Check", function() {
+  //  Trigger follow-up tests to run in iframes
+  (function( $ ) {
+    $("iframe[data-src]").attr( "src", function() {
+      return $(this).data("src");
+    });
+    ok( true, "iframe tests run");
+  })( jQuery );
+});

From 0d5540a53438aa9480160d415cf144165970fc6c Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Fri, 16 Sep 2011 16:28:26 -0400
Subject: [PATCH 060/140] moved data-timeline automagical parsing into a new
 dir: modules, fixed core unit test issues associate with the move. added unit
 tests for automagical parsing. fixed data-timeline parsing to accept relative
 paths

---
 .../popcorn.timeline-sources.js               | 64 +++++++++++++++
 .../popcorn.timeline-sources.unit.html        | 43 ++++++++++
 .../popcorn.timeline-sources.unit.js          | 79 +++++++++++++++++++
 popcorn.js                                    | 61 --------------
 test/popcorn.unit.js                          |  4 +-
 5 files changed, 188 insertions(+), 63 deletions(-)
 create mode 100644 modules/timeline-sources/popcorn.timeline-sources.js
 create mode 100644 modules/timeline-sources/popcorn.timeline-sources.unit.html
 create mode 100644 modules/timeline-sources/popcorn.timeline-sources.unit.js

diff --git a/modules/timeline-sources/popcorn.timeline-sources.js b/modules/timeline-sources/popcorn.timeline-sources.js
new file mode 100644
index 000000000..397035022
--- /dev/null
+++ b/modules/timeline-sources/popcorn.timeline-sources.js
@@ -0,0 +1,64 @@
+(function( Popcorn ) {
+  document.addEventListener( "DOMContentLoaded", function() {
+
+    //  Supports non-specific elements
+    var dataAttr = "data-timeline-sources",
+        medias = document.querySelectorAll( "[" + dataAttr + "]" );
+
+    Popcorn.forEach( medias, function( idx, key ) {
+
+      var media = medias[ key ],
+          hasDataSources = false,
+          dataSources, data, popcornMedia;
+
+      //  Ensure that the DOM has an id
+      if ( !media.id ) {
+
+        media.id = Popcorn.guid( "__popcorn" );
+      }
+
+      //  Ensure we're looking at a dom node
+      if ( media.nodeType && media.nodeType === 1 ) {
+
+        popcornMedia = Popcorn( "#" + media.id );
+
+        dataSources = ( media.getAttribute( dataAttr ) || "" ).split( "," );
+
+        if ( dataSources[ 0 ] ) {
+
+          Popcorn.forEach( dataSources, function( source ) {
+
+            // split the parser and data as parser!file
+            data = source.split( "!" );
+
+            // if no parser is defined for the file, assume "parse" + file extension
+            if ( data.length === 1 ) {
+
+              // parse a relative URL for the filename, split to get extension
+							data = source.match( /(.*)[\/\\]([^\/\\]+\.\w+)$/ )[ 2 ].split( "." );
+
+              data[ 0 ] = "parse" + data[ 1 ].toUpperCase();
+              data[ 1 ] = source;
+            }
+
+            //  If the media has data sources and the correct parser is registered, continue to load
+            if ( dataSources[ 0 ] && popcornMedia[ data[ 0 ] ] ) {
+
+              //  Set up the media and load in the datasources
+              popcornMedia[ data[ 0 ] ]( data[ 1 ] );
+
+            }
+          });
+
+        }
+
+        //  Only play the media if it was specified to do so
+        if ( !!popcornMedia.autoplay ) {
+          popcornMedia.play();
+        }
+
+      }
+    });
+  }, false );
+
+})( Popcorn );
\ No newline at end of file
diff --git a/modules/timeline-sources/popcorn.timeline-sources.unit.html b/modules/timeline-sources/popcorn.timeline-sources.unit.html
new file mode 100644
index 000000000..122aee3b1
--- /dev/null
+++ b/modules/timeline-sources/popcorn.timeline-sources.unit.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Popcorn Module: Timeline-Sources</title>
+  <link rel="stylesheet" href="../../test/qunit/qunit.css" type="text/css" media="screen">
+  <script src="../../test/qunit/qunit.js"></script>
+
+  <script src="../../popcorn.js"></script>
+  <script src="popcorn.timeline-sources.js"></script>
+  <script src="popcorn.timeline-sources.unit.js"></script>
+  <script src="../../parsers/parserJSON/popcorn.parserJSON.js"></script>
+</head>
+<body>
+  <h1 id="qunit-header">Popcorn Module: timeline-sources</h1>
+  <h2 id="qunit-banner"></h2>
+  <div id="qunit-testrunner-toolbar"></div>
+  <h2 id="qunit-userAgent"></h2>
+  <ol id="qunit-tests"></ol>
+  <div id="qunit-fixture">  </div>
+
+  <video id='video'
+    controls preload='none'
+    width= '250px'
+    poster="../../test/poster.png"
+    data-timeline-sources="../../parsers/parserJSON/data/video.json">
+
+    <source id='mp4'
+      src="../../test/trailer.mp4"
+      type='video/mp4; codecs="avc1, mp4a"'>
+
+    <source id='ogv'
+      src="../../test/trailer.ogv"
+      type='video/ogg; codecs="theora, vorbis"'>
+
+    <source id='webm'
+      src="../../test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
+
+    <p>Your user agent does not support the HTML5 Video element.</p>
+
+  </video> 
+</body>
+</html>
diff --git a/modules/timeline-sources/popcorn.timeline-sources.unit.js b/modules/timeline-sources/popcorn.timeline-sources.unit.js
new file mode 100644
index 000000000..e48f174dd
--- /dev/null
+++ b/modules/timeline-sources/popcorn.timeline-sources.unit.js
@@ -0,0 +1,79 @@
+(function( Popcorn ) {
+
+  var setupCalled = 0,
+      startCalled = 0,
+      endCalled = 0;
+
+  Popcorn.plugin( "footnote", function( options ) {
+    return {
+      _setup: function() {
+          setupCalled++;
+        },
+      start: function() {
+        startCalled++;
+      },
+      end: function() {
+        endCalled++;
+      }
+    };
+  });
+
+  Popcorn.plugin( "googlemap", function( options ) {
+    return {
+      _setup: function() {
+        setupCalled++;
+      },
+      start: function() {
+        startCalled++;
+      },
+      end: function() {
+        endCalled++;
+      }
+    };
+  });
+
+  Popcorn.plugin( "webpage", function( options ) {
+    return {
+      _setup: function() {
+        setupCalled++;
+      },
+      start: function() {
+        startCalled++;
+      },
+      end: function() {
+        endCalled++;
+      }
+    };
+  });
+
+  test( "Timeline-sources Module", function() {
+    expect( 3 );
+
+    var count = 0,
+        p = Popcorn.getInstanceById( "video" );
+
+    function plus() {
+      if ( ++count === 3 ) {
+        start();
+      }
+    }
+
+    stop();
+
+    p.exec( 3, function() {
+      equals( startCalled, 5, "start was called 5 times from the parsed data" );
+      plus();
+      p.currentTime( 9 );
+    });
+
+    p.exec( 10.5, function() {
+      equals( endCalled, 5, "end was called 5 times from the parsed data" );
+      plus()
+    });
+
+    equals( setupCalled, 5, "setup was called 5 times from the parsed data" );
+    plus();
+
+  });
+
+})( Popcorn );
\ No newline at end of file
diff --git a/popcorn.js b/popcorn.js
index e2c7320a7..43765805a 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1777,65 +1777,4 @@
   //  Exposes Popcorn to global context
   global.Popcorn = Popcorn;
 
-  document.addEventListener( "DOMContentLoaded", function() {
-
-    //  Supports non-specific elements
-    var dataAttr = "data-timeline-sources",
-        medias = document.querySelectorAll( "[" + dataAttr + "]" );
-
-    Popcorn.forEach( medias, function( idx, key ) {
-
-      var media = medias[ key ],
-          hasDataSources = false,
-          dataSources, data, popcornMedia;
-
-      //  Ensure that the DOM has an id
-      if ( !media.id ) {
-
-        media.id = Popcorn.guid( "__popcorn" );
-      }
-
-      //  Ensure we're looking at a dom node
-      if ( media.nodeType && media.nodeType === 1 ) {
-
-        popcornMedia = Popcorn( "#" + media.id );
-
-        dataSources = ( media.getAttribute( dataAttr ) || "" ).split( "," );
-
-        if ( dataSources[ 0 ] ) {
-
-          Popcorn.forEach( dataSources, function( source ) {
-
-            // split the parser and data as parser!file
-            data = source.split( "!" );
-
-            // if no parser is defined for the file, assume "parse" + file extension
-            if ( data.length === 1 ) {
-
-              data = source.split( "." );
-              data[ 0 ] = "parse" + data[ data.length - 1 ].toUpperCase();
-              data[ 1 ] = source;
-            }
-
-            //  If the media has data sources and the correct parser is registered, continue to load
-            if ( dataSources[ 0 ] && popcornMedia[ data[ 0 ] ] ) {
-
-              //  Set up the media and load in the datasources
-              popcornMedia[ data[ 0 ] ]( data[ 1 ] );
-
-            }
-          });
-
-        }
-
-        //  Only play the media if it was specified to do so
-        if ( !!popcornMedia.autoplay ) {
-          popcornMedia.play();
-        }
-
-      }
-    });
-  }, false );
-
 })(window, window.document);
-
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 6dfff8f49..37f0340d5 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -268,7 +268,7 @@ test("Instances", function() {
   ok( instance instanceof Popcorn, "Instance instanceof Popcorn" );
   plus();
 
-  equal( Popcorn.instances.length, 2, "There are the correct number of Popcorn instances" );
+  equal( Popcorn.instances.length, 1, "There are the correct number of Popcorn instances" );
   plus();
 
   //  Create another instance
@@ -278,7 +278,7 @@ test("Instances", function() {
   var remove = Popcorn.instances[1];
 
   //  Remove and check the length of the currently cached instances
-  equal( Popcorn.removeInstanceById( remove.id ).length, 2, "Removing an instance by id: 1 instance remains" );
+  equal( Popcorn.removeInstanceById( remove.id ).length, 1, "Removing an instance by id: 1 instance remains" );
   plus();
 });
 

From ed8151f917eaceaf1fc13f6c626938ea6d90d7c2 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Mon, 19 Sep 2011 10:54:03 -0400
Subject: [PATCH 061/140] added preload=auto to unit tests. muted unit tests.
 added Module stuff to Makefile (builds into complete, testing, min versions,
 separately as popcorn.modules.js, lint targets etc [#721]

---
 Makefile                                      | 49 +++++++++++++++----
 .../popcorn.timeline-sources.unit.html        |  2 +-
 .../popcorn.timeline-sources.unit.js          |  3 +-
 3 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 5bffbf44e..08ed9f964 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@ PLUGINS_DIR = ${PREFIX}/plugins
 PARSERS_DIR = ${PREFIX}/parsers
 PLAYERS_DIR = ${PREFIX}/players
 EFFECTS_DIR = $(PREFIX)/effects
+MODULES_DIR = $(PREFIX)/modules
 
 # Version number used in naming release files. Defaults to git commit sha.
 VERSION ?= $(shell git show -s --pretty=format:%h)
@@ -27,6 +28,10 @@ POPCORN_SRC = ${PREFIX}/popcorn.js
 POPCORN_DIST = ${DIST_DIR}/popcorn.js
 POPCORN_MIN = ${DIST_DIR}/popcorn.min.js
 
+# modules
+MODULES_DIST = ${DIST_DIR}/popcorn.modules.js
+MODULES_MIN = ${DIST_DIR}/popcorn.modules.min.js
+
 # plugins
 PLUGINS_DIST = ${DIST_DIR}/popcorn.plugins.js
 PLUGINS_MIN = ${DIST_DIR}/popcorn.plugins.min.js
@@ -52,23 +57,30 @@ PARSERS_SRC := $(filter-out %unit.js, $(shell find ${PARSERS_DIR} -name 'popcorn
 # Grab all popcorn.<player-name>.js files from players dir
 PLAYERS_SRC := $(filter-out %unit.js, $(shell find ${PLAYERS_DIR} -name 'popcorn.*.js' -print))
 
-# Grab all popcorn.<effect-name>.js files from players dir
+# Grab all popcorn.<effect-name>.js files from effects dir
 EFFECTS_SRC := $(filter-out %unit.js, $(shell find $(EFFECTS_DIR) -name 'popcorn.*.js' -print))
 
-# Grab all popcorn.<player-name>.unit.js files from plugins dir
+# Grab all popcorn.<Module-name>.js files from modules dir
+MODULES_SRC := $(filter-out %unit.js, $(shell find $(MODULES_DIR) -name 'popcorn.*.js' -print))
+
+# Grab all popcorn.<plugin-name>.unit.js files from plugins dir
 PLUGINS_UNIT := $(shell find ${PLUGINS_DIR} -name 'popcorn.*.unit.js' -print)
 
-# Grab all popcorn.<player-name>.unit.js files from parsers dir
+# Grab all popcorn.<parser-name>.unit.js files from parsers dir
 PARSERS_UNIT := $(shell find ${PARSERS_DIR} -name 'popcorn.*.unit.js' -print)
 
 # Grab all popcorn.<player-name>.unit.js files from players dir
 PLAYERS_UNIT := $(shell find ${PLAYERS_DIR} -name 'popcorn.*.unit.js' -print)
 
-# Grab all popcorn.<effects>.unit.js files from players dir
+# Grab all popcorn.<effects>.unit.js files from effects dir
 EFFECTS_UNIT := $(shell find $(EFFECTS_DIR) -name 'popcorn.*.unit.js' -print)
 
+# Grab all popcorn.<module-name>.unit.js files from modules dir
+MODULES_UNIT := $(shell find $(MODULES_DIR) -name 'popcorn.*.unit.js' -print)
+
 # popcorn + plugins
 POPCORN_COMPLETE_LIST := --js ${POPCORN_SRC} \
+                         $(shell for js in ${MODULES_SRC} ; do echo --js $$js ; done) \
                          $(shell for js in ${PLUGINS_SRC} ; do echo --js $$js ; done) \
                          $(shell for js in ${PARSERS_SRC} ; do echo --js $$js ; done) \
                          $(shell for js in ${PLAYERS_SRC} ; do echo --js $$js ; done)
@@ -96,7 +108,7 @@ ${POPCORN_DIST}: ${POPCORN_SRC} | ${DIST_DIR}
 	@@echo "Building" ${POPCORN_DIST}
 	@@$(call add_license, $(POPCORN_SRC), $(POPCORN_DIST))
 
-min: ${POPCORN_MIN} ${PLUGINS_MIN} ${PARSERS_MIN} ${PLAYERS_MIN} $(EFFECTS_MIN) ${POPCORN_COMPLETE_MIN}
+min: ${POPCORN_MIN} ${MODULES_MIN} ${PLUGINS_MIN} ${PARSERS_MIN} ${PLAYERS_MIN} $(EFFECTS_MIN) ${POPCORN_COMPLETE_MIN}
 
 ${POPCORN_MIN}: ${POPCORN_DIST}
 	@@echo "Building" ${POPCORN_MIN}
@@ -104,12 +116,22 @@ ${POPCORN_MIN}: ${POPCORN_DIST}
 	@@$(call add_license, ${POPCORN_MIN}.tmp, ${POPCORN_MIN})
 	@@rm ${POPCORN_MIN}.tmp
 
-${POPCORN_COMPLETE_MIN}: update ${POPCORN_SRC} ${PLUGINS_SRC} ${PARSERS_SRC} $(EFFECTS_SRC) ${DIST_DIR}
+${POPCORN_COMPLETE_MIN}: update ${POPCORN_SRC} ${MODULES_SRC} ${PLUGINS_SRC} ${PARSERS_SRC} $(EFFECTS_SRC) ${DIST_DIR}
 	@@echo "Building" ${POPCORN_COMPLETE_MIN}
 	@@$(call compile, ${POPCORN_COMPLETE_LIST}, ${POPCORN_COMPLETE_MIN}.tmp)
 	@@$(call add_license, ${POPCORN_COMPLETE_MIN}.tmp, ${POPCORN_COMPLETE_MIN})
 	@@rm ${POPCORN_COMPLETE_MIN}.tmp
 
+modules: ${MODULES_DIST}
+
+${MODULES_MIN}: ${MODULES_DIST}
+	@@echo "Building" ${MODULES_MIN}
+	@@$(call compile, $(shell for js in ${MODULES_SRC} ; do echo --js $$js ; done), ${MODULES_MIN})
+
+${MODULES_DIST}: ${MODULES_SRC} ${DIST_DIR}
+	@@echo "Building ${MODULES_DIST}"
+	@@cat ${MODULES_SRC} > ${MODULES_DIST}
+
 plugins: ${PLUGINS_DIST}
 
 ${PLUGINS_MIN}: ${PLUGINS_DIST}
@@ -150,9 +172,9 @@ $(EFFECTS_DIST): $(EFFECTS_SRC) $(DIST_DIR)
 	@@echo "Building $(EFFECTS_DIST)"
 	@@cat $(EFFECTS_SRC) > $(EFFECTS_DIST)
 
-complete: update ${POPCORN_SRC} ${PARSERS_SRC} ${PLUGINS_SRC} ${PLAYERS_SRC} $(EFFECTS_SRC) ${DIST_DIR}
-	@@echo "Building popcorn + plugins + parsers + players + effects..."
-	@@cat ${POPCORN_SRC} ${PLUGINS_SRC} ${PARSERS_SRC} ${PLAYERS_SRC} $(EFFECTS_SRC) > ${POPCORN_COMPLETE_DIST}.tmp
+complete: update ${POPCORN_SRC} ${MODULES_SRC} ${PARSERS_SRC} ${PLUGINS_SRC} ${PLAYERS_SRC} $(EFFECTS_SRC) ${DIST_DIR}
+	@@echo "Building popcorn + modules + plugins + parsers + players + effects..."
+	@@cat ${POPCORN_SRC} ${MODULES_SRC} ${PLUGINS_SRC} ${PARSERS_SRC} ${PLAYERS_SRC} $(EFFECTS_SRC) > ${POPCORN_COMPLETE_DIST}.tmp
 	@@$(call add_license, ${POPCORN_COMPLETE_DIST}.tmp, ${POPCORN_COMPLETE_DIST})
 	@@rm ${POPCORN_COMPLETE_DIST}.tmp
 
@@ -164,6 +186,10 @@ lint-core-tests:
 	@@echo "Checking core unit tests against JSLint..."
 	@@$(call run_lint,test/popcorn.unit.js)
 
+lint-modules:
+	@@echo "Checking all modules against JSLint..."
+	@@$(call run_lint,$(MODULES_SRC))
+
 lint-plugins:
 	@@echo "Checking all plugins against JSLint..."
 	@@$(call run_lint,$(PLUGINS_SRC))
@@ -180,6 +206,10 @@ lint-effects:
 	@@echo "Checking all effects against JSLint..."
 	@@$(call run_lint,$(EFFECTS_SRC))
 
+lint-modules-tests:
+	@@echo "Checking modules unit tests against JSLint..."
+	@@$(call run_lint,$(MODULES_UNIT))
+
 lint-plugin-tests:
 	@@echo "Checking plugin unit tests against JSLint..."
 	@@$(call run_lint,$(PLUGINS_UNIT))
@@ -216,6 +246,7 @@ testing: complete
 	@@rm -fr ${TESTING_MIRROR}/AUTHORS ${TESTING_MIRROR}/LICENSE ${TESTING_MIRROR}/LICENSE_HEADER \
            ${TESTING_MIRROR}/Makefile ${TESTING_MIRROR}/readme.md
 	@@touch "${TESTING_MIRROR}/THIS IS A TESTING MIRROR -- READ-ONLY"
+	$(call overwrite_js, ${TESTING_MIRROR}/modules)
 	$(call overwrite_js, ${TESTING_MIRROR}/plugins)
 	$(call overwrite_js, ${TESTING_MIRROR}/players)
 	$(call overwrite_js, ${TESTING_MIRROR}/parsers)
diff --git a/modules/timeline-sources/popcorn.timeline-sources.unit.html b/modules/timeline-sources/popcorn.timeline-sources.unit.html
index 122aee3b1..c9578fe82 100644
--- a/modules/timeline-sources/popcorn.timeline-sources.unit.html
+++ b/modules/timeline-sources/popcorn.timeline-sources.unit.html
@@ -19,7 +19,7 @@ <h2 id="qunit-userAgent"></h2>
   <div id="qunit-fixture">  </div>
 
   <video id='video'
-    controls preload='none'
+    controls preload='auto'
     width= '250px'
     poster="../../test/poster.png"
     data-timeline-sources="../../parsers/parserJSON/data/video.json">
diff --git a/modules/timeline-sources/popcorn.timeline-sources.unit.js b/modules/timeline-sources/popcorn.timeline-sources.unit.js
index e48f174dd..362158b9f 100644
--- a/modules/timeline-sources/popcorn.timeline-sources.unit.js
+++ b/modules/timeline-sources/popcorn.timeline-sources.unit.js
@@ -50,7 +50,8 @@
     expect( 3 );
 
     var count = 0,
-        p = Popcorn.getInstanceById( "video" );
+        p = Popcorn.getInstanceById( "video" )
+        .volume( 0 );
 
     function plus() {
       if ( ++count === 3 ) {

From 11f85f10fb815372cdffeceee8e998533abdc12b Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Mon, 19 Sep 2011 11:17:38 -0400
Subject: [PATCH 062/140] forgot to add line in the Makefile

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 08ed9f964..519466185 100644
--- a/Makefile
+++ b/Makefile
@@ -226,7 +226,7 @@ lint-player-tests:
 	@@echo "Checking player unit tests against JSLint..."
 	@@$(call run_lint,$(PLAYERS_UNIT))
 
-lint-unit-tests: lint-plugin-tests lint-parser-tests lint-player-tests lint-effects-tests
+lint-unit-tests: lint-modules-tests lint-plugin-tests lint-parser-tests lint-player-tests lint-effects-tests
 	@@echo "completed"
 
 # Create a mirror copy of the tree in dist/ using popcorn-complete.js

From 799fd39f94b4c1f76eace6482f86d631a7b887c6 Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Mon, 19 Sep 2011 11:47:06 -0400
Subject: [PATCH 063/140] [#724] Removes Popcorn instance management code.
 Retains only Popcorn.instances array

---
 parsers/parserJSON/popcorn.parserJSON.unit.js |  2 +-
 popcorn.js                                    | 55 +---------------
 test/popcorn.unit.js                          | 65 -------------------
 3 files changed, 3 insertions(+), 119 deletions(-)

diff --git a/parsers/parserJSON/popcorn.parserJSON.unit.js b/parsers/parserJSON/popcorn.parserJSON.unit.js
index b63d04ac6..dd05c5783 100644
--- a/parsers/parserJSON/popcorn.parserJSON.unit.js
+++ b/parsers/parserJSON/popcorn.parserJSON.unit.js
@@ -85,7 +85,7 @@ test("Popcorn 0.3 JSON Parser Plugin - AUDIO", function () {
       trackData,
       trackEvents,
       interval,
-      audiocorn = Popcorn.getInstanceById("audio");
+      audiocorn = Popcorn("#audio");
 
   function plus() {
     if ( ++count === expects ) {
diff --git a/popcorn.js b/popcorn.js
index e2c7320a7..16f3e7570 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -4,8 +4,7 @@
   if ( !document.addEventListener ) {
     global.Popcorn = {};
 
-    var methods = ( "removeInstance addInstance getInstanceById removeInstanceById " +
-          "forEach extend effects error guid sizeOf isArray nop position disable enable " +
+    var methods = ( "forEach extend effects error guid sizeOf isArray nop position disable enable " +
           "addTrackEvent removeTrackEvent getTrackEvents getTrackEvent getLastTrackEventId " +
           "timeUpdate plugin removePlugin compose effect parser xhr getJSONP getScript" ).split(/\s+/);
 
@@ -63,56 +62,6 @@
 
   //  Instance caching
   Popcorn.instances = [];
-  Popcorn.instanceIds = {};
-
-  Popcorn.removeInstance = function( instance ) {
-    //  If called prior to any instances being created
-    //  Return early to avoid splicing on nothing
-    if ( !Popcorn.instances.length ) {
-      return;
-    }
-
-    //  Remove instance from Popcorn.instances
-    Popcorn.instances.splice( Popcorn.instanceIds[ instance.id ], 1 );
-
-    //  Delete the instance id key
-    delete Popcorn.instanceIds[ instance.id ];
-
-    //  Return current modified instances
-    return Popcorn.instances;
-  };
-
-  //  Addes a Popcorn instance to the Popcorn instance array
-  Popcorn.addInstance = function( instance ) {
-
-    var instanceLen = Popcorn.instances.length,
-        instanceId = instance.media.id && instance.media.id;
-
-    //  If the media element has its own `id` use it, otherwise provide one
-    //  Ensure that instances have unique ids and unique entries
-    //  Uses `in` operator to avoid false positives on 0
-    instance.id = !( instanceId in Popcorn.instanceIds ) && instanceId ||
-                    "__popcorn" + instanceLen;
-
-    //  Create a reference entry for this instance
-    Popcorn.instanceIds[ instance.id ] = instanceLen;
-
-    //  Add this instance to the cache
-    Popcorn.instances.push( instance );
-
-    //  Return the current modified instances
-    return Popcorn.instances;
-  };
-
-  //  Request Popcorn object instance by id
-  Popcorn.getInstanceById = function( id ) {
-    return Popcorn.instances[ Popcorn.instanceIds[ id ] ];
-  };
-
-  //  Remove Popcorn object instance by id
-  Popcorn.removeInstanceById = function( id ) {
-    return Popcorn.removeInstance( Popcorn.instances[ Popcorn.instanceIds[ id ] ] );
-  };
 
   //  Declare a shortcut (Popcorn.p) to and a definition of
   //  the new prototype for our Popcorn constructor
@@ -179,7 +128,7 @@
       this[ ( this.media.nodeName && this.media.nodeName.toLowerCase() ) || "video" ] = this.media;
 
       //  Register new instance
-      Popcorn.addInstance( this );
+      Popcorn.instances.push( this );
 
       this.options = options || {};
 
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 6dfff8f49..bc87d45f1 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -222,66 +222,6 @@ test("Popcorn.util.toSeconds" , function() {
   }
 });
 
-test("Instances", function() {
-  var expects = 11,
-      count   = 0,
-      instance;
-
-  expect(expects);
-
-  function plus(){
-    if ( ++count == expects ) {
-      start();
-    }
-  }
-
-  stop();
-
-  Popcorn("#video");
-
-  ok( typeof Popcorn.addInstance === "function" , "Popcorn.addInstance is a provided static function");
-  plus();
-
-  ok( typeof Popcorn.removeInstance === "function" , "Popcorn.removeInstance is a provided static function");
-  plus();
-
-  ok( typeof Popcorn.getInstanceById === "function" , "Popcorn.getInstanceById is a provided static function");
-  plus();
-
-  ok( typeof Popcorn.removeInstanceById === "function" , "Popcorn.removeInstanceById is a provided static function");
-  plus();
-
-  ok( typeof Popcorn.instanceIds === "object" , "Popcorn.instanceIds is a provided cache object");
-  plus();
-
-  ok( "length" in Popcorn.instances && "join" in Popcorn.instances, "Popcorn.instances is a provided cache array");
-  plus();
-
-  instance = Popcorn.getInstanceById("video");
-
-  ok( instance.video, "Stored instance as a `video` property" );
-  plus();
-
-  ok( instance.data, "Stored instance as a `data` property" );
-  plus();
-
-  ok( instance instanceof Popcorn, "Instance instanceof Popcorn" );
-  plus();
-
-  equal( Popcorn.instances.length, 2, "There are the correct number of Popcorn instances" );
-  plus();
-
-  //  Create another instance
-  Popcorn("#video");
-
-  //  Get a reference to remove
-  var remove = Popcorn.instances[1];
-
-  //  Remove and check the length of the currently cached instances
-  equal( Popcorn.removeInstanceById( remove.id ).length, 2, "Removing an instance by id: 1 instance remains" );
-  plus();
-});
-
 test("guid", function() {
 
   expect(6);
@@ -477,8 +417,6 @@ test("Popcorn.[addTrackEvent | removeTrackEvent].ref()", function() {
   });
 
   equal( Popcorn.sizeOf( popped.data.trackRefs ), 0, "There are 0 trackRefs in popped.data.trackRefs" );
-
-  //Popcorn.removeInstance( popped );
 });
 
 
@@ -812,7 +750,6 @@ test( "Popcorn.locale object", function() {
   function plus() {
     if ( ++count == expects ) {
       start();
-      Popcorn.removeInstance( $pop );
     }
   }
 
@@ -2909,8 +2846,6 @@ test("Popcorn.disable/enable/toggle (timeupdate)", function() {
   function plus() {
     if ( ++count === expects ) {
       start();
-
-      Popcorn.removeInstance( $pop );
       Popcorn.removePlugin( "toggler" );
     }
   }

From 9ad1f334cc5b08020bf36abdaa51cacb97703ebc Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Tue, 20 Sep 2011 09:21:15 -0400
Subject: [PATCH 064/140] added in destroy function and unit tests.
 testDestroy.html is only for this commit to show what I mean to others

---
 popcorn.js           | 43 ++++++++++++++++++++++---
 test/popcorn.unit.js | 74 ++++++++++++++++++++++++++++++++++++++++++++
 testDestroy.html     | 48 ++++++++++++++++++++++++++++
 3 files changed, 161 insertions(+), 4 deletions(-)
 create mode 100644 testDestroy.html

diff --git a/popcorn.js b/popcorn.js
index e2c7320a7..6db21a980 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -4,7 +4,7 @@
   if ( !document.addEventListener ) {
     global.Popcorn = {};
 
-    var methods = ( "removeInstance addInstance getInstanceById removeInstanceById " +
+    var methods = ( "removeInstance destroy addInstance getInstanceById removeInstanceById " +
           "forEach extend effects error guid sizeOf isArray nop position disable enable " +
           "addTrackEvent removeTrackEvent getTrackEvents getTrackEvent getLastTrackEventId " +
           "timeUpdate plugin removePlugin compose effect parser xhr getJSONP getScript" ).split(/\s+/);
@@ -82,6 +82,29 @@
     return Popcorn.instances;
   };
 
+  Popcorn.destroy = function( instance ) {
+    var events = instance.data.events,
+        singleEvent;
+
+    //  Iterate through all events and remove them
+    for( item in events ) {
+      singleEvent = events[ item ];
+      for( fn in singleEvent ) {
+        delete singleEvent[ fn ];
+      }
+      events[ item ] = null;
+    }
+
+    //instance.media.removeEventListener( "timeupdate", function( event ) {
+      //console.log("HERE");
+      //Popcorn.timeUpdate( that, event );
+    //}, false );
+
+    instance.media.removeEventListener( "timeupdate", instance.data.timeUpdateFunction, false );
+
+    Popcorn.removeInstance( instance );
+  };
+
   //  Addes a Popcorn instance to the Popcorn instance array
   Popcorn.addInstance = function( instance ) {
 
@@ -259,10 +282,17 @@
 
           } else {
 
-            that.media.addEventListener( "timeupdate", function( event ) {
+        that.data.timeUpdateFunction = function( event ) {
+          console.log( "here" );
+          Popcorn.timeUpdate( that, event );
+        }
 
-              Popcorn.timeUpdate( that, event );
-            }, false );
+         //  that.media.addEventListener( "timeupdate", function( event ) {
+           //  console.log("HERE");
+            // Popcorn.timeUpdate( that, event );
+           //}, false );
+           //
+           that.media.addEventListener( "timeupdate", that.data.timeUpdateFunction, false );
           }
         } else {
           global.setTimeout(function() {
@@ -1143,6 +1173,11 @@
     timeUpdate: function( event ) {
       Popcorn.timeUpdate.call( null, this, event );
       return this;
+    },
+
+    destroy: function() {
+      Popcorn.destroy.call( null, this );
+      return this;
     }
   });
 
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 6dfff8f49..77417f6ff 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -282,6 +282,80 @@ test("Instances", function() {
   plus();
 });
 
+test( "Popcorn.destroy", function() {
+  var popcorn = Popcorn( "#video" ),
+      expects = 8,
+      count = 0,
+      playCounter = 0,
+      timeUpdateCounter = 0;
+
+  expect( expects );
+
+  function plus() {
+    if( ++count === expects ) {
+      start();
+    }
+  }
+
+  function howMany() {
+    var counter = 0;
+
+    for( things in popcorn.data.events ) {
+      counter++;
+    }
+
+    return counter;
+  }
+
+  stop();
+
+  //  initially no listeners
+  equals( howMany(), 0, "Initially no events have been added" );
+  plus();
+
+  equals( playCounter, 0, "playCounter is intially 0" );
+  plus();
+
+  equals( timeUpdateCounter, 0, "timeUpdateCounter is intially 0" );
+  plus();
+
+  //  add some event listeners for testing
+  popcorn.listen( "timeupdate", function( event ) { timeUpdateCounter++; }, false );
+  popcorn.listen( "play", function( event ) { playCounter++; }, false );
+
+  popcorn.play( 0 );
+
+  popcorn.exec( 1, function() {
+    popcorn.pause();
+
+    equals( howMany(), 2, "popcorn.data.events has correct number of events - before Popcorn.destroy" );
+    plus();
+
+    equals( playCounter, 1, "playCounter triggered exactly 1 time" );
+    plus();
+
+    equals( timeUpdateCounter, 4, "timeUpdateCounter triggered exactly 4 times" );
+    plus();
+
+    playCounter = timeUpdateCounter = 0;
+
+    popcorn.destroy();
+    popcorn.currentTime( 0 ).play();
+
+    popcorn.exec( 0.25, function() {
+      popcorn.pause();
+
+      equals( playCounter, 0, "playCounter was not triggered - after destroy called" );
+      plus();
+
+      equals( timeUpdateCounter, 0, "timeUpdateCounter was not triggered - after destroy called" );
+      plus();
+    });
+
+  });
+
+});
+
 test("guid", function() {
 
   expect(6);
diff --git a/testDestroy.html b/testDestroy.html
new file mode 100644
index 000000000..94c389458
--- /dev/null
+++ b/testDestroy.html
@@ -0,0 +1,48 @@
+<html>
+  <head>
+    <script src="popcorn.js"></script>
+    <script>
+    var popcorn;
+
+    function destroy() {
+      Popcorn.destroy( popcorn );
+    }
+
+
+      document.addEventListener( "DOMContentLoaded", function( event ) {
+        popcorn = Popcorn( "#video" );
+        
+        popcorn.listen( "timeupdate", function() { });
+        popcorn.listen( "play", function() {});
+
+        for( item in popcorn.data.events ) {
+          console.log( "EVENT: ", popcorn.data.events[ item ] );
+        }
+
+      }, false );
+    </script>
+  </head>
+  <body>
+    <button onclick="destroy()">DESTROY</button>
+  
+  <video id='video'
+    style="display:;width:300px"
+    controls
+    preload="auto">
+
+    <source id='mp4'
+      src="test/trailer.mp4"
+      type='video/mp4; codecs="avc1, mp4a"'>
+
+    <source id='ogv'
+      src="test/trailer.ogv"
+      type='video/ogg; codecs="theora, vorbis"'>
+      
+    <source id='webm'
+      src="test/trailer.webm"
+      type='video/webm; codecs="vp8, vorbis"'>
+
+    <p>Your user agent does not support the HTML5 Video element.</p>
+  </video>
+  </body>
+</html>

From a9cb7b620f3bd267b04b70b5c0122ce6e80a7758 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Tue, 20 Sep 2011 10:12:09 -0400
Subject: [PATCH 065/140] Actual test commit without comments and such

---
 popcorn.js       | 26 ++++++++++----------------
 testDestroy.html |  4 +++-
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index 6db21a980..de90f0fc3 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -95,12 +95,11 @@
       events[ item ] = null;
     }
 
-    //instance.media.removeEventListener( "timeupdate", function( event ) {
-      //console.log("HERE");
-      //Popcorn.timeUpdate( that, event );
-    //}, false );
-
-    instance.media.removeEventListener( "timeupdate", instance.data.timeUpdateFunction, false );
+    if ( instance.media.readyState >= 2 ) {
+      instance.media.removeEventListener( "timeupdate", instance.data.timeUpdateFunction, false );
+    } else {
+      throw ( "Attempting to remove event listener before event has been added!" );
+    }  
 
     Popcorn.removeInstance( instance );
   };
@@ -282,17 +281,12 @@
 
           } else {
 
-        that.data.timeUpdateFunction = function( event ) {
-          console.log( "here" );
-          Popcorn.timeUpdate( that, event );
-        }
+            that.data.timeUpdateFunction = function( event ) {
+              console.log( "in time update" );
+              Popcorn.timeUpdate( that, event );
+            }
 
-         //  that.media.addEventListener( "timeupdate", function( event ) {
-           //  console.log("HERE");
-            // Popcorn.timeUpdate( that, event );
-           //}, false );
-           //
-           that.media.addEventListener( "timeupdate", that.data.timeUpdateFunction, false );
+            that.media.addEventListener( "timeupdate", that.data.timeUpdateFunction, false );
           }
         } else {
           global.setTimeout(function() {
diff --git a/testDestroy.html b/testDestroy.html
index 94c389458..ca6b604df 100644
--- a/testDestroy.html
+++ b/testDestroy.html
@@ -5,7 +5,7 @@
     var popcorn;
 
     function destroy() {
-      Popcorn.destroy( popcorn );
+      popcorn.destroy();
     }
 
 
@@ -19,6 +19,8 @@
           console.log( "EVENT: ", popcorn.data.events[ item ] );
         }
 
+        //popcorn.destroy();
+
       }, false );
     </script>
   </head>

From 313432654b7cccae67ceab9ea55e8b36a291dc7c Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Tue, 20 Sep 2011 11:29:58 -0400
Subject: [PATCH 066/140] Moved destroy around, fixed some leaking variables,
 abandoned error throwing for cleaner apporach

---
 popcorn.js       | 48 +++++++++++++++++++++-------------------------
 testDestroy.html | 50 ------------------------------------------------
 2 files changed, 22 insertions(+), 76 deletions(-)
 delete mode 100644 testDestroy.html

diff --git a/popcorn.js b/popcorn.js
index de90f0fc3..fe15842fe 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -4,8 +4,8 @@
   if ( !document.addEventListener ) {
     global.Popcorn = {};
 
-    var methods = ( "removeInstance destroy addInstance getInstanceById removeInstanceById " +
-          "forEach extend effects error guid sizeOf isArray nop position disable enable " +
+    var methods = ( "removeInstance addInstance getInstanceById removeInstanceById " +
+          "forEach extend effects error guid sizeOf isArray nop position disable enable destroy " +
           "addTrackEvent removeTrackEvent getTrackEvents getTrackEvent getLastTrackEventId " +
           "timeUpdate plugin removePlugin compose effect parser xhr getJSONP getScript" ).split(/\s+/);
 
@@ -32,6 +32,7 @@
   readyStack = [],
   readyBound = false,
   readyFired = false,
+  isDestroyed = false,
 
   //  Non-public internal data object
   internal = {
@@ -82,28 +83,6 @@
     return Popcorn.instances;
   };
 
-  Popcorn.destroy = function( instance ) {
-    var events = instance.data.events,
-        singleEvent;
-
-    //  Iterate through all events and remove them
-    for( item in events ) {
-      singleEvent = events[ item ];
-      for( fn in singleEvent ) {
-        delete singleEvent[ fn ];
-      }
-      events[ item ] = null;
-    }
-
-    if ( instance.media.readyState >= 2 ) {
-      instance.media.removeEventListener( "timeupdate", instance.data.timeUpdateFunction, false );
-    } else {
-      throw ( "Attempting to remove event listener before event has been added!" );
-    }  
-
-    Popcorn.removeInstance( instance );
-  };
-
   //  Addes a Popcorn instance to the Popcorn instance array
   Popcorn.addInstance = function( instance ) {
 
@@ -282,11 +261,10 @@
           } else {
 
             that.data.timeUpdateFunction = function( event ) {
-              console.log( "in time update" );
               Popcorn.timeUpdate( that, event );
             }
 
-            that.media.addEventListener( "timeupdate", that.data.timeUpdateFunction, false );
+            !isDestroyed && that.media.addEventListener( "timeupdate", that.data.timeUpdateFunction, false );
           }
         } else {
           global.setTimeout(function() {
@@ -420,6 +398,24 @@
       }
 
       return instance;
+    },
+    destroy: function( instance ) {
+      var events = instance.data.events,
+          singleEvent, item, fn;
+
+      //  Iterate through all events and remove them
+      for ( item in events ) {
+        singleEvent = events[ item ];
+        for ( fn in singleEvent ) {
+          delete singleEvent[ fn ];
+        }
+        events[ item ] = null;
+      }
+
+      instance.media.removeEventListener( "timeupdate", instance.data.timeUpdateFunction, false );
+      isDestroyed = true;
+
+      Popcorn.removeInstance( instance );
     }
   });
 
diff --git a/testDestroy.html b/testDestroy.html
deleted file mode 100644
index ca6b604df..000000000
--- a/testDestroy.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<html>
-  <head>
-    <script src="popcorn.js"></script>
-    <script>
-    var popcorn;
-
-    function destroy() {
-      popcorn.destroy();
-    }
-
-
-      document.addEventListener( "DOMContentLoaded", function( event ) {
-        popcorn = Popcorn( "#video" );
-        
-        popcorn.listen( "timeupdate", function() { });
-        popcorn.listen( "play", function() {});
-
-        for( item in popcorn.data.events ) {
-          console.log( "EVENT: ", popcorn.data.events[ item ] );
-        }
-
-        //popcorn.destroy();
-
-      }, false );
-    </script>
-  </head>
-  <body>
-    <button onclick="destroy()">DESTROY</button>
-  
-  <video id='video'
-    style="display:;width:300px"
-    controls
-    preload="auto">
-
-    <source id='mp4'
-      src="test/trailer.mp4"
-      type='video/mp4; codecs="avc1, mp4a"'>
-
-    <source id='ogv'
-      src="test/trailer.ogv"
-      type='video/ogg; codecs="theora, vorbis"'>
-      
-    <source id='webm'
-      src="test/trailer.webm"
-      type='video/webm; codecs="vp8, vorbis"'>
-
-    <p>Your user agent does not support the HTML5 Video element.</p>
-  </video>
-  </body>
-</html>

From a3fdc5d53fb0d77cc229c2282b889adab5c536d1 Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Tue, 6 Sep 2011 17:36:24 -0400
Subject: [PATCH 067/140] [#423] one baseplayer to rule them all.

[#423] updates to initial baseplayer code to work better with custom players

[#423] a fix to media function calls; added return statement

[#423] pulling initial work into proper repo location, fixing tests

[423] finished youtube player and tests for youtube player and baseplayer
---
 players/youtube/popcorn.youtube.html    |  15 +-
 players/youtube/popcorn.youtube.js      | 635 +++++-------------------
 players/youtube/popcorn.youtube.unit.js | 457 +++++++++++------
 popcorn.js                              | 159 ++++++
 test/popcorn.unit.js                    | 185 +++++++
 5 files changed, 781 insertions(+), 670 deletions(-)

diff --git a/players/youtube/popcorn.youtube.html b/players/youtube/popcorn.youtube.html
index 1deb38290..9700f77da 100644
--- a/players/youtube/popcorn.youtube.html
+++ b/players/youtube/popcorn.youtube.html
@@ -15,6 +15,7 @@
       <script>
         // Helper function to get elements
         function element(id) {
+
           return document.getElementById(id);
         }
         
@@ -22,7 +23,7 @@
           var paused = true,
               popcorn;
           
-          popcorn = Popcorn( Popcorn.youtube( 'video', 'http://www.youtube.com/watch?v=9oar9glUCL0', { width: 400, controls: 0, annotations: 3 } ) );
+          popcorn = Popcorn.youtube( '#video', 'http://www.youtube.com/watch?v=9oar9glUCL0' );
           
           popcorn = popcorn
             .footnote({
@@ -94,19 +95,18 @@
             element( 'player-time' ).innerHTML = popcorn.currentTime();
           })
           // Update button labels
-          .listen( 'playing' , function() {
+          .listen( 'play' , function() {
             paused = false;
             element( 'btn-play-pause' ).innerHTML = 'Pause';
           })
           .listen('pause', function() {
             paused = true;
             element( 'btn-play-pause' ).innerHTML = 'Play';
-          })
-          popcorn.mute()
-          .play();
-            
+          });
+
           // Setup UI after loaded
           popcorn.listen( 'load', function() {
+
             element( 'player-status' ).innerHTML = 'Ready';
             element( 'player_vol' ).innerHTML = popcorn.volume();
             
@@ -121,6 +121,7 @@
 
             // Seek
             element('btn-seek').addEventListener('click', function() {
+
               popcorn.currentTime( 30 );
             }, false);
 
@@ -131,7 +132,7 @@
             }, false);
             
             element('btn-mute').addEventListener('click', function() {
-              popcorn.mute();
+              popcorn.mute( !popcorn.media.muted );
             }, false);
           });
         }, false );
diff --git a/players/youtube/popcorn.youtube.js b/players/youtube/popcorn.youtube.js
index d98b521aa..7d35dca78 100755
--- a/players/youtube/popcorn.youtube.js
+++ b/players/youtube/popcorn.youtube.js
@@ -1,558 +1,187 @@
-// Popcorn Youtube Player Wrapper
-
-var onYouTubePlayerReady;
-
-( function( Popcorn ) {
-  /**
-   * Youtube wrapper for popcorn.
-   * This plug-in adds capability for Popcorn.js to deal with Youtube
-   * videos. This plug-in also doesn't use Popcorn's plugin() API and
-   * instead hacks directly into Popcorn's core.
-   *
-   * To use this plug-in, onYouTubePlayerReady() event handler needs to be
-   * called by the Youtube video player, before videos can be registered.
-   * Once videos are registered, calls to them can be made the same way as
-   * regular Popcorn objects. Also note that enablejsapi=1 needs to be added
-   * to the embed code, in order for Youtube's JavaScript API to work.
-   *
-   * Note that there are a few methods, properties and events that are not
-   * supported. See the bottom of this plug-in for a complete list.
-   */
-
-  // Intended
-  var undef;
-
-  // Config parameters
-  // 33 ms per update is suitable for 30 fps
-  // 0.05 sec tolerance between old and new times to determine if currentTime has been set programatically
-  // 250 ms progress interval as specified by WHATWG
-  var timeupdateInterval = 33,
-      timeCheckInterval = 0.5,
-      progressInterval = 250;
-
-  // Ready State Constants
-  var READY_STATE_HAVE_NOTHING = 0,
-      READY_STATE_HAVE_METADATA = 1,
-      READY_STATE_HAVE_CURRENT_DATA = 2,
-      READY_STATE_HAVE_FUTURE_DATA = 3,
-      READY_STATE_HAVE_ENOUGH_DATA = 4;
-
-  // Youtube State Constants
-  var YOUTUBE_STATE_UNSTARTED = -1,
-      YOUTUBE_STATE_ENDED = 0,
-      YOUTUBE_STATE_PLAYING = 1,
-      YOUTUBE_STATE_PAUSED = 2,
-      YOUTUBE_STATE_BUFFERING = 3,
-      YOUTUBE_STATE_CUED = 5;
-
-  var urlRegex = /^.*[\/=](.{11})/;
-
-  // Collection of all Youtube players
-  var registry = {},
-      loadedPlayers = {};
-
-  var abs = Math.abs;
-
-  Popcorn.getScript( "http://ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js" );
-
-  // Extract the id from a web url
-  function extractIdFromUrl( url ) {
-    if ( !url ) {
-      return;
-    }
-
-    var matches = urlRegex.exec( url );
+// A global callback for youtube... that makes me angry
+var onYouTubePlayerReady = function( containerId ) {
 
-    // Return id, which comes after first equals sign
-    return matches ? matches[1] : "";
-  }
+  onYouTubePlayerReady[ containerId ] && onYouTubePlayerReady[ containerId ]();
+};
+onYouTubePlayerReady.stateChangeEventHandler = {};
 
-  // Extract the id from a player url
-  function extractIdFromUri( url ) {
-    if ( !url ) {
-      return;
-    }
+Popcorn.player( "youtube", {
+  _setup: function( options ) {
 
-    var matches = urlRegex.exec( url );
+    var media = this,
+        player = {},
+        youtubeObject,
+        container = document.createElement( "div" ),
+        currentTime = 0,
+        seekTime = 0,
+        seeking = false,
+        dataLoaded = false;
 
-    // Return id, which comes after first equals sign
-    return matches ? matches[1] : "";
-  }
+    container.id = media.id + Popcorn.guid();
 
-  function getPlayerAddress( vidId, playerId ) {
-    if( !vidId ) {
-      return;
-    }
+    media.appendChild( container );
 
-    return "http://www.youtube.com/e/" + id;
-  }
+    var youtubeInit = function() {
 
-  function makeSWF( url, container ) {
-    var bounds,
-        params,
-        flashvars,
-        attributes,
-        self = this;
+      // expose a callback to this scope, that is called from the global callback youtube calls
+      onYouTubePlayerReady[ container.id ] = function() {
 
-    if ( !window.swfobject ) {
-      setTimeout( function() {
-        makeSWF.call( self, url, container );
-      }, 1 );
-      return;
-    }
+        youtubeObject = document.getElementById( container.id );
 
-    bounds = container.getBoundingClientRect();
+        // more youtube callback nonsense
+        onYouTubePlayerReady.stateChangeEventHandler[ container.id ] = function( state ) {
 
-    // Determine width/height/etc based on container
-    this.width = container.style.width || 460;
-    this.height = container.style.height || 350;
+          // playing is state 1
+          // paused is state 2
+          if ( state === 1 ) {
 
-    // Just in case we got the attributes as strings. We'll need to do math with these later
-    this.width = parseFloat(this.width);
-    this.height = parseFloat(this.height);
+            media.paused && media.play();
+          // youtube fires paused events while seeking
+          // this is the only way to get seeking events
+          } else if ( state === 2 ) {
 
-    // For calculating position relative to video (like subtitles)
-    this.offsetWidth = this.width;
-    this.offsetHeight = this.height;
-    this.offsetLeft = bounds.left;
-    this.offsetTop = bounds.top;
+            // silly logic forced on me by the youtube API
+            // calling youtube.seekTo triggers multiple events
+            // with the second events getCurrentTime being the old time
+            if ( seeking && seekTime === currentTime && seekTime !== youtubeObject.getCurrentTime() ) {
 
-    this.offsetParent = container.offsetParent;
+              seeking = false;
+              youtubeObject.seekTo( currentTime );
+              return;
+            }
 
-    flashvars = {
-      playerapiid: this.playerId,
-      controls: this.controls,
-      iv_load_policy: this.iv_load_policy
-    };
+            currentTime = youtubeObject.getCurrentTime();
+            media.dispatchEvent( "timeupdate" );
+            !media.paused && media.pause();
+          }
+        };
 
-    params = {
-      allowscriptaccess: 'always',
-      allowfullscreen: 'true',
-      // This is so we can overlay html on top of Flash
-      wmode: 'transparent'
+        // youtube requires callbacks to be a string to a function path from the global scope
+        youtubeObject.addEventListener( "onStateChange", "onYouTubePlayerReady.stateChangeEventHandler." + container.id );
 
-    };
+        var timeupdate = function() {
 
-    attributes = {
-      id: this.playerId
-    };
+          currentTime = youtubeObject.getCurrentTime();
+          media.dispatchEvent( "timeupdate" );
+          timeout = setTimeout( timeupdate, 10 );
+        };
 
-    swfobject.embedSWF( "http://www.youtube.com/e/" + this.vidId +"?enablejsapi=1&playerapiid=" + this.playerId + "&version=3",
-                      this.playerId, this.width, this.height, "8", null, flashvars, params, attributes );
-  }
+        media.play = function() {
 
-  // Called when a player is loaded
-  // Playerid must match the element id
-  onYouTubePlayerReady = function ( playerId ) {
-    var vid = registry[playerId];
+          media.paused = false;
+          media.dispatchEvent( "play" );
 
-    loadedPlayers[playerId] = 1;
+          if ( dataLoaded ) {
 
-    // Video hadn't loaded yet when ctor was called
-    vid.video = document.getElementById( playerId );
-    vid.duration = vid.video.getDuration();
+            media.dispatchEvent( "loadeddata" );
+            dataLoaded = false;
+          }
 
+          media.dispatchEvent( "playing" );
+          timeupdate();
+          youtubeObject.playVideo();
+        };
 
-    // Issue load event
-    vid.dispatchEvent( 'load' );
-    vid.dispatchEvent( "durationchange" );
-  };
+        media.pause = function() {
 
-  Popcorn.youtube = function( elementId, url, options ) {
-    return new Popcorn.youtube.init( elementId, url, options );
-  };
+          if ( !media.paused ) {
 
-  Popcorn.youtube.init = function( elementId, url, options ) {
-    if ( !elementId ) {
-      throw "Element id is invalid.";
-    } else if ( /file/.test( location.protocol ) ) {
-      throw "This must be run from a web server.";
-    }
+            media.paused = true;
+            media.dispatchEvent( "pause" );
+            youtubeObject.pauseVideo();
+          }
+        };
 
-    options = options || {};
+        media.__defineSetter__( "currentTime", function( val ) {
 
-    var self = this;
+          // make sure val is a number
+          currentTime = seekTime = +val;
+          seeking = true;
+          media.dispatchEvent( "seeked" );
+          media.dispatchEvent( "timeupdate" );
+          youtubeObject.seekTo( currentTime );
+          return currentTime;
+        });
 
-    this.playerId = elementId + Popcorn.guid();
-    this.readyState = READY_STATE_HAVE_NOTHING;
-    this._eventListeners = {};
-    this.loadStarted = false;
-    this.loadedData = false;
-    this.fullyLoaded = false;
-    this.paused = false;
+        media.__defineGetter__( "currentTime", function() {
 
-    // If supplied as number, append  'px' on end
-    // If suppliied as '###' or '###px', convert to number and append 'px' back on end
-    options.width = options.width && (+options.width)+"px";
-    options.height = options.height && (+options.height)+"px";
+          return currentTime;
+        });
 
-    // show controls on video. Integer value - 1 is for show, 0 is for hide
-    this.controls = +options.controls === 0 || +options.controls === 1 ? options.controls : 1;
+        media.__defineSetter__( "muted", function( val ) {
 
-    // show video annotations, 1 is show, 3 is hide
-    this.iv_load_policy = +options.annotations === 1 || +options.annotations === 3 ? options.annotations : 1;
+          if ( youtubeObject.isMuted() !== val ) {
 
-    this._target = document.getElementById( elementId );
-    this._container = document.createElement( "div" );
-    this._container.id = this.playerId;
-    this._container.style.height = this._target.style.height = options.height || this._target.style.height || "350px";
-    this._container.style.width  = this._target.style.width  = options.width || this._target.style.width  || "460px";
-    this._target.appendChild( this._container );
-    this.parentNode = this._target.parentNode;
+            if ( val ) {
 
-    this.offsetHeight = +this._target.offsetHeight;
-    this.offsetWidth = +this._target.offsetWidth;
+              youtubeObject.mute();
+            } else {
 
-    this.currentTime = this.previousCurrentTime = 0;
-    this.volume = this.previousVolume = this.preMuteVol = 1;
-    this.duration = 0;
+              youtubeObject.unMute();
+            }
 
-    this.vidId = extractIdFromUrl( url ) || extractIdFromUri( url );
+            media.dispatchEvent( "volumechange" );
+          }
 
-    if ( !this.vidId ) {
-      throw "Could not find video id";
-    }
+          return youtubeObject.isMuted();
+        });
 
-    this.addEventListener( "load", function() {
-      // For calculating position relative to video (like subtitles)
-      this.offsetWidth = this.video.offsetWidth;
-      this.offsetHeight = this.video.offsetHeight;
-      this.offsetParent = this.video.offsetParent;
+        media.__defineGetter__( "muted", function() {
 
-      // Set up stuff that requires the API to be loaded
-      this.registerYoutubeEventHandlers();
-      this.registerInternalEventHandlers();
-    });
+          return youtubeObject.isMuted();
+        });
 
-    (function() {
-      var hasBeenCalled = 0;
+        media.__defineSetter__( "volume", function( val ) {
 
-      self.addEventListener( "playing", function() {
-        if (hasBeenCalled) {
-          return;
-        }
+          if ( youtubeObject.getVolume() !== val ) {
 
-        hasBeenCalled = 1;
-        self.duration = self.video.getDuration();
-        self.dispatchEvent( "durationchange" );
+            youtubeObject.setVolume( val );
+            media.dispatchEvent( "volumechange" );
+          }
 
-      });
-    })();
+          return youtubeObject.getVolume();
+        });
 
-    if ( loadedPlayers[this.playerId] ) {
-      this.video = registry[this.playerId].video;
+        media.__defineGetter__( "volume", function() {
 
-      this.vidId = this.vidId || extractIdFromUrl( this._container.getAttribute( "src" ) ) || extractIdFromUri( this._container.getAttribute( "src" ) );
+          return youtubeObject.getVolume();
+        });
 
-      if (this.vidId !== registry[this.playerId].vidId ) {
-        this.video.cueVideoById( this.vidId );
-      } else {
-        // Same video, new ctor. Force a seek to the beginning
-        this.previousCurrentTime = 1;
-      }
+        media.readyState = 4;
+        media.dispatchEvent( 'load' );
+        dataLoaded = true;
+        media.duration = youtubeObject.getDuration();
+        media.dispatchEvent( 'durationchange' );
 
-      this.dispatchEvent( 'load' );
-    } else if ( this._container ) {
-      makeSWF.call( this, url, this._container );
-    } else {
-      // Container not yet loaded, get it on DOMDontentLoad
-      document.addEventListener( "DOMContentLoaded", function() {
-        self._container = document.getElementById( elementId );
+        if ( !media.paused ) {
 
-        if ( !self._container ) {
-          throw "Could not find container!";
+          media.play();
         }
 
-        makeSWF.call( self, url, self._container );
-      }, false);
-    }
+        media.paused && media.dispatchEvent( 'loadeddata' );
+      };
 
-    registry[this.playerId] = this;
-  };
-  // end Popcorn.youtube.init
-
-  Popcorn.extend( Popcorn.youtube.init.prototype, {
-
-    // For internal use only.
-    // Register handlers to YouTube events.
-    registerYoutubeEventHandlers: function() {
-      var youcorn = this,
-          stateChangeHandler = 'Popcorn.youtube.stateChangeEventHandler',
-          errorHandler = 'Popcorn.youtube.errorEventHandler';
-
-      this.video.addEventListener( 'onStateChange', stateChangeHandler );
-      this.video.addEventListener( 'onError', errorHandler );
-
-      /**
-       * Since Flash can only call named functions, they are declared
-       * separately here.
-       */
-      Popcorn.youtube.stateChangeEventHandler = function( state ) {
-        // In case ctor has been called many times for many ctors
-        // Only use latest ctor call for each player id
-        var self = registry[youcorn.playerId];
-
-        if ( state === YOUTUBE_STATE_UNSTARTED ) {
-          self.readyState = READY_STATE_HAVE_METADATA;
-          self.dispatchEvent( 'loadedmetadata' );
-        } else if ( state === YOUTUBE_STATE_ENDED ) {
-          self.dispatchEvent( 'ended' );
-        } else if ( state === YOUTUBE_STATE_PLAYING ) {
-          // Being able to play means current data is loaded.
-          if ( !this.loadedData ) {
-            this.loadedData = true;
-            self.dispatchEvent( 'loadeddata' );
-          }
+      options.controls = +options.controls === 0 || +options.controls === 1 ? options.controls : 1; 
+      options.annotations = +options.annotations === 1 || +options.annotations === 3 ? options.annotations : 1;
 
-          self.readyState = READY_STATE_HAVE_CURRENT_DATA;
-          self.dispatchEvent( 'playing' );
-        } else if ( state === YOUTUBE_STATE_PAUSED ) {
-          self.dispatchEvent( 'pause' );
-        } else if ( state === YOUTUBE_STATE_BUFFERING ) {
-          self.dispatchEvent( 'waiting' );
-        } else if ( state === YOUTUBE_STATE_CUED ) {
-          // not handled
-          Popcorn.nop();
-        }
+      var flashvars = {
+        playerapiid: container.id,
+        controls: options.controls,
+        iv_load_policy: options.annotations
       };
 
-      Popcorn.youtube.errorEventHandler = function( state ) {
-        youcorn.dispatchEvent( 'error' );
-      };
-    },
-
-    // For internal use only.
-    // Start current time and loading progress syncing intervals.
-    registerInternalEventHandlers: function() {
-      this.addEventListener( 'playing', function() {
-        this.startTimeUpdater();
-      });
-      this.addEventListener( 'loadedmetadata', function() {
-        this.startProgressUpdater();
-      });
-    },
-
-    play: function() {
-      // In case called before video is loaded, defer acting
-      if ( !loadedPlayers[this.playerId] ) {
-        this.addEventListener( "load", function() {
-          this.play();
-        });
-        return;
-      }
-
-      this.dispatchEvent( 'play' );
-      this.video.playVideo();
-    },
-
-    pause: function() {
-      // In case called before video is loaded, defer acting
-      if ( !loadedPlayers[this.playerId] ) {
-        this.addEventListener( "load", this.pause );
-        return;
-      }
-
-      this.video.pauseVideo();
-      // pause event is raised by Youtube.
-    },
-
-    load: function() {
-      // In case called before video is loaded, defer acting
-      if ( !loadedPlayers[this.playerId] ) {
-        this.addEventListener( "load", function() {
-          this.load();
-        });
-        return;
-      }
-
-      this.video.playVideo();
-      this.video.pauseVideo();
-    },
-
-    seekTo: function( time ) {
-      var playing = this.video.getPlayerState() == YOUTUBE_STATE_PLAYING;
-      this.video.seekTo( time, true );
-
-      // Prevent Youtube's behaviour to start playing video after seeking.
-      if ( !playing ) {
-        this.video.paused = true;
-        this.video.pauseVideo();
-      } else {
-        this.video.paused = false;
-      }
-
-      // Data need to be loaded again.
-      if ( !this.fullyLoaded ) {
-        this.loadedData = false;
-      }
-
-      // Raise event.
-      this.dispatchEvent( 'seeked' );
-    },
-
-    // Mute is toggleable
-    mute: function() {
-      // In case called before video is loaded, defer acting
-      if ( !loadedPlayers[this.playerId] ) {
-        this.addEventListener( "load", this.mute );
-        return;
-      }
-
-      if ( this.volume !== 0 ) {
-        this.preMuteVol = this.volume;
-        this.setVolume( 0 );
-      } else {
-        this.setVolume( this.preMuteVol );
-      }
-    },
-
-    // Expects beteween 0 and 1
-    setVolume: function( vol ) {
-      this.volume = this.previousVolume = vol;
-      this.video.setVolume( vol * 100 );
-      this.dispatchEvent( 'volumechange' );
-    },
-
-    addEventListener: function( evt, func ) {
-      var evtName = evt.type || evt;
-
-      if ( !this._eventListeners[evtName] ) {
-        this._eventListeners[evtName] = [];
-      }
-
-      this._eventListeners[evtName].push( func );
-    },
-
-    /**
-     * Notify event listeners about an event.
-     */
-    dispatchEvent: function( name ) {
-      var evtName = name.type || name;
-      if ( !this._eventListeners[evtName] ) {
-        return;
-      }
-
-      var self = this;
-
-      Popcorn.forEach( this._eventListeners[evtName], function( evt ) {
-        evt.call( self, null );
-      });
-    },
-
-    /* Unsupported methods. */
-
-    defaultPlaybackRate: function( arg ) {
-    },
-
-    playbackRate: function( arg ) {
-    },
-
-    getBoundingClientRect: function() {
-      var b,
-          self = this;
-
-      if ( this.video ) {
-        b = this.video.getBoundingClientRect();
-
-        return {
-          bottom: b.bottom,
-          left: b.left,
-          right: b.right,
-          top: b.top,
-
-          //  These not guaranteed to be in there
-          width: b.width || ( b.right - b.left ),
-          height: b.height || ( b.bottom - b.top )
-        };
-      } else {
-        b = self._container.getBoundingClientRect();
-
-        // Update bottom, right for expected values once the container loads
-        return {
-          left: b.left,
-          top: b.top,
-          width: self._target.offsetWidth,
-          height: self._target.offsetHeight,
-          bottom: b.top + self._target.offsetWidth,
-          right: b.left + self._target.offsetHeight
-        };
-      }
-    },
-
-    startTimeUpdater: function() {
-      var state = typeof this.video.getPlayerState != "function"  ? this.readyState : this.video.getPlayerState(),
-          self = this,
-          seeked = 0;
-
-      if ( abs( this.currentTime - this.previousCurrentTime ) > timeCheckInterval ) {
-        // Has programatically set the currentTime
-        this.previousCurrentTime = this.currentTime - timeCheckInterval;
-        this.seekTo( this.currentTime );
-        seeked = 1;
-      } else {
-        this.previousCurrentTime = this.currentTime;
-        this.currentTime = typeof this.video.getCurrentTime != "function" ? this.currentTime : this.video.getCurrentTime();
-      }
-
-      if ( this.volume !== this.previousVolume ) {
-        this.setVolume( this.volume );
-      }
-
-      if ( state !== YOUTUBE_STATE_ENDED && state !== YOUTUBE_STATE_PAUSED || seeked ) {
-        this.dispatchEvent( 'timeupdate' );
-      }
-
-      if( state !== YOUTUBE_STATE_ENDED ) {
-        setTimeout( function() {
-          self.startTimeUpdater.call(self);
-        }, timeupdateInterval);
-      }
-    },
-
-    startProgressUpdater: function() {
-      var bytesLoaded = this.video.getVideoBytesLoaded(),
-          bytesToLoad = this.video.getVideoBytesTotal(),
-          self = this;
-
-      // do nothing if size is not yet determined
-      if ( bytesToLoad === 0 ) {
-        return;
-      }
-
-      // raise an event if load has just started
-      if ( !this.loadStarted ) {
-        this.loadStarted = true;
-        this.dispatchEvent( 'loadstart' );
-      }
-
-      // fully loaded
-      if ( bytesLoaded >= bytesToLoad ) {
-        this.fullyLoaded = true;
-        this.readyState = READY_STATE_HAVE_ENOUGH_DATA;
-        this.dispatchEvent( 'canplaythrough' );
-        return;
-      }
-
-      this.dispatchEvent( 'progress' );
-
-      setTimeout( function() {
-        self.startProgressUpdater.call( self );
-      }, progressInterval);
+      swfobject.embedSWF( "http://www.youtube.com/e/" + /^.*[\/=](.{11})/.exec( media.src )[ 1 ] + "?enablejsapi=1&playerapiid=" + container.id + "&version=3", 
+                          container.id, media.offsetWidth, media.offsetHeight, "8", null,
+                          flashvars, {wmode: "transparent", allowScriptAccess: "always"}, {id: container.id} );
+    };
+
+    if ( !window.swfobject ) {
+
+      Popcorn.getScript( "http://ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js", youtubeInit );
+    } else {
+
+      youtubeInit();
     }
-  }); // end Popcorn.extend
-
-  /* Unsupported properties and events. */
-
-  /**
-   * Unsupported events are:
-   * * suspend
-   * * abort
-   * * emptied
-   * * stalled
-   * * canplay
-   * * seeking
-   * * ratechange
-   */
-
-})( Popcorn );
+  }
+});
 
diff --git a/players/youtube/popcorn.youtube.unit.js b/players/youtube/popcorn.youtube.unit.js
index da6996135..e93b55352 100644
--- a/players/youtube/popcorn.youtube.unit.js
+++ b/players/youtube/popcorn.youtube.unit.js
@@ -1,158 +1,288 @@
-test( "Popcorn YouTube Plugin Event Tests", function() {
-  
-  function plus(){ 
-    if ( ++count == expects ) {
-      start(); 
+test("Update Timer", function () {
+
+  QUnit.reset();
+
+  var p2 = Popcorn.youtube( '#video2', 'http://www.youtube.com/watch?v=9oar9glUCL0' ),
+      expects = 12,
+      count   = 0,
+      execCount = 0,
+      // These make sure events are only fired once
+      // any second call will produce a failed test
+      forwardStart  = false,
+      forwardEnd    = false,
+      backwardStart = false,
+      backwardEnd   = false,
+      wrapperRunning = { one: false, two: false, };
+
+  function plus() {
+    if ( ++count === expects ) {
+      // clean up added events after tests
+      Popcorn.removePlugin( "forwards" );
+      Popcorn.removePlugin( "backwards" );
+      Popcorn.removePlugin( "wrapper" );
+      p2.removePlugin( "exec" );
+      start();
     }
   }
-  
-  QUnit.reset();
-  
-  // events must be fired in this order
-  var expectedEvents = [
-    'play',
-    'loadeddata',
-    'playing',
-    'volumechange',
-    'pause',
-    'play',
-    'playing',
-    'seeked',
-    'volumechange',
-    'volumechange',
-    'playing',
-    'pause',
-    'ended'
-  ];
-  
-  var popcorn = Popcorn( Popcorn.youtube( 'video', "http://www.youtube.com/e/ac7KhViaVqc" ) ),
-      count = 0,
-      eventCount = 0,
-      added = [],
-      set1Executed = false,
-      set2Executed = false,
-      set3Executed = false,
-      expects = expectedEvents.length + 6,
-      listeners = [];
-      
+
+  // These tests come close to 10 seconds on chrome, increasing to 15
   stop( 15000 );
-  expect(expects);
-  
-  popcorn.volume(1); // is muted later
-  
-  // check time sync
-  popcorn.exec(2, function() {
-    ok( popcorn.currentTime() >= 2, "Check time synchronization." );
-    plus();
-    ok( popcorn.video.paused == false, "Video is not paused" );
-    plus();
-  });
-  popcorn.exec(49, function() {
-    ok( popcorn.currentTime() >= 49, "Check time synchronization." );
-    plus();
+
+  Popcorn.plugin( "forwards", function () {
+    return {
+      start: function ( event, options ) {
+
+        if ( !options.startFired ) {
+
+          options.startFired = true;
+          forwardStart = !forwardStart;
+          ok( forwardStart, "forward's start fired" );
+          plus();
+        }
+      },
+      end: function ( event, options ) {
+
+        if ( !options.endFired ) {
+
+          options.endFired = true;
+          forwardEnd = !forwardEnd;
+          p2.currentTime(1).play();
+          ok( forwardEnd, "forward's end fired" );
+          plus();
+        }
+      }
+    };
   });
-  popcorn.exec(40, function() {
-    ok( false, "This should not be run." );
+
+  p2.forwards({
+    start: 3,
+    end: 4
   });
 
-  
-  // register each events
-  for ( var i in expectedEvents ) {
-    (function( event ) {
-      // skip same listeners already added
-      for ( var i in added ) {
-        if ( added[i] == event ) {
-          return;
+  Popcorn.plugin( "backwards", function () {
+    return {
+      start: function ( event, options ) {
+
+        if ( !options.startFired ) {
+
+          options.startFired = true;
+          backwardStart = !backwardStart;
+          p2.currentTime(0).play();
+          ok( true, "backward's start fired" );
+          plus();
+        }
+      },
+      end: function ( event, options ) {
+
+        if ( !options.endFired ) {
+
+          options.endFired = true;
+          backwardEnd = !backwardEnd;
+          ok( backwardEnd, "backward's end fired" );
+          plus();
+          p2.currentTime( 5 ).play();
         }
       }
-      
-      listeners.push( {
-        evt: event,
-        fn: popcorn.listen( event, function() {
-          eventCount++;
-          var expected = expectedEvents.shift();
-          if ( expected == event ) {
-            ok( true, "Event: "+event + " is fired." );
-            plus();
-          } else {
-            ok( false, event + " is fired unexpectedly, expecting: " + expected );
-          }
-        })
-      });
-      added.push( event );
-    })( expectedEvents[i] );
-  }
-  
-  // Cleanup
-  listeners.push( popcorn.listen( "ended", function() {
-    Popcorn.forEach( listeners, function ( obj ) {
-      popcorn.unlisten( obj.evt, obj.fn );
-    });
-  }));
+    };
+  });
+
+  p2.backwards({
+    start: 1,
+    end: 2
+  });
+
+  Popcorn.plugin( "wrapper", {
+    start: function ( event, options ) {
 
-  // operations set1
-  popcorn.listen( 'playing', function() {
-    // prevent double calling
-    if ( set1Executed ) {
-      return;
+      wrapperRunning[ options.wrapper ] = true;
+    },
+    end: function ( event, options ) {
+
+      wrapperRunning[ options.wrapper ] = false;
     }
+  });
 
-    // toggle volume 1 second after playing
-    setTimeout(function() {
-      popcorn.volume(0.5);
-    }, 1000);
+  // second instance of wrapper is wrapping the first
+  p2.wrapper({
+    start: 6,
+    end: 7,
+    wrapper: "one"
+  })
+  .wrapper({
+    start: 5,
+    end: 8,
+    wrapper: "two"
+  })
+  // checking wrapper 2's start
+  .exec( 5, function() {
 
-    // pause 3 seconds after playing
-    setTimeout(function() {
-      popcorn.pause();
-    }, 3000);
+    if ( execCount === 0 ) {
 
-    set1Executed = true;
+      execCount++;
+      ok( wrapperRunning.two, "wrapper two is running at second 5" );
+      plus();
+      ok( !wrapperRunning.one, "wrapper one is stopped at second 5" );
+      plus();
+    }
+  })
+  // checking wrapper 1's start
+  .exec( 6, function() {
+
+    if ( execCount === 1 ) {
+
+      execCount++;
+      ok( wrapperRunning.two, "wrapper two is running at second 6" );
+      plus();
+      ok( wrapperRunning.one, "wrapper one is running at second 6" );
+      plus();
+    }
+  })
+  // checking wrapper 1's end
+  .exec( 7, function() {
+
+    if ( execCount === 2 ) {
+
+      execCount++;
+      ok( wrapperRunning.two, "wrapper two is running at second 7" );
+      plus();
+      ok( !wrapperRunning.one, "wrapper one is stopped at second 7" );
+      plus();
+    }
+  })
+  // checking wrapper 2's end
+  .exec( 8, function() {
+
+    if ( execCount === 3 ) {
+
+      execCount++;
+      ok( !wrapperRunning.two, "wrapper two is stopped at second 9" );
+      plus();
+      ok( !wrapperRunning.one, "wrapper one is stopped at second 9" );
+      plus();
+    }
   });
 
-  // begin the test
-  popcorn.play();
-  
-  // operations set2
-  popcorn.listen( 'pause', function() {
-    if ( set2Executed ) {
-      return;
+  p2.currentTime(3).play();
+
+});
+
+test("Plugin Factory", function () {
+
+  QUnit.reset();
+
+  var popped = Popcorn.youtube( '#video2', 'http://www.youtube.com/watch?v=9oar9glUCL0' ),
+      methods = "load play pause currentTime mute volume roundTime exec removePlugin",
+      expects = 34, // 15*2+2+2. executor/complicator each do 15
+      count = 0;
+
+  function plus() {
+    if ( ++count == expects ) {
+      Popcorn.removePlugin("executor");
+      Popcorn.removePlugin("complicator");
+      start();
     }
+  }
+
+  expect( expects );
+  stop( 15000 );
+
+  Popcorn.plugin("executor", function () {
 
-    // continue to play
-    setTimeout(function() {
-      popcorn.play();
-    }, 500);
+    return {
 
-    // seek to the end
-    setTimeout(function() {
-      popcorn.currentTime(48);
-    }, 1000);
+      start: function () {
+        var self = this;
+
+        // These ensure that a popcorn instance is the value of `this` inside a plugin definition
+
+        methods.split(/\s+/g).forEach(function (k,v) {
+          ok( k in self, "executor instance has method: " + k );
+
+          plus();
+        });
+
+        ok( "media" in this, "executor instance has `media` property" );
+        plus();
+        ok( Object.prototype.toString.call(popped.media) === "[object Object]", "video property is a HTML DIV element" );
+        plus();
+
+        ok( "data" in this, "executor instance has `data` property" );
+        plus();
+        ok( Object.prototype.toString.call(popped.data) === "[object Object]", "data property is an object" );
+        plus();
+
+        ok( "trackEvents" in this.data, "executor instance has `trackEvents` property" );
+        plus();
+        ok( Object.prototype.toString.call(popped.data.trackEvents) === "[object Object]", "executor trackEvents property is an object" )
+        plus();
+      },
+      end: function () {
+
+      }
+    };
 
-    set2Executed = true;
   });
-  
-  // operations set3
-  popcorn.listen( 'seeked', function() {
-    if ( set3Executed ) {
-      return;
+
+  ok( "executor" in popped, "executor plugin is now available to instance" );
+  plus();
+  equals( Popcorn.registry.length, 1, "One item in the registry");
+  plus();
+
+  popped.executor({
+    start: 1,
+    end: 2
+  });
+
+  Popcorn.plugin("complicator", {
+
+    start: function ( event ) {
+
+      var self = this;
+
+      // These ensure that a popcorn instance is the value of `this` inside a plugin definition
+
+      methods.split(/\s+/g).forEach(function (k,v) {
+        ok( k in self, "complicator instance has method: " + k );
+
+        plus();
+      });
+
+      ok( "media" in this, "complicator instance has `media` property" );
+      plus();
+      ok( Object.prototype.toString.call(popped.media) === "[object Object]", "video property is a HTMLVideoElement" );
+      plus();
+
+      ok( "data" in this, "complicator instance has `data` property" );
+      plus();
+      ok( Object.prototype.toString.call(popped.data) === "[object Object]", "complicator data property is an object" );
+      plus();
+
+      ok( "trackEvents" in this.data, " complicatorinstance has `trackEvents` property" );
+      plus();
+      ok( Object.prototype.toString.call(popped.data.trackEvents) === "[object Object]", "complicator trackEvents property is an object" )
+      plus();
+    },
+    end: function () {
+
+      //start();
+
+    },
+    timeupdate: function () {
     }
-    
-    popcorn.volume(0.5);
-    
-    popcorn.mute();
-    equals( popcorn.volume(), 0, "Muted" );
-    plus();
-    
-    popcorn.mute();
-    ok( popcorn.volume() !== 0, "Not Muted" );
-    plus();
-    
-    equals( popcorn.volume(), 0.5, "Back to volume of 1" );
-    plus();
+  });
 
-    set3Executed = true;
+  ok( "complicator" in popped, "complicator plugin is now available to instance" );
+  plus();
+  equals( Popcorn.registry.length, 2, "Two items in the registry");
+  plus();
+
+  popped.complicator({
+    start: 4,
+    end: 5
   });
+
+  popped.currentTime(0).play();
+
 });
 
 test( "Popcorn YouTube Plugin Url and Duration Tests", function() {
@@ -166,19 +296,19 @@ test( "Popcorn YouTube Plugin Url and Duration Tests", function() {
   
   var count = 0,
       expects = 3,
-      popcorn = Popcorn( Popcorn.youtube( 'video2', 'http://www.youtube.com/watch?v=9oar9glUCL0' ) );
+      popcorn = Popcorn.youtube( '#video2', 'http://www.youtube.com/watch?v=9oar9glUCL0' );
       
   expect( expects );
   stop( 10000 );
   
-  equals( popcorn.video.vidId, '9oar9glUCL0', 'Video id set' );
+  equals( popcorn.media.id, 'video2', 'Video id set' );
   plus();
   
   equals( popcorn.duration(), 0, 'Duration starts as 0');
   plus();
   
   popcorn.listen( "durationchange", function() {
-    notEqual( 0, popcorn.duration(), "Duration has been changed from 0" );
+    notEqual( popcorn.duration(), 0, "Duration has been changed from 0" );
     plus();
     
     popcorn.pause();
@@ -194,47 +324,53 @@ test( "Popcorn YouTube Plugin Url Regex Test", function() {
   var urlTests = [
     { name: 'standard',
       url: 'http://www.youtube.com/watch?v=9oar9glUCL0',
-      expected: '9oar9glUCL0',
+      expected: 'http://www.youtube.com/watch?v=9oar9glUCL0',
     },
     { name: 'share url',
       url: 'http://youtu.be/9oar9glUCL0',
-      expected: '9oar9glUCL0',
+      expected: 'http://youtu.be/9oar9glUCL0',
     },
     { name: 'long embed',
       url: 'http://www.youtube.com/embed/9oar9glUCL0',
-      expected: '9oar9glUCL0',
+      expected: 'http://www.youtube.com/embed/9oar9glUCL0',
     },
     { name: 'short embed 1 (e)',
       url: 'http://www.youtube.com/e/9oar9glUCL0',
-      expected: '9oar9glUCL0',
+      expected: 'http://www.youtube.com/e/9oar9glUCL0',
     },
     { name: 'short embed 2 (v)',
       url: 'http://www.youtube.com/v/9oar9glUCL0',
-      expected: '9oar9glUCL0',
+      expected: 'http://www.youtube.com/v/9oar9glUCL0',
     },
     { name: 'contains underscore',
       url: 'http://www.youtube.com/v/GP53b__h4ew',
-      expected: 'GP53b__h4ew',
+      expected: 'http://www.youtube.com/v/GP53b__h4ew',
     },
   ];
 
-  expect( urlTests.length );
+  var count = 0,
+      expects = urlTests.length;
+
+  expect( expects );
   stop( 10000 );
 
-  for ( var t in urlTests ) {
+  Popcorn.forEach( urlTests, function( valuse, key ) {
 
-    var urlTest = urlTests[t],
-        popcorn = Popcorn( Popcorn.youtube( 'video3', urlTest.url ) );
+    var urlTest = urlTests[ key ],
+        popcorn = Popcorn.youtube( '#video3', urlTest.url );
 
-    equals( popcorn.video.vidId, urlTest.expected, 'Video id is correct for ' + urlTest.name + ': ' + urlTest.url );
-    popcorn.pause();
+    popcorn.listen( "loadeddata", function() {
 
-    // Get rid of the youtube object inside the video3, to keep things simple
-    var div = document.getElementById('video3');
-    div.removeChild(div.firstChild);
-  }
-  
-  start(); 
+      equals( popcorn.media.src, urlTest.expected, 'Video id is correct for ' + urlTest.name + ': ' + urlTest.url );
+      popcorn.pause();
+
+      count++;
+      if ( count === expects ) {
+
+        start();
+      }
+    });
+  });
 });
 
 test( "Controls and Annotations toggling", function() {
@@ -243,24 +379,25 @@ test( "Controls and Annotations toggling", function() {
 
   expect( 6 );
 
-  var popcorn = Popcorn( Popcorn.youtube( "video", "http://www.youtube.com/watch?v=9oar9glUCL0" ) ),
+  var popcorn = Popcorn.youtube( "#video", "http://www.youtube.com/watch?v=9oar9glUCL0" ),
       targetDiv = document.getElementById( "video" );
-      testTarget = targetDiv.querySelector( "object" ).querySelector( "param:nth-of-type( 4 )" );
-  
+      testTarget = targetDiv.querySelector( "object" ).querySelector( "param[name=flashvars]" );
+
   ok( /controls=1/.test( testTarget.value ), "controls are defaulted to 1 ( displayed )" );
   ok( /iv_load_policy=1/.test( testTarget.value ), "annotations ( iv_load_policy ) are defaulted to ( enabled )" );
   
   targetDiv.innerHTML = "";
   
-  popcorn = Popcorn( Popcorn.youtube( "video", "http://www.youtube.com/watch?v=9oar9glUCL0", { controls: 1, annotations: 1 } ) );
-  testTarget = targetDiv.querySelector( "object" ).querySelector( "param:nth-of-type( 4 )" );
+  popcorn = Popcorn.youtube( "#video", "http://www.youtube.com/watch?v=9oar9glUCL0", { controls: 1, annotations: 1 } );
+
+  testTarget = targetDiv.querySelector( "object" ).querySelector( "param[name=flashvars]" );
   ok( /controls=1/.test( testTarget.value ), "controls is set to 1 ( displayed )" );
   ok( /iv_load_policy=1/.test( testTarget.value ), "annotations ( iv_load_policy ) is set to 1 ( enabled )" );
   
   targetDiv.innerHTML = "";
   
-  popcorn = Popcorn( Popcorn.youtube( "video", "http://www.youtube.com/watch?v=9oar9glUCL0", { controls: 0, annotations: 3 } ) );
-  testTarget = targetDiv.querySelector( "object" ).querySelector( "param:nth-of-type( 4 )" );
+  popcorn = Popcorn.youtube( "#video", "http://www.youtube.com/watch?v=9oar9glUCL0", { controls: 0, annotations: 3 } );
+  testTarget = targetDiv.querySelector( "object" ).querySelector( "param[name=flashvars]" );
   ok( /controls=0/.test( testTarget.value ), "controls is set to 0 ( hidden )" );
   ok( /iv_load_policy=3/.test( testTarget.value ), "annotations ( iv_load_policy ) is set to 3 ( hidden )" );
    
diff --git a/popcorn.js b/popcorn.js
index e2c7320a7..2b5402daa 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1488,6 +1488,165 @@
     return parser;
   };
 
+  Popcorn.player = function( name, player ) {
+
+    player = player || {};
+
+    var playerFn = function( target, src, options ) {
+
+      options = options || {};
+
+      // List of events
+      var date = new Date() / 1000,
+          baselineTime = date,
+          currentTime = 0,
+          timeout,
+          events = {},
+
+          // The container div of the resource
+          container = document.getElementById( rIdExp.exec( target ) && rIdExp.exec( target )[ 2 ] ) || document.createElement( "div" ),
+          basePlayer = {},
+          popcorn;
+
+      // copies a div into the media object
+      for( var val in container ) {
+
+        if ( typeof container[ val ] === "object" ) {
+
+          basePlayer[ val ] = container[ val ];
+        } else if ( typeof container[ val ] === "function" ) {
+
+          basePlayer[ val ] = ( function( value ) {
+
+            return function() {
+
+              return container[ value ].apply( container, arguments );
+            };
+          }( val ));
+        } else {
+
+          basePlayer.__defineGetter__( val, ( function( value ) {
+
+            return function() {
+
+              return container[ value ];
+            };
+          }( val )));
+        }
+      }
+
+      var timeupdate = function() {
+
+        date = new Date() / 1000;
+
+        if( !basePlayer.paused ) {
+
+          basePlayer.currentTime = basePlayer.currentTime + ( date - baselineTime );
+          basePlayer.dispatchEvent( "timeupdate" );
+          timeout = setTimeout( timeupdate, 10 );
+        }
+
+        baselineTime = date;
+      };
+
+      basePlayer.play = function() {
+
+        this.paused = false;
+
+        if ( basePlayer.readyState >= 4 ) {
+
+          baselineTime = new Date() / 1000;
+          basePlayer.dispatchEvent( "play" );
+          timeupdate();
+        }
+      };
+
+      basePlayer.pause = function() {
+
+        this.paused = true;
+        basePlayer.dispatchEvent( "pause" );
+      };
+
+      basePlayer.__defineSetter__( "currentTime", function( val ) {
+
+        // make sure val is a number
+        currentTime = +val;
+        basePlayer.dispatchEvent( "timeupdate" );
+        return currentTime;
+      });
+
+      basePlayer.__defineGetter__( "currentTime", function() {
+
+        return currentTime;
+      });
+
+      // Adds an event listener to the object
+      basePlayer.addEventListener = function( evtName, fn ) {
+
+        if ( !events[ evtName ] ) {
+
+          events[ evtName ] = [];
+        }
+        
+        events[ evtName ].push( fn );
+        return fn;
+      };
+        
+      // Can take event object or simple string
+      basePlayer.dispatchEvent = function( oEvent ) {
+
+        var evt,
+            self = this,
+            eventInterface,
+            eventName = oEvent.type;
+            
+        // A string was passed, create event object
+        if ( !eventName ) {
+
+          eventName = oEvent;
+          eventInterface  = Popcorn.events.getInterface( eventName );
+          
+          if ( eventInterface ) {
+
+            evt = document.createEvent( eventInterface );
+            evt.initEvent( eventName, true, true, window, 1 );
+          }
+        }
+        
+        Popcorn.forEach( events[ eventName ], function( val ) {
+
+          val.call( self, evt, self );
+        });
+      };
+
+      // Attempt to get src from playerFn parameter
+      basePlayer.src = src || "";
+      basePlayer.readyState = 0;
+      basePlayer.duration = 0;
+      basePlayer.paused = true;
+      basePlayer.ended = 0;
+
+      // basePlayer has no concept of sound
+      basePlayer.volume = 1;
+      basePlayer.muted = false;
+
+      if ( player._setup ) {
+
+        player._setup.call( basePlayer, options );
+      } else {
+
+        // there is no setup, which means there is nothing to load
+        basePlayer.readyState = 4;
+        basePlayer.dispatchEvent( 'load' );
+      }
+
+      popcorn = new Popcorn.p.init( basePlayer, options );
+
+      return popcorn;
+    };
+
+    Popcorn[ name ] = Popcorn[ name ] || playerFn;
+  };
 
   //  Cache references to reused RegExps
   var rparams = /\?/,
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 6dfff8f49..f84a56a03 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -3368,7 +3368,192 @@ test("dataType: XML Response", function() {
 
 });
 
+module( "Popcorn Player" );
 
+test( "Base player methods", function() {
+
+  var expects = 2;
+
+  expect( expects );
+
+  stop( 10000 );
+
+  ok( Popcorn.player, "Popcorn.player function exists" );
+
+  Popcorn.player( "newplayer" );
+  ok( Popcorn.newplayer, "Popcorn.player registers new players" );
+
+  start();
+});
+
+test( "Base player functionality", function() {
+
+  Popcorn.player( "baseplayer" );
+
+  //QUnit.reset();
+
+  var p2 = Popcorn.baseplayer( '#video' ),
+      expects = 12,
+      count   = 0,
+      execCount = 0,
+      // These make sure events are only fired once
+      // any second call will produce a failed test
+      forwardStart  = false,
+      forwardEnd    = false,
+      backwardStart = false,
+      backwardEnd   = false,
+      wrapperRunning = { one: false, two: false, };
+
+  function plus() {
+    if ( ++count === expects ) {
+      // clean up added events after tests
+      Popcorn.removePlugin( "forwards" );
+      Popcorn.removePlugin( "backwards" );
+      Popcorn.removePlugin( "wrapper" );
+      p2.removePlugin( "exec" );
+      start();
+    }
+  }
+
+  // These tests come close to 10 seconds on chrome, increasing to 15
+  stop( 15000 );
+
+  Popcorn.plugin( "forwards", function () {
+    return {
+      start: function ( event, options ) {
+
+        if ( !options.startFired ) {
+
+          options.startFired = true;
+          forwardStart = !forwardStart;
+          ok( forwardStart, "forward's start fired" );
+          plus();
+        }
+      },
+      end: function ( event, options ) {
+
+        if ( !options.endFired ) {
+
+          options.endFired = true;
+          forwardEnd = !forwardEnd;
+          p2.currentTime(1).play();
+          ok( forwardEnd, "forward's end fired" );
+          plus();
+        }
+      }
+    };
+  });
+
+  p2.forwards({
+    start: 3,
+    end: 4
+  });
+
+  Popcorn.plugin( "backwards", function () {
+    return {
+      start: function ( event, options ) {
+
+        if ( !options.startFired ) {
+
+          options.startFired = true;
+          backwardStart = !backwardStart;
+          p2.currentTime(0).play();
+          ok( true, "backward's start fired" );
+          plus();
+        }
+      },
+      end: function ( event, options ) {
+
+        if ( !options.endFired ) {
+
+          options.endFired = true;
+          backwardEnd = !backwardEnd;
+          ok( backwardEnd, "backward's end fired" );
+          plus();
+          p2.currentTime( 5 ).play();
+        }
+      }
+    };
+  });
+
+  p2.backwards({
+    start: 1,
+    end: 2
+  });
+
+  Popcorn.plugin( "wrapper", {
+    start: function ( event, options ) {
+
+      wrapperRunning[ options.wrapper ] = true;
+    },
+    end: function ( event, options ) {
+
+      wrapperRunning[ options.wrapper ] = false;
+    }
+  });
+
+  // second instance of wrapper is wrapping the first
+  p2.wrapper({
+    start: 6,
+    end: 7,
+    wrapper: "one"
+  })
+  .wrapper({
+    start: 5,
+    end: 8,
+    wrapper: "two"
+  })
+  // checking wrapper 2's start
+  .exec( 5, function() {
+
+    if ( execCount === 0 ) {
+
+      execCount++;
+      ok( wrapperRunning.two, "wrapper two is running at second 5" );
+      plus();
+      ok( !wrapperRunning.one, "wrapper one is stopped at second 5" );
+      plus();
+    }
+  })
+  // checking wrapper 1's start
+  .exec( 6, function() {
+
+    if ( execCount === 1 ) {
+
+      execCount++;
+      ok( wrapperRunning.two, "wrapper two is running at second 6" );
+      plus();
+      ok( wrapperRunning.one, "wrapper one is running at second 6" );
+      plus();
+    }
+  })
+  // checking wrapper 1's end
+  .exec( 7, function() {
+
+    if ( execCount === 2 ) {
+
+      execCount++;
+      ok( wrapperRunning.two, "wrapper two is running at second 7" );
+      plus();
+      ok( !wrapperRunning.one, "wrapper one is stopped at second 7" );
+      plus();
+    }
+  })
+  // checking wrapper 2's end
+  .exec( 8, function() {
+
+    if ( execCount === 3 ) {
+
+      execCount++;
+      ok( !wrapperRunning.two, "wrapper two is stopped at second 9" );
+      plus();
+      ok( !wrapperRunning.one, "wrapper one is stopped at second 9" );
+      plus();
+    }
+  });
+
+  p2.currentTime(3).play();
+});
 
 module("Popcorn Parser");
 

From 97a91bea0700934dcf714756ae4f3071e8a0d053 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Wed, 21 Sep 2011 11:00:11 -0400
Subject: [PATCH 068/140] Added isDestroyed on a per instance level instead of
 a Popcorn wide isDestroyed

---
 popcorn.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index fe15842fe..5d7c0e1b0 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -32,7 +32,6 @@
   readyStack = [],
   readyBound = false,
   readyFired = false,
-  isDestroyed = false,
 
   //  Non-public internal data object
   internal = {
@@ -184,6 +183,8 @@
 
       this.options = options || {};
 
+      this.isDestroyed = false;
+
       this.data = {
 
         // Allows disabling a plugin per instance
@@ -263,8 +264,10 @@
             that.data.timeUpdateFunction = function( event ) {
               Popcorn.timeUpdate( that, event );
             }
-
-            !isDestroyed && that.media.addEventListener( "timeupdate", that.data.timeUpdateFunction, false );
+            
+            if ( !that.isDestroyed ) {
+              that.media.addEventListener( "timeupdate", that.data.timeUpdateFunction, false );
+            }
           }
         } else {
           global.setTimeout(function() {
@@ -412,8 +415,10 @@
         events[ item ] = null;
       }
 
-      instance.media.removeEventListener( "timeupdate", instance.data.timeUpdateFunction, false );
-      isDestroyed = true;
+      if ( !instance.isDestroyed ) {
+        instance.media.removeEventListener( "timeupdate", instance.data.timeUpdateFunction, false );
+        instance.isDestroyed = true;
+      }
 
       Popcorn.removeInstance( instance );
     }

From 30a49a56611a2f7997c341fda63797c428a30666 Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Wed, 21 Sep 2011 12:02:12 -0400
Subject: [PATCH 069/140] [#729] Adds play(n)/pause(n) shorthands to
 currentTime(n).play()/pause() Includes tests

---
 popcorn.js           |  9 +++++++++
 test/popcorn.unit.js | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/popcorn.js b/popcorn.js
index e2c7320a7..b0e9e0a6a 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -418,6 +418,15 @@
         ret[ name ] = function( arg ) {
 
           if ( typeof this.media[ name ] === "function" ) {
+
+            // Support for shorthanded play(n)/pause(n) jump to currentTime
+            // If arg is not null or undefined and called by one of the
+            // allowed shorthandable methods, then set the currentTime
+						// Supports time as seconds or SMPTE
+            if ( arg != null && /play|pause/.test( name ) ) {
+              this.media.currentTime = Popcorn.util.toSeconds( arg );
+            }
+
             this.media[ name ]();
 
             return this;
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 6dfff8f49..61b9a86d5 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -601,6 +601,46 @@ test("mute", function() {
 
 });
 
+test("play(n) as shorthand to currentTime(n).play()", function() {
+
+  var $pop = Popcorn( "#video" ),
+    expects = 2,
+    count = 0,
+    fired = 0;
+
+  expect( expects );
+
+  function plus() {
+    if ( ++count == expects ) {
+      start();
+    }
+  }
+
+  stop( 1000 );
+
+  function poll() {
+
+    if ( $pop.media.readyState >= 2 ) {
+      // this should trigger immediately
+
+      $pop.play( 10 ).pause();
+
+      equal( Math.round($pop.currentTime()), 10, "play(n) sets currentTime to 10" );
+      plus();
+
+      $pop.pause( 5 );
+
+      equal( Math.round($pop.currentTime()), 5, "pause(n) sets currentTime to 5" );
+      plus();
+
+    } else {
+      setTimeout( poll, 10 );
+    }
+  }
+
+  poll();
+});
+
 
 module("Popcorn Static Methods");
 

From 6e500e9d3c5303ed391fd3d841fccc3a798264f8 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Wed, 21 Sep 2011 14:32:54 -0400
Subject: [PATCH 070/140] Fixed unit tests that were failing as a result of
 destroy working properly, also a bit of whitespace fixing as well

---
 popcorn.js           |  2 +-
 test/popcorn.unit.js | 43 ++++++++++++++++++++++---------------------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index 5d7c0e1b0..22cf2c098 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -264,7 +264,7 @@
             that.data.timeUpdateFunction = function( event ) {
               Popcorn.timeUpdate( that, event );
             }
-            
+
             if ( !that.isDestroyed ) {
               that.media.addEventListener( "timeupdate", that.data.timeUpdateFunction, false );
             }
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 77417f6ff..4497ecf16 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -284,7 +284,8 @@ test("Instances", function() {
 
 test( "Popcorn.destroy", function() {
   var popcorn = Popcorn( "#video" ),
-      expects = 8,
+      pcorn,
+      expects = 7,
       count = 0,
       playCounter = 0,
       timeUpdateCounter = 0;
@@ -293,24 +294,15 @@ test( "Popcorn.destroy", function() {
 
   function plus() {
     if( ++count === expects ) {
+      pcorn.destroy();
       start();
     }
   }
 
-  function howMany() {
-    var counter = 0;
-
-    for( things in popcorn.data.events ) {
-      counter++;
-    }
-
-    return counter;
-  }
-
   stop();
 
   //  initially no listeners
-  equals( howMany(), 0, "Initially no events have been added" );
+  equals( Popcorn.sizeOf( popcorn.data.events ), 0, "Initially no events have been added" );
   plus();
 
   equals( playCounter, 0, "playCounter is intially 0" );
@@ -323,35 +315,44 @@ test( "Popcorn.destroy", function() {
   popcorn.listen( "timeupdate", function( event ) { timeUpdateCounter++; }, false );
   popcorn.listen( "play", function( event ) { playCounter++; }, false );
 
-  popcorn.play( 0 );
+  popcorn.currentTime( 0 ).play();
 
   popcorn.exec( 1, function() {
     popcorn.pause();
 
-    equals( howMany(), 2, "popcorn.data.events has correct number of events - before Popcorn.destroy" );
+    equals( Popcorn.sizeOf( popcorn.data.events ), 2, "popcorn.data.events has correct number of events - before Popcorn.destroy" );
     plus();
 
     equals( playCounter, 1, "playCounter triggered exactly 1 time" );
     plus();
 
-    equals( timeUpdateCounter, 4, "timeUpdateCounter triggered exactly 4 times" );
+    equals( timeUpdateCounter, 5, "timeUpdateCounter triggered exactly 4 times" );
     plus();
 
     playCounter = timeUpdateCounter = 0;
 
     popcorn.destroy();
-    popcorn.currentTime( 0 ).play();
 
-    popcorn.exec( 0.25, function() {
-      popcorn.pause();
+    //  Doing this to ensure we are working, a fail will run before this if the old popcorn instances events were
+    //  not properly destroyed
+    pcorn = Popcorn( "#video" );
 
-      equals( playCounter, 0, "playCounter was not triggered - after destroy called" );
-      plus();
+    pcorn.exec( 3, function() {
+      pcorn.pause();
 
-      equals( timeUpdateCounter, 0, "timeUpdateCounter was not triggered - after destroy called" );
+      ok( true, "Second popcorn instance's event was fired instead of first popcorn instance" );
       plus();
     });
 
+    popcorn.currentTime( 0 ).play();
+    pcorn.currentTime( 0 ).play();
+  });
+
+  popcorn.exec( 2, function() {
+    popcorn.pause();
+
+    ok( false, "This exec should never have been run, destroy not working" );
+    plus();
   });
 
 });

From fd22cf24a7fcd696138ab7242aae1f7bc6d86281 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Wed, 21 Sep 2011 15:49:42 -0400
Subject: [PATCH 071/140] Added support for in and out to be used instead of
 start and end's definition within the plugin

---
 popcorn.js           | 4 ++++
 test/popcorn.unit.js | 9 +++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index 8c04fb288..6eebe506d 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1207,6 +1207,10 @@
       options._natives.type = name;
       options._running = false;
 
+      natives[ "in" ] && ( natives.start = natives[ "in" ] );
+
+      natives[ "out" ] && ( natives.end = natives[ "out" ] );
+
       // Check for previously set default options
       defaults = this.options.defaults && this.options.defaults[ options._natives && options._natives.type ];
 
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index d36bc0861..d2c6acdf9 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -2598,10 +2598,10 @@ test( "In/Out aliases", function() {
   Popcorn.plugin( "aliasTester", function() {
 
     return {
-      start: function() {
+      in: function() {
         counter++;
       },
-      end: function() {
+      out: function() {
         counter++;
       }
     };
@@ -2614,6 +2614,11 @@ test( "In/Out aliases", function() {
 
   popcorn.currentTime( 0 ).pause();
 
+  ok( popcorn.data.events[ "in" ], "in is a valid alias for start" );
+  plus();
+
+  ok( popcorn.data.events[ "out" ], "out is a valid alias for end" ); 
+
   equals( counter, 0, "Counter is at 0, neither in or out have been called" );
   plus();
 

From be67a480be5b8674da5cab2d5185346a7bbe2009 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Wed, 21 Sep 2011 16:05:48 -0400
Subject: [PATCH 072/140] Fixed extra line of whitespace

---
 popcorn.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/popcorn.js b/popcorn.js
index 6eebe506d..59499b65c 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1237,7 +1237,6 @@
       //  Ensure a manifest object, an empty object is a sufficient fallback
       options._natives.manifest = manifest;
       
-      
       if ( options[ "in" ] ) {
           options.start = options[ "in" ];
       }

From 2e6b415c499d1a5e6fed42534f40414e520cfe88 Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Wed, 21 Sep 2011 16:11:10 -0400
Subject: [PATCH 073/140] [#729] Adds in cadecairos' tests from #t705

---
 popcorn.js           |  2 +-
 test/popcorn.unit.js | 58 +++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index b0e9e0a6a..2e4e9ea8f 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -422,7 +422,7 @@
             // Support for shorthanded play(n)/pause(n) jump to currentTime
             // If arg is not null or undefined and called by one of the
             // allowed shorthandable methods, then set the currentTime
-						// Supports time as seconds or SMPTE
+            // Supports time as seconds or SMPTE
             if ( arg != null && /play|pause/.test( name ) ) {
               this.media.currentTime = Popcorn.util.toSeconds( arg );
             }
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 61b9a86d5..55a5e9a4f 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -601,7 +601,7 @@ test("mute", function() {
 
 });
 
-test("play(n) as shorthand to currentTime(n).play()", function() {
+test( "play(n)/pause(n) as shorthand to currentTime(n).play()/pause()", function() {
 
   var $pop = Popcorn( "#video" ),
     expects = 2,
@@ -641,6 +641,58 @@ test("play(n) as shorthand to currentTime(n).play()", function() {
   poll();
 });
 
+// Originally written for #705 by chris de cairos
+test( "play(n)/pause(n) custom stop()", function() {
+
+  // Implement custom stop() method
+  Popcorn.p.stop = function() {
+    return this.pause( 0 );
+  };
+
+  var outerHTML = document.getElementById("video").outerHTML,
+      count = 0,
+      expects = 2,
+      $pop;
+
+  document.getElementById("qunit-fixture").innerHTML = outerHTML.replace('id="video"', 'id="video-fixture"');
+
+  $pop = Popcorn( "#video-fixture" );
+
+  expect( expects );
+
+  function plus() {
+    if ( ++count === expects ) {
+      // Remove custom stop() method
+      delete Popcorn.p.stop;
+      start();
+    }
+  }
+
+  stop( 8000 );
+
+  $pop.listen( "canplayall", function() {
+
+    this.exec( 4, function() {
+
+      this.listen( "seeked", function() {
+
+        this.unlisten( "seeked" );
+
+        equal( this.currentTime(), 0, "currentTime is 0" );
+        plus();
+
+        equal( this.media.paused, true, "The media is paused" );
+        plus();
+
+      // Call custom "stop()"
+      }).stop();
+    });
+
+    // Play from 3s
+    this.play( 3 );
+  });
+});
+
 
 module("Popcorn Static Methods");
 
@@ -1591,7 +1643,7 @@ test("Update Timer (timeupdate)", function() {
       Popcorn.removePlugin( "forwards" );
       Popcorn.removePlugin( "backwards" );
       Popcorn.removePlugin( "wrapper" );
-      p2.removePlugin( "exec" );
+      p2.removePlugin( "exec" ); // TODO: David, remove this during test suite cleanup ^RW
       start();
     }
   }
@@ -1759,7 +1811,7 @@ test("Update Timer (frameAnimation)", function() {
       Popcorn.removePlugin( "forwards" );
       Popcorn.removePlugin( "backwards" );
       Popcorn.removePlugin( "wrapper" );
-      p2.removePlugin( "exec" );
+      p2.removePlugin( "exec" ); // TODO: David, remove this during test suite cleanup ^RW
       start();
     }
   }

From 037693155565ab72efa0e900a8cd1938eafad35c Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Thu, 22 Sep 2011 10:21:09 -0400
Subject: [PATCH 074/140] removed a bunch of ninja tabs

---
 modules/timeline-sources/popcorn.timeline-sources.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/timeline-sources/popcorn.timeline-sources.js b/modules/timeline-sources/popcorn.timeline-sources.js
index 397035022..16e5bca4a 100644
--- a/modules/timeline-sources/popcorn.timeline-sources.js
+++ b/modules/timeline-sources/popcorn.timeline-sources.js
@@ -35,7 +35,7 @@
             if ( data.length === 1 ) {
 
               // parse a relative URL for the filename, split to get extension
-							data = source.match( /(.*)[\/\\]([^\/\\]+\.\w+)$/ )[ 2 ].split( "." );
+              data = source.match( /(.*)[\/\\]([^\/\\]+\.\w+)$/ )[ 2 ].split( "." );
 
               data[ 0 ] = "parse" + data[ 1 ].toUpperCase();
               data[ 1 ] = source;

From f365243ef1c75345b076fefcc60b1dbb64fbf55c Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Thu, 22 Sep 2011 10:34:10 -0400
Subject: [PATCH 075/140] fixed lint problems

---
 plugins/processing/popcorn.processing.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/processing/popcorn.processing.js b/plugins/processing/popcorn.processing.js
index f15656baf..81623581d 100644
--- a/plugins/processing/popcorn.processing.js
+++ b/plugins/processing/popcorn.processing.js
@@ -70,14 +70,13 @@
         } else if ( Popcorn.plugin.debug ) {
 
           throw new Error( "Popcorn.Processing: options.sketch is undefined" );
-          return;
         }
 
       }
 
       if (!window.Processing) {
         Popcorn.getScript( "http://processingjs.org/content/download/processing-js-1.3.0/processing-1.3.0.js", function() {
-          scriptReady( options )
+          scriptReady( options );
         });
       } else {
         scriptReady( options );

From a81cbb1c4899a1c0d826bba2738b199c0071181c Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Thu, 22 Sep 2011 10:45:25 -0400
Subject: [PATCH 076/140] Fixed linting error and remove any leftover reference
 to the instance methods

---
 popcorn.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index 22cf2c098..8cd000c00 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -263,7 +263,7 @@
 
             that.data.timeUpdateFunction = function( event ) {
               Popcorn.timeUpdate( that, event );
-            }
+            };
 
             if ( !that.isDestroyed ) {
               that.media.addEventListener( "timeupdate", that.data.timeUpdateFunction, false );
@@ -420,7 +420,9 @@
         instance.isDestroyed = true;
       }
 
-      Popcorn.removeInstance( instance );
+      Popcorn.instances.splice( Popcorn.instanceIds[ instance.id ], 1 );
+
+      delete Popcorn.instanceIds[ instance.id ];
     }
   });
 

From e6dc7a64980a466510578997609ddf64a60c1592 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Thu, 22 Sep 2011 11:16:27 -0400
Subject: [PATCH 077/140] Fixed merge conflict

---
 test/popcorn.unit.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index b41398aaa..5b96cea50 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -1795,7 +1795,6 @@ test("Update Timer (frameAnimation)", function() {
 });
 
 
-<<<<<<< HEAD
 test("timeUpdate add track event while paused", function() {
 
   var $pop = Popcorn( "#video" ),

From 5218a95eaa14bd78d66667556628a6a9d13b467e Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Thu, 22 Sep 2011 11:23:41 -0400
Subject: [PATCH 078/140] Removed notion of removeInstance used in unit tests

---
 test/popcorn.unit.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 5b96cea50..cbcf2a13b 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -1806,7 +1806,6 @@ test("timeUpdate add track event while paused", function() {
   function plus() {
     if ( ++count === expects ) {
       Popcorn.removePlugin( "timeUpdateTester" );
-      Popcorn.removeInstance( $pop );
     }
   }
 

From fa62d52c7b411f668018657de6a4050d40cd733e Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Thu, 22 Sep 2011 11:41:31 -0400
Subject: [PATCH 079/140] Removed the idea of removing an instance upon
 deletion

---
 popcorn.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index 8cd000c00..d1e0f37a5 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -419,10 +419,6 @@
         instance.media.removeEventListener( "timeupdate", instance.data.timeUpdateFunction, false );
         instance.isDestroyed = true;
       }
-
-      Popcorn.instances.splice( Popcorn.instanceIds[ instance.id ], 1 );
-
-      delete Popcorn.instanceIds[ instance.id ];
     }
   });
 

From 4a2707dcb9b8a45bfeef8d9bb99965b6a0f364fc Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Thu, 22 Sep 2011 12:27:07 -0400
Subject: [PATCH 080/140] [#713] Pull removeInstance refs out of integrity
 tests

---
 test/popcorn.unit.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 94544fa00..3a54d34d8 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -2768,8 +2768,6 @@ test( "Index Integrity (frameAnimation)", function() {
   function plus() {
     if ( ++count === expects ) {
       start();
-
-      Popcorn.removeInstance( $pop );
       Popcorn.removePlugin( "ff" );
     }
   }
@@ -2839,8 +2837,6 @@ test( "Popcorn.disable/enable/toggle (timeupdate)", function() {
   function plus() {
     if ( ++count === expects ) {
       start();
-
-      Popcorn.removeInstance( $pop );
       Popcorn.removePlugin( "toggler" );
     }
   }

From 5b93be8af156cdf56031aa0d48ac97eea47cc043 Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Thu, 22 Sep 2011 14:37:40 -0400
Subject: [PATCH 081/140] Fixes outerHTML issue

---
 test/popcorn.unit.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 55a5e9a4f..5a2ca4bff 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -649,12 +649,16 @@ test( "play(n)/pause(n) custom stop()", function() {
     return this.pause( 0 );
   };
 
-  var outerHTML = document.getElementById("video").outerHTML,
+  var outerHTML = [
+			"<video id='video-fixture' preload='auto' controls='' style='display:;width:300px' tabindex='0'>",
+			document.getElementById( "video" ).innerHTML,
+			"</video>"
+			].join( "\n" ),
       count = 0,
       expects = 2,
       $pop;
 
-  document.getElementById("qunit-fixture").innerHTML = outerHTML.replace('id="video"', 'id="video-fixture"');
+  document.getElementById("qunit-fixture").innerHTML = outerHTML;
 
   $pop = Popcorn( "#video-fixture" );
 

From 4952eec74f85faa4a91caf546608d8dab9ebf0ea Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Thu, 22 Sep 2011 15:47:42 -0400
Subject: [PATCH 082/140] [#721] Removed old references to instance methods

---
 modules/timeline-sources/popcorn.timeline-sources.unit.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/timeline-sources/popcorn.timeline-sources.unit.js b/modules/timeline-sources/popcorn.timeline-sources.unit.js
index 362158b9f..45d37b4b4 100644
--- a/modules/timeline-sources/popcorn.timeline-sources.unit.js
+++ b/modules/timeline-sources/popcorn.timeline-sources.unit.js
@@ -50,8 +50,7 @@
     expect( 3 );
 
     var count = 0,
-        p = Popcorn.getInstanceById( "video" )
-        .volume( 0 );
+        p = Popcorn.instances[ 0 ].volume( 0 );
 
     function plus() {
       if ( ++count === 3 ) {

From 820f539a1be7fe8058f5f4ffa607967d494c2183 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Fri, 23 Sep 2011 10:47:54 -0400
Subject: [PATCH 083/140] Fixed all linting errors on all plugins that had them

---
 plugins/googlefeed/popcorn.googlefeed.unit.js |  2 +-
 plugins/linkedin/popcorn.linkedin.unit.js     | 14 +++++++-------
 plugins/mustache/popcorn.mustache.unit.js     |  5 +++--
 plugins/openmap/popcorn.openmap.unit.js       |  2 +-
 plugins/subtitle/popcorn.subtitle.unit.js     |  6 +++---
 plugins/timeline/popcorn.timeline.unit.js     |  7 ++++---
 plugins/twitter/popcorn.twitter.unit.js       |  4 ++--
 plugins/wikipedia/popcorn.wikipedia.unit.js   |  2 +-
 8 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/plugins/googlefeed/popcorn.googlefeed.unit.js b/plugins/googlefeed/popcorn.googlefeed.unit.js
index 3b8817f3e..bb612bffb 100755
--- a/plugins/googlefeed/popcorn.googlefeed.unit.js
+++ b/plugins/googlefeed/popcorn.googlefeed.unit.js
@@ -27,7 +27,7 @@ test( "Popcorn Google Feed Plugin", function() {
     end: 2,
     target: "feed",
     url: "http://zenit.senecac.on.ca/~chris.tyler/planet/rss20.xml",
-    title: "Planet Feed",
+    title: "Planet Feed"
 	})
 	.googlefeed({
     start: 2,
diff --git a/plugins/linkedin/popcorn.linkedin.unit.js b/plugins/linkedin/popcorn.linkedin.unit.js
index 3c0cdd63b..47e422e7c 100755
--- a/plugins/linkedin/popcorn.linkedin.unit.js
+++ b/plugins/linkedin/popcorn.linkedin.unit.js
@@ -1,5 +1,12 @@
 test( "Popcorn LinkedIn Plugin", function() {
 
+  function plus() {
+
+    if ( ++count === expects ) {
+      start();
+    }
+  }
+
   if ( /localhost/.test( location.hostname ) ) {
 
     // run tests on localhost
@@ -15,13 +22,6 @@ test( "Popcorn LinkedIn Plugin", function() {
 
     expect( expects );
 
-    function plus() {
-
-      if ( ++count === expects ) {
-        start();
-      }
-    }
-
     stop();
 
     ok( "linkedin" in popped, "linkedin is a method of the popped instance" );
diff --git a/plugins/mustache/popcorn.mustache.unit.js b/plugins/mustache/popcorn.mustache.unit.js
index 1829511f5..3ef5edce1 100755
--- a/plugins/mustache/popcorn.mustache.unit.js
+++ b/plugins/mustache/popcorn.mustache.unit.js
@@ -41,7 +41,7 @@ test( "Popcorn Mustache Plugin", function() {
     data: function( plugin, options ) {
       return JSON.parse( '{"heading": "mustache - test 2/3"}' );
     },
-    target: "mustache-div",
+    target: "mustache-div"
   });
 
   // Template + Object literal
@@ -57,7 +57,8 @@ test( "Popcorn Mustache Plugin", function() {
   });
 
   var video = document.getElementById( "video" );
-  var two = six = ten = false;
+  var two, six, ten;
+      two = six = ten = false;
 
   video.addEventListener( "timeupdate", function() {
 
diff --git a/plugins/openmap/popcorn.openmap.unit.js b/plugins/openmap/popcorn.openmap.unit.js
index 21cd6aa93..220edb5e0 100755
--- a/plugins/openmap/popcorn.openmap.unit.js
+++ b/plugins/openmap/popcorn.openmap.unit.js
@@ -39,7 +39,7 @@ test( "Popcorn OpenMap Plugin", function() {
     start: 0,
     end: 4,
     type: "SATELLITE",
-    target: :map2",
+    target: "map2",
     lat: 40.943926,
     lng: -78.968525,
     zoom: 9
diff --git a/plugins/subtitle/popcorn.subtitle.unit.js b/plugins/subtitle/popcorn.subtitle.unit.js
index 82a8b2906..aa0c67925 100755
--- a/plugins/subtitle/popcorn.subtitle.unit.js
+++ b/plugins/subtitle/popcorn.subtitle.unit.js
@@ -25,17 +25,17 @@ test( "Popcorn Subtitle Plugin", function() {
   popped.subtitle({
       start: 0,
       end: 2,
-      text: "this is the first subtitle of 2011",
+      text: "this is the first subtitle of 2011"
     })
   .subtitle({
       start: 2,
       end: 4,
-      text: "this is the second subtitle of 2011",
+      text: "this is the second subtitle of 2011"
     })
   .subtitle({
       start: 5,
       end: 7,
-      text: "this is the third subtitle of 2011",
+      text: "this is the third subtitle of 2011"
     } )
     .volume( 0 )
     .play();
diff --git a/plugins/timeline/popcorn.timeline.unit.js b/plugins/timeline/popcorn.timeline.unit.js
index ec054680b..176c30aa2 100644
--- a/plugins/timeline/popcorn.timeline.unit.js
+++ b/plugins/timeline/popcorn.timeline.unit.js
@@ -2,7 +2,8 @@ test( "Popcorn Timeline Plugin", function() {
 
   var popped = Popcorn( "#video" ),
       expects = 17,
-      upIds = downIds = [],
+      upIds = [],
+      downIds = [],
       count = 0,
       timelineUp = document.getElementById( "timeline-up" ),
       timelineDown = document.getElementById( "timeline-down" );
@@ -108,10 +109,10 @@ test( "Popcorn Timeline Plugin", function() {
 	  plus();
 
     var uid, did;
-    while ( uid = upIds.pop() ) {
+    while ( uid === upIds.pop() ) {
       popped.removeTrackEvent( uid );
     }
-    while ( did = downIds.pop() ) {
+    while ( did === downIds.pop() ) {
       popped.removeTrackEvent( did );
     }
 
diff --git a/plugins/twitter/popcorn.twitter.unit.js b/plugins/twitter/popcorn.twitter.unit.js
index 90d27f222..2feda17fa 100755
--- a/plugins/twitter/popcorn.twitter.unit.js
+++ b/plugins/twitter/popcorn.twitter.unit.js
@@ -27,14 +27,14 @@ test( "Popcorn Twitter Plugin", function() {
     ok( TWTR, "Twitter constructor exists" );
     plus();
 
-  } catch ( e ) {};
+  } catch ( e ) {}
 
   popped.twitter({
     start: 1,
     end: 2,
     title: "Steve Song",
     src: "@stevesong",
-    target: "twitterdiv",
+    target: "twitterdiv"
   });
 
   setupId = popped.getLastTrackEventId();
diff --git a/plugins/wikipedia/popcorn.wikipedia.unit.js b/plugins/wikipedia/popcorn.wikipedia.unit.js
index 62e501050..6fa4e80cf 100755
--- a/plugins/wikipedia/popcorn.wikipedia.unit.js
+++ b/plugins/wikipedia/popcorn.wikipedia.unit.js
@@ -49,7 +49,7 @@ test( "Popcorn wikipedia Plugin", function() {
     notEqual( theArticle.children[ 1 ].innerHTML, "", "wikidiv has some content" );
     plus();
     // subtract 1 from length for the  '...' added in by the plugin
-    equals( theArticle.children[ 1 ].innerHTML.split( " " ).length -1, 22, "wikidiv contains 22 words" )
+    equals( theArticle.children[ 1 ].innerHTML.split( " " ).length -1, 22, "wikidiv contains 22 words" );
     plus();
   });
   

From cbcb58d7a8032981a06523d23be96e26f3d90797 Mon Sep 17 00:00:00 2001
From: David Humphrey <david.humphrey@senecac.on.ca>
Date: Fri, 23 Sep 2011 11:24:30 -0400
Subject: [PATCH 084/140] Add Popcorn.version with test.

---
 Makefile             | 37 ++++++++++++++++++++++---------------
 popcorn.js           |  3 +++
 test/popcorn.unit.js |  9 +++++++++
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 519466185..f5c06826e 100644
--- a/Makefile
+++ b/Makefile
@@ -87,9 +87,14 @@ POPCORN_COMPLETE_LIST := --js ${POPCORN_SRC} \
 POPCORN_COMPLETE_DIST = ${DIST_DIR}/popcorn-complete.js
 POPCORN_COMPLETE_MIN = ${DIST_DIR}/popcorn-complete.min.js
 
-# Create a versioned license header for js files we ship: arg1=source arg2=dest
-add_license = cat ${PREFIX}/LICENSE_HEADER | sed -e 's/@VERSION/${VERSION}/' > $(2) ; \
-	                    cat $(1) >> $(2)
+# Create a versioned license header for js files we ship
+add_license = cat $(PREFIX)/LICENSE_HEADER | sed -e 's/@VERSION/${VERSION}/' > $(1).__hdr__ ; \
+	                    cat $(1).__hdr__ $(1) >> $(1).__tmp__ ; rm -f $(1).__hdr__ ; \
+	                    mv $(1).__tmp__ $(1)
+
+# Create a version parameter for Popcorn
+add_version = cat $(1) | sed -e 's/@VERSION/${VERSION}/' > $(1).__tmp__ ; \
+	                    mv $(1).__tmp__ $(1)
 
 # Run the file through jslint
 run_lint = @@$(RHINO) build/jslint-check.js $(1)
@@ -104,23 +109,25 @@ ${DIST_DIR}:
 
 popcorn: ${POPCORN_DIST}
 
-${POPCORN_DIST}: ${POPCORN_SRC} | ${DIST_DIR}
-	@@echo "Building" ${POPCORN_DIST}
-	@@$(call add_license, $(POPCORN_SRC), $(POPCORN_DIST))
+${POPCORN_DIST}: $(POPCORN_SRC) | $(DIST_DIR)
+	@@echo "Building" $(POPCORN_DIST)
+	@@cp $(POPCORN_SRC) $(POPCORN_DIST)
+	@@$(call add_license, $(POPCORN_DIST))
+	@@$(call add_version, $(POPCORN_DIST))
 
 min: ${POPCORN_MIN} ${MODULES_MIN} ${PLUGINS_MIN} ${PARSERS_MIN} ${PLAYERS_MIN} $(EFFECTS_MIN) ${POPCORN_COMPLETE_MIN}
 
 ${POPCORN_MIN}: ${POPCORN_DIST}
 	@@echo "Building" ${POPCORN_MIN}
-	@@$(call compile, --js ${POPCORN_DIST}, ${POPCORN_MIN}.tmp)
-	@@$(call add_license, ${POPCORN_MIN}.tmp, ${POPCORN_MIN})
-	@@rm ${POPCORN_MIN}.tmp
+	@@$(call compile, --js $(POPCORN_DIST), $(POPCORN_MIN))
+	@@$(call add_license, $(POPCORN_MIN))
+	@@$(call add_version, $(POPCORN_MIN))
 
 ${POPCORN_COMPLETE_MIN}: update ${POPCORN_SRC} ${MODULES_SRC} ${PLUGINS_SRC} ${PARSERS_SRC} $(EFFECTS_SRC) ${DIST_DIR}
 	@@echo "Building" ${POPCORN_COMPLETE_MIN}
-	@@$(call compile, ${POPCORN_COMPLETE_LIST}, ${POPCORN_COMPLETE_MIN}.tmp)
-	@@$(call add_license, ${POPCORN_COMPLETE_MIN}.tmp, ${POPCORN_COMPLETE_MIN})
-	@@rm ${POPCORN_COMPLETE_MIN}.tmp
+	@@$(call compile, $(POPCORN_COMPLETE_LIST), $(POPCORN_COMPLETE_MIN))
+	@@$(call add_license, $(POPCORN_COMPLETE_MIN))
+	@@$(call add_version, $(POPCORN_COMPLETE_MIN))
 
 modules: ${MODULES_DIST}
 
@@ -174,9 +181,9 @@ $(EFFECTS_DIST): $(EFFECTS_SRC) $(DIST_DIR)
 
 complete: update ${POPCORN_SRC} ${MODULES_SRC} ${PARSERS_SRC} ${PLUGINS_SRC} ${PLAYERS_SRC} $(EFFECTS_SRC) ${DIST_DIR}
 	@@echo "Building popcorn + modules + plugins + parsers + players + effects..."
-	@@cat ${POPCORN_SRC} ${MODULES_SRC} ${PLUGINS_SRC} ${PARSERS_SRC} ${PLAYERS_SRC} $(EFFECTS_SRC) > ${POPCORN_COMPLETE_DIST}.tmp
-	@@$(call add_license, ${POPCORN_COMPLETE_DIST}.tmp, ${POPCORN_COMPLETE_DIST})
-	@@rm ${POPCORN_COMPLETE_DIST}.tmp
+	@@cat ${POPCORN_SRC} ${MODULES_SRC} ${PLUGINS_SRC} ${PARSERS_SRC} ${PLAYERS_SRC} $(EFFECTS_SRC) > $(POPCORN_COMPLETE_DIST)
+	@@$(call add_license, $(POPCORN_COMPLETE_DIST))
+	@@$(call add_version, $(POPCORN_COMPLETE_DIST))
 
 lint:
 	@@echo "Checking Popcorn against JSLint..."
diff --git a/popcorn.js b/popcorn.js
index fa99b4e74..2cdd16a8b 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -60,6 +60,9 @@
     return new Popcorn.p.init( entity, options || null );
   };
 
+  // Popcorn API version, automatically inserted via build system.
+  Popcorn.version = "@VERSION";
+
   //  Instance caching
   Popcorn.instances = [];
 
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 5a6f18e9f..7ea4a844c 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -92,6 +92,15 @@ test("Popcorn.forEach", function() {
   equal(count, Popcorn.sizeOf(object), Popcorn.sizeOf(object) + " properties in object");
 });
 
+test("Popcorn.version", function() {
+  // We can't know the version itself, but we can make sure that we get a string.
+  // Popcorn.version should give something like "1.0.1" or a git sha "9a3e67" or
+  // the string "@VERSION" if it hasn't yet been replaced.
+  expect(1);
+
+  equal(typeof Popcorn.version, "string", "Popcorn.version exists and returns a string");
+});
+
 test("Popcorn.util.toSeconds" , function() {
   var framerate = 24,
       storedStartTime,

From 958d32275264b3a279d2151f71d79339cf897e95 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Fri, 23 Sep 2011 13:36:24 -0400
Subject: [PATCH 085/140] Style cleanup

---
 plugins/gml/popcorn.gml.js               | 32 +++++++++---------
 plugins/processing/popcorn.processing.js | 41 +++++++++++++++++-------
 2 files changed, 46 insertions(+), 27 deletions(-)

diff --git a/plugins/gml/popcorn.gml.js b/plugins/gml/popcorn.gml.js
index 10db08311..9de47032f 100755
--- a/plugins/gml/popcorn.gml.js
+++ b/plugins/gml/popcorn.gml.js
@@ -1,11 +1,11 @@
 // PLUGIN: GML
 
-(function (Popcorn) {
+(function ( Popcorn ) {
 
   var gmlPlayer = function( $p ) {
 
         var _stroke = 0,
-            onPt = 0, 
+            onPt = 0,
             onStroke = 0,
             x = null,
             y = null,
@@ -121,18 +121,18 @@
           dataReady();
         };
       };
-  
+
   /**
-   * Grafiti markup Language (GML) popcorn plug-in 
+   * Grafiti markup Language (GML) popcorn plug-in
    * Renders a GML tag inside an HTML element
    * Options parameter will need a mandatory start, end, target, gmltag.
    * Optional parameters: none.
    * Start is the time that you want this plug-in to execute
-   * End is the time that you want this plug-in to stop executing 
+   * End is the time that you want this plug-in to stop executing
    * Target is the id of the document element that you wish to render the grafiti in
    * gmltag is the numerical reference to a gml tag via 000000book.com
    * @param {Object} options
-   * 
+   *
    * Example:
      var p = Popcorn('#video')
        .gml({
@@ -145,11 +145,11 @@
    */
   Popcorn.plugin( "gml" , {
 
-    _setup : function( options ) {
+    _setup: function( options ) {
 
       var self = this,
           target = document.getElementById( options.target );
-      
+
       options.endDrawing = options.endDrawing || options.end;
 
       // create a canvas to put in the target div
@@ -162,7 +162,7 @@
         throw new Error( "target container doesn't exist" );
       }
       target && target.appendChild( options.container );
-      
+
       var scriptReady = function() {
         Popcorn.getJSONP( "http://000000book.com/data/" + options.gmltag + ".json?callback=", function( data ) {
 
@@ -176,15 +176,15 @@
 
         Popcorn.getScript( "http://processingjs.org/content/download/processing-js-1.3.0/processing-1.3.0.min.js", scriptReady );
       } else {
-      
+
         scriptReady();
       }
 
     },
     /**
-     * @member gml 
-     * The start function will be executed when the currentTime 
-     * of the video  reaches the start time provided by the 
+     * @member gml
+     * The start function will be executed when the currentTime
+     * of the video  reaches the start time provided by the
      * options variable
      */
     start: function( event, options ) {
@@ -193,9 +193,9 @@
       options.container.style.display = "block";
     },
     /**
-     * @member gml 
-     * The end function will be executed when the currentTime 
-     * of the video  reaches the end time provided by the 
+     * @member gml
+     * The end function will be executed when the currentTime
+     * of the video  reaches the end time provided by the
      * options variable
      */
     end: function( event, options ) {
diff --git a/plugins/processing/popcorn.processing.js b/plugins/processing/popcorn.processing.js
index 81623581d..622b6b46d 100644
--- a/plugins/processing/popcorn.processing.js
+++ b/plugins/processing/popcorn.processing.js
@@ -26,13 +26,13 @@
 
 (function ( Popcorn ) {
 
-  Popcorn.plugin( "processing" , function ( options ) {
+  Popcorn.plugin( "processing", function( options ) {
 
     var init = function( context ) {
 
       function scriptReady( options ) {
         var addListeners = function() {
-          context.listen( "pause", function () {
+          context.listen( "pause", function() {
             if ( options.canvas.style.display === "inline" ) {
               options.pjsInstance.noLoop();
             }
@@ -64,17 +64,16 @@
 
               options.noPause = options.noPause || false;
               !options.noPause && addListeners();
-							options.codeReady = true;
+              options.codeReady = true;
             }
           });
         } else if ( Popcorn.plugin.debug ) {
 
           throw new Error( "Popcorn.Processing: options.sketch is undefined" );
         }
-
       }
 
-      if (!window.Processing) {
+      if ( !window.Processing ) {
         Popcorn.getScript( "http://processingjs.org/content/download/processing-js-1.3.0/processing-1.3.0.js", function() {
           scriptReady( options );
         });
@@ -97,7 +96,7 @@
         }
 
         var canvas = document.createElement( "canvas" );
-        canvas.id = Popcorn.guid( options.target + "-sketch-" );
+        canvas.id = Popcorn.guid( options.target + "-sketch" );
         canvas.style.display = "none";
         options.canvas = canvas;
 
@@ -133,11 +132,31 @@
       website: "cadecairos.blogspot.com, ben1amin.wordpress.org"
     },
     options: {
-      start :   { elem: "input", type: "text", label: "In" },
-      end :     { elem: "input", type: "text", label: "Out" },
-      target :  { elem: "input", type: "text", label: "Target" },
-      sketch :  { elem: "input", type: "text", label: "Sketch" },
-      noPause : { elem: "select", options: [ "TRUE", "FALSE" ], label: "No Loop" }
+      start: {
+        elem: "input",
+        type: "text",
+        label: "In"
+      },
+      end: {
+        elem: "input",
+        type: "text",
+        label: "Out"
+      },
+      target: {
+        elem: "input",
+        type: "text",
+        label: "Target"
+      },
+      sketch: {
+        elem: "input",
+        type: "text",
+        label: "Sketch"
+      },
+      noPause: {
+        elem: "select",
+        options: [ "TRUE", "FALSE" ],
+        label: "No Loop"
+      }
     }
   });
 }( Popcorn ));

From 99c06836173caa01ab5952b116558a054fdbb996 Mon Sep 17 00:00:00 2001
From: Matthew Schranz <schranz.m@gmail.com>
Date: Fri, 23 Sep 2011 13:37:28 -0400
Subject: [PATCH 086/140] [#733] Small typo changed in error message about
 container not existing

---
 plugins/facebook/popcorn.facebook.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/facebook/popcorn.facebook.js b/plugins/facebook/popcorn.facebook.js
index 0366ed0da..faf2b65d7 100755
--- a/plugins/facebook/popcorn.facebook.js
+++ b/plugins/facebook/popcorn.facebook.js
@@ -192,7 +192,7 @@
       setOptions[ options.type ]();
 
       if ( !target && Popcorn.plugin.debug ) {
-        throw new Error( "flickr target container doesn't exist" );
+        throw new Error( "Facebook target container doesn't exist" );
       }
       target && target.appendChild( options._container );
     },

From c68fdfd2b0286c3d098af9477ae37ff72bb2ea31 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Fri, 23 Sep 2011 14:01:54 -0400
Subject: [PATCH 087/140] fixed more style issues

---
 plugins/gml/popcorn.gml.js               | 2 +-
 plugins/processing/popcorn.processing.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/gml/popcorn.gml.js b/plugins/gml/popcorn.gml.js
index 9de47032f..14163017a 100755
--- a/plugins/gml/popcorn.gml.js
+++ b/plugins/gml/popcorn.gml.js
@@ -1,6 +1,6 @@
 // PLUGIN: GML
 
-(function ( Popcorn ) {
+(function( Popcorn ) {
 
   var gmlPlayer = function( $p ) {
 
diff --git a/plugins/processing/popcorn.processing.js b/plugins/processing/popcorn.processing.js
index 622b6b46d..25a3993a2 100644
--- a/plugins/processing/popcorn.processing.js
+++ b/plugins/processing/popcorn.processing.js
@@ -24,7 +24,7 @@
  *
  */
 
-(function ( Popcorn ) {
+(function( Popcorn ) {
 
   Popcorn.plugin( "processing", function( options ) {
 

From e59c38fc2ed013943c3c6ca6b19c8d2edebdd57c Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Fri, 23 Sep 2011 14:47:50 -0400
Subject: [PATCH 088/140] A small initial fix for scotts comments

---
 popcorn.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index 59499b65c..4e54f8f74 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1207,9 +1207,8 @@
       options._natives.type = name;
       options._running = false;
 
-      natives[ "in" ] && ( natives.start = natives[ "in" ] );
-
-      natives[ "out" ] && ( natives.end = natives[ "out" ] );
+      natives.start = natives.start || natives[ "in" ];
+      natives.end = natives.end || natives[ "out" ]; 
 
       // Check for previously set default options
       defaults = this.options.defaults && this.options.defaults[ options._natives && options._natives.type ];

From fd709de12f047f3ebed56e4154eb19947465cf01 Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Fri, 23 Sep 2011 15:02:37 -0400
Subject: [PATCH 089/140] [#725] Adds Popcorn.noConflict(); Includes 6 unit
 tests and updates to popcorn.unit.setup.js

---
 popcorn.js                 | 13 +++++++++-
 test/popcorn.unit.js       | 52 ++++++++++++++++++++++++--------------
 test/popcorn.unit.setup.js |  5 ++++
 3 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index fa99b4e74..d7af3f4fd 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -24,6 +24,9 @@
   hasOwn = OP.hasOwnProperty,
   toString = OP.toString,
 
+  // Copy global Popcorn (may not exist)
+  _Popcorn = global.Popcorn,
+
   //  ID string matching
   rIdExp  = /^(#([\w\-\_\.]+))$/,
 
@@ -280,6 +283,14 @@
 
   // A Few reusable utils, memoized onto Popcorn
   Popcorn.extend( Popcorn, {
+    noConflict: function( deep ) {
+
+      if ( deep ) {
+        global.Popcorn = _Popcorn;
+      }
+
+      return Popcorn;
+    },
     error: function( msg ) {
       throw new Error( msg );
     },
@@ -784,7 +795,7 @@
         break;
       }
     }
-    
+
     this.timeUpdate( obj, null );
 
     // Store references to user added trackevents in ref table
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 5a6f18e9f..3ee16ed47 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -1,46 +1,60 @@
-module("Popcorn API");
-test("API", function() {
+module("Core");
+test( "Core", function() {
 
   var expects = 3,
       count = 0;
 
-  expect(expects);
+  expect( expects );
 
-  function plus(){ if ( ++count == expects ) start(); }
+  function plus() {
+    if ( ++count == expects ) {
+      start();
+    }
+  }
 
   stop( 10000 );
 
-
   try {
-
     ok( Popcorn, "Popcorn exists");
     plus();
-
   } catch (e) {};
 
-
   try {
-
     ok( typeof Popcorn === "function", "Popcorn is a function");
     plus();
-
   } catch (e) {};
 
   try {
-
     Popcorn(function() {
-
       ok(1, "Popcorn calls its function argument");
       plus();
+    });
+  } catch (e) {};
+});
 
+test( "noConflict", function() {
 
-    });
+  expect( 6 );
 
-  } catch (e) {};
+  ok( Popcorn.noConflict, "Popcorn.noConflict exists" );
+  equal( typeof Popcorn.noConflict, "function", "Popcorn.noConflict is a function" );
 
+  var $$ = Popcorn;
 
+  deepEqual( Popcorn, Popcorn.noConflict(), "noConflict returned the Popcorn object" );
+  deepEqual( Popcorn, $$, "Make sure Popcorn wasn't touched." );
+
+
+  Popcorn = $$;
+
+  deepEqual( Popcorn.noConflict( true ), $$, "noConflict returned the Popcorn object" );
+  deepEqual( Popcorn, originalPopcorn, "Make sure Popcorn was reverted." );
+
+  Popcorn = $$;
 });
 
+
+
 test("Popcorn.* Static Methods", function() {
 
   var statics = [ "forEach", "extend", "error", "guid", "sizeOf", "nop",
@@ -580,10 +594,10 @@ test( "play(n)/pause(n) custom stop()", function() {
   };
 
   var outerHTML = [
-			"<video id='video-fixture' preload='auto' controls='' style='display:;width:300px' tabindex='0'>",
-			document.getElementById( "video" ).innerHTML,
-			"</video>"
-			].join( "\n" ),
+      "<video id='video-fixture' preload='auto' controls='' style='display:;width:300px' tabindex='0'>",
+      document.getElementById( "video" ).innerHTML,
+      "</video>"
+      ].join( "\n" ),
       count = 0,
       expects = 2,
       $pop;
@@ -3041,7 +3055,7 @@ test( "Popcorn.disable/enable/toggle (timeupdate)", function() {
 
   stop( 10000 );
 
-	$pop.currentTime( 39 ).play();
+  $pop.currentTime( 39 ).play();
 });
 
 module("Popcorn XHR");
diff --git a/test/popcorn.unit.setup.js b/test/popcorn.unit.setup.js
index 7f1d11acd..d043f4c41 100644
--- a/test/popcorn.unit.setup.js
+++ b/test/popcorn.unit.setup.js
@@ -2,6 +2,11 @@ if ( !window[ "console" ] ) {
   jQuery.getScript( "https://getfirebug.com/firebug-lite-debug.js" );
 }
 
+// .noConflict() setup
+var Popcorn = this.Popcorn || "Popcorn",
+  pop = this.pop || "pop",
+  originalPopcorn = Popcorn;
+
 (function( global ) {
 
   var Setup = {};

From d9c14a296c4fe3767aa4a2514ed94ea2c342bb84 Mon Sep 17 00:00:00 2001
From: Matthew Schranz <schranz.m@gmail.com>
Date: Fri, 23 Sep 2011 15:30:39 -0400
Subject: [PATCH 090/140] [#733] Added Test for Empty Block in Facebook Plugin

---
 plugins/facebook/popcorn.facebook.unit.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/plugins/facebook/popcorn.facebook.unit.js b/plugins/facebook/popcorn.facebook.unit.js
index 84fd5845f..1e01cf9dd 100755
--- a/plugins/facebook/popcorn.facebook.unit.js
+++ b/plugins/facebook/popcorn.facebook.unit.js
@@ -83,5 +83,23 @@ test("Popcorn Facebook Plugin", function () {
     ok ( document.getElementById( "facepilediv" ).innerHTML, "Facepilediv is not empty at 0:05 (expected)" );
     plus();
   });
+  
+});
+
+test( "Test Empty Block", function () {
+
+  Popcorn.plugin.debug = true;
+
+  var pop = Popcorn( "#video" );
+  
+  expect( 1 );
+  
+  // Tests for thrown Error on emtpy block
+  try {
+    pop.facebook({});
+  } catch( e ) {
+    ok( true, "Empty event was caught by debugger" );
+  }
+  
 });
 

From 90d68232a97dd89e2e1a6eab4b0b9c17a4c01a85 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Mon, 26 Sep 2011 10:07:23 -0400
Subject: [PATCH 091/140] Some more work done

---
 popcorn.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/popcorn.js b/popcorn.js
index 4e54f8f74..fd55671df 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1207,6 +1207,7 @@
       options._natives.type = name;
       options._running = false;
 
+      
       natives.start = natives.start || natives[ "in" ];
       natives.end = natives.end || natives[ "out" ]; 
 

From d3533a33c0840bd69675f9f04d4c3ce932e587d5 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Mon, 26 Sep 2011 11:39:57 -0400
Subject: [PATCH 092/140] Unit test fix

---
 test/popcorn.unit.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index d2c6acdf9..c07c67140 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -2580,7 +2580,7 @@ test("Defaulting Empty End Values", function() {
 
 test( "In/Out aliases", function() {
   var popcorn = Popcorn( "#video" ),
-      expects = 3,
+      expects = 4,
       count = 0,
       counter = 0; 
 
@@ -2617,7 +2617,8 @@ test( "In/Out aliases", function() {
   ok( popcorn.data.events[ "in" ], "in is a valid alias for start" );
   plus();
 
-  ok( popcorn.data.events[ "out" ], "out is a valid alias for end" ); 
+  ok( popcorn.data.events[ "out" ], "out is a valid alias for end" );
+  plus();
 
   equals( counter, 0, "Counter is at 0, neither in or out have been called" );
   plus();

From a437273d8ca6068fee0c9b29000bfb8b0d67a163 Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Mon, 26 Sep 2011 12:00:32 -0400
Subject: [PATCH 093/140] [#737] Fixes borked tests

---
 test/popcorn.unit.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 7ea4a844c..8cbe75581 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -589,10 +589,10 @@ test( "play(n)/pause(n) custom stop()", function() {
   };
 
   var outerHTML = [
-			"<video id='video-fixture' preload='auto' controls='' style='display:;width:300px' tabindex='0'>",
-			document.getElementById( "video" ).innerHTML,
-			"</video>"
-			].join( "\n" ),
+      "<video id='video-fixture' preload='auto' controls='' style='display:;width:300px' tabindex='0'>",
+      document.getElementById( "video" ).innerHTML,
+      "</video>"
+      ].join( "\n" ),
       count = 0,
       expects = 2,
       $pop;
@@ -1911,6 +1911,7 @@ test("timeUpdate add track event while paused", function() {
   function plus() {
     if ( ++count === expects ) {
       Popcorn.removePlugin( "timeUpdateTester" );
+      start();
     }
   }
 
@@ -1928,15 +1929,16 @@ test("timeUpdate add track event while paused", function() {
     };
   });
 
-  $pop.currentTime(40).pause();
+  stop();
+  $pop.currentTime( 1 ).pause();
 
   equals( $pop.getTrackEvents().length, 0, "Initially no trackEvents" );
   plus();
 
   $pop.timeUpdateTester({
-    id:"timeUpdateID",
-    start:40,
-    end: 41
+    id: "timeUpdateID",
+    start: 1,
+    end: 1
   });
 
   equals( $pop.getTrackEvents().length, 1, "trackEvent successfully added" );
@@ -3050,7 +3052,7 @@ test( "Popcorn.disable/enable/toggle (timeupdate)", function() {
 
   stop( 10000 );
 
-	$pop.currentTime( 39 ).play();
+  $pop.currentTime( 39 ).play();
 });
 
 module("Popcorn XHR");

From 342d26c48d3b58fdba04b7a6610a92c3c2481ac4 Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Mon, 26 Sep 2011 12:07:58 -0400
Subject: [PATCH 094/140] [#737] Test re-write

---
 test/popcorn.unit.js | 31 ++++++++-----------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 8cbe75581..841707b65 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -1904,7 +1904,7 @@ test("timeUpdate add track event while paused", function() {
 
   var $pop = Popcorn( "#video" ),
     count = 0,
-    expects = 3;
+    expects = 1;
 
   expect( expects );
 
@@ -1915,40 +1915,25 @@ test("timeUpdate add track event while paused", function() {
     }
   }
 
-  Popcorn.plugin("timeUpdateTester", function() {
+  stop();
+
+  Popcorn.plugin( "timeUpdateTester", function() {
     return {
       start: function () {
-        var div = document.createElement("div");
-        div.id = "timeUpdate-test";
-
-        document.body.appendChild(div);
+        ok( true, "timeupdater ran while paused");
+        plus();
       },
       end: function () {
-        document.getElementById("timeUpdate-test").parentNode.removeChild(document.getElementById("timeUpdate-test"));
       }
     };
   });
 
-  stop();
-  $pop.currentTime( 1 ).pause();
-
-  equals( $pop.getTrackEvents().length, 0, "Initially no trackEvents" );
-  plus();
+  $pop.currentTime( 1 ).pause()
 
   $pop.timeUpdateTester({
-    id: "timeUpdateID",
     start: 1,
-    end: 1
+    end: 2
   });
-
-  equals( $pop.getTrackEvents().length, 1, "trackEvent successfully added" );
-  plus();
-
-  ok( document.getElementById( "timeUpdate-test" ), "trackEvent successfully added, content was displayed while video was paused" );
-  plus();
-
-  $pop.removeTrackEvent( "timeUpdateID" );
-
 });
 
 test("Plugin Factory", function () {

From 3aaf9bf8f14eb30cd8dbdd901e86f116f2a2d37c Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Mon, 26 Sep 2011 13:57:08 -0400
Subject: [PATCH 095/140] Fixed potential issue with options.start or
 options.in being 0, also took scotts advice on handling start over in

---
 popcorn.js | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index fd55671df..ae5605b8b 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1207,7 +1207,6 @@
       options._natives.type = name;
       options._running = false;
 
-      
       natives.start = natives.start || natives[ "in" ];
       natives.end = natives.end || natives[ "out" ]; 
 
@@ -1237,21 +1236,13 @@
       //  Ensure a manifest object, an empty object is a sufficient fallback
       options._natives.manifest = manifest;
       
-      if ( options[ "in" ] ) {
-          options.start = options[ "in" ];
-      }
-
-      if ( options[ "out" ] ) {
-          options.end = options[ "out" ];
-      }
-
       //  Checks for expected properties
       if ( !( "start" in options ) ) {
-        options.start = 0;
+        options.start = options[ "in" ] || 0;
       }
 
       if ( !( "end" in options ) ) {
-        options.end = this.duration() || Number.MAX_VALUE;
+        options.end = options[ "out" ] || this.duration() || Number.MAX_VALUE;
       }
 
       // Merge with defaults if they exist, make sure per call is prioritized

From e592656f44fdc6cea6267bc0a25963a254c1a95e Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Mon, 26 Sep 2011 14:44:06 -0400
Subject: [PATCH 096/140] [#730] Adds Popcorn.isSupported boolean flag

---
 popcorn.js                   |  9 +++++++--
 test/popcorn.unit.archaic.js | 19 ++++++++++++++-----
 test/popcorn.unit.js         |  6 ++++++
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index 9450dcaf6..879488282 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -2,7 +2,9 @@
 
   // Popcorn.js does not support archaic browsers
   if ( !document.addEventListener ) {
-    global.Popcorn = {};
+    global.Popcorn = {
+      isSupported: false
+    };
 
     var methods = ( "forEach extend effects error guid sizeOf isArray nop position disable enable destroy " +
           "addTrackEvent removeTrackEvent getTrackEvents getTrackEvent getLastTrackEventId " +
@@ -63,9 +65,12 @@
     return new Popcorn.p.init( entity, options || null );
   };
 
-  // Popcorn API version, automatically inserted via build system.
+  //  Popcorn API version, automatically inserted via build system.
   Popcorn.version = "@VERSION";
 
+  //  Boolean flag allowing a client to determine if Popcorn can be supported
+  Popcorn.isSupported = true;
+
   //  Instance caching
   Popcorn.instances = [];
 
diff --git a/test/popcorn.unit.archaic.js b/test/popcorn.unit.archaic.js
index e1df25c9a..0b78131dc 100644
--- a/test/popcorn.unit.archaic.js
+++ b/test/popcorn.unit.archaic.js
@@ -1,15 +1,24 @@
 module("Core");
 test("Dummy", function () {
 
-  expect(1);
+  expect( 1 );
 
   ok( Popcorn, "Popcorn dummy exists");
 });
 
+test("isSupported", function () {
+
+  expect( 2 );
+
+  ok( "isSupported" in Popcorn, "Popcorn.isSupported boolean flag exists");
+  ok( !Popcorn.isSupported, "Popcorn.isSupported boolean flag is false");
+});
+
+
 module("Static Methods");
 (function() {
 
-  var method, 
+  var method,
       methods = ( "removeInstance addInstance getInstanceById removeInstanceById " +
           "forEach extend effects error guid sizeOf isArray nop position disable enable " +
           "addTrackEvent removeTrackEvent getTrackEvents getTrackEvent getLastTrackEventId " +
@@ -21,7 +30,7 @@ module("Static Methods");
 
     test( method, function () {
 
-      expect(1);
+      expect( 1 );
 
       ok( Popcorn[ method ], "Popcorn." + method + " exists");
     });
@@ -33,7 +42,7 @@ module("Static Methods");
 module("Attempt");
 (function() {
 
-  var method, 
+  var method,
       methods = ( "removeInstance addInstance getInstanceById removeInstanceById " +
           "forEach extend effects error guid sizeOf isArray nop position disable enable " +
           "addTrackEvent removeTrackEvent getTrackEvents getTrackEvent getLastTrackEventId " +
@@ -45,7 +54,7 @@ module("Attempt");
 
     test( method, function () {
 
-      expect(1);
+      expect( 1 );
 
       equal( Popcorn[ method ](), undefined, "Popcorn." + method + "() dummy returns undefined without throwing exception");
 
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index b975bc71b..8162ed0fe 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -53,7 +53,13 @@ test( "noConflict", function() {
   Popcorn = $$;
 });
 
+test("isSupported", function () {
 
+  expect( 2 );
+
+  ok( "isSupported" in Popcorn, "Popcorn.isSupported boolean flag exists");
+  ok( Popcorn.isSupported, "Popcorn.isSupported boolean flag is true");
+});
 
 test("Popcorn.* Static Methods", function() {
 

From 5b142310d4c9b050a8837f579d35e58684459cd6 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Mon, 26 Sep 2011 15:15:24 -0400
Subject: [PATCH 097/140] Modified Popcorn.protect.natives to capture keys from
 Popcorn.p, added better tests, fixed test polluting the prototype [#738]

---
 popcorn.js           | 11 +++++------
 test/popcorn.unit.js | 29 +++++++++++++++++++----------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index 9450dcaf6..cf46c36d5 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -750,12 +750,6 @@
     Popcorn.p[ key ] = Popcorn.events.fn[ key ];
   });
 
-  //  Protected API methods
-  Popcorn.protect = {
-    natives: ( "load play pause currentTime playbackRate mute volume duration removePlugin roundTime trigger listen unlisten exec" +
-              "preload playbackRate autoplay loop controls muted buffered readyState seeking paused played seekable ended" ).toLowerCase().split( /\s+/ )
-  };
-
   // Internal Only - Adds track events to the instance object
   Popcorn.addTrackEvent = function( obj, track ) {
 
@@ -1776,6 +1770,11 @@
   // alias for exec function
   Popcorn.p.cue = Popcorn.p.exec;
 
+  //  Protected API methods
+  Popcorn.protect = {
+    natives: Object.keys( Popcorn.p ).join( "," ).toLowerCase().split( "," )
+  };
+
   //  Exposes Popcorn to global context
   global.Popcorn = Popcorn;
 
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index b975bc71b..6f2fa3ba3 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -2497,6 +2497,7 @@ test("Remove Plugin", function() {
   function plus() {
     if ( ++count === expects ) {
       start();
+      Popcorn.removePlugin( "cleanup" );
     }
   }
 
@@ -2616,26 +2617,34 @@ test("Remove Plugin", function() {
 
 });
 
+test( "Protected Names", function() {
 
+  var keys = Object.keys( Popcorn.p ),
+      len = keys.length,
+      count = 0,
+      popped = Popcorn( "#video" );
 
+  expect( len );
 
-test("Protected Names", function() {
-  //QUnit.reset();
-
-  expect(8);
-
-  var popped = Popcorn("#video");
+  function plus() {
+    if ( ++count === len ) {
+      start();
+    }
+  }
 
-  $.each( "load play pause currentTime playbackRate mute volume duration".split(/\s+/), function(k, name) {
+  Popcorn.forEach( keys, function( name ) {
     try {
 
-      Popcorn.plugin( name, {});
-    }   catch (e) {
+      Popcorn.plugin( name, {} );
+    } catch ( e ) {
 
       ok( name, "Attempting to overwrite '" + name + "' threw an exception " );
-
+      plus();
     };
   });
+
+  stop( 5000 );
+
 });
 
 test("Defaulting Empty End Values", function() {

From 2eb47937cec0d802ca2bce2373e46a2be949af50 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Mon, 26 Sep 2011 15:28:47 -0400
Subject: [PATCH 098/140] Fixed left over merge commit markers

---
 plugins/attribution/popcorn.attribution.unit.html | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/plugins/attribution/popcorn.attribution.unit.html b/plugins/attribution/popcorn.attribution.unit.html
index b3f4b7c38..05b2a0a23 100755
--- a/plugins/attribution/popcorn.attribution.unit.html
+++ b/plugins/attribution/popcorn.attribution.unit.html
@@ -34,13 +34,10 @@ <h2 id="qunit-userAgent"></h2>
     <source id="ogv"
       src="../../test/trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'>
-<<<<<<< HEAD
-=======
-      
-    <source id='webm'
+
+    <source id="webm"
       src="../../test/trailer.webm"
       type='video/webm; codecs="vp8, vorbis"'>
->>>>>>> d2f71c054c4e017ce8a358931def7d50cf3c10e1
 
     <p>Your user agent does not support the HTML5 Video element.</p>
 

From 6bbf24a8429ade31db2b26e1d0a0ed69f38ff5d3 Mon Sep 17 00:00:00 2001
From: Jon Buckley <jon@jbuckley.ca>
Date: Mon, 26 Sep 2011 15:37:13 -0400
Subject: [PATCH 099/140] Update and move sequence submodule. Slim Makefile

---
 .gitmodules      |  7 ++++---
 Makefile         | 18 ++++--------------
 modules/sequence |  1 +
 players/sequence |  1 -
 4 files changed, 9 insertions(+), 18 deletions(-)
 create mode 160000 modules/sequence
 delete mode 160000 players/sequence

diff --git a/.gitmodules b/.gitmodules
index 66ee9ee5e..200a218a5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
-[submodule "players/sequence"]
-	path = players/sequence
-	url = git://github.com/rwldrn/popcorn.sequence.git
+
+[submodule "modules/sequence"]
+	path = modules/sequence
+	url = https://github.com/rwldrn/popcorn.sequence.git
diff --git a/Makefile b/Makefile
index f5c06826e..ee6e4d10d 100644
--- a/Makefile
+++ b/Makefile
@@ -123,7 +123,7 @@ ${POPCORN_MIN}: ${POPCORN_DIST}
 	@@$(call add_license, $(POPCORN_MIN))
 	@@$(call add_version, $(POPCORN_MIN))
 
-${POPCORN_COMPLETE_MIN}: update ${POPCORN_SRC} ${MODULES_SRC} ${PLUGINS_SRC} ${PARSERS_SRC} $(EFFECTS_SRC) ${DIST_DIR}
+${POPCORN_COMPLETE_MIN}: setup ${POPCORN_SRC} ${MODULES_SRC} ${PLUGINS_SRC} ${PARSERS_SRC} $(EFFECTS_SRC) ${DIST_DIR}
 	@@echo "Building" ${POPCORN_COMPLETE_MIN}
 	@@$(call compile, $(POPCORN_COMPLETE_LIST), $(POPCORN_COMPLETE_MIN))
 	@@$(call add_license, $(POPCORN_COMPLETE_MIN))
@@ -179,7 +179,7 @@ $(EFFECTS_DIST): $(EFFECTS_SRC) $(DIST_DIR)
 	@@echo "Building $(EFFECTS_DIST)"
 	@@cat $(EFFECTS_SRC) > $(EFFECTS_DIST)
 
-complete: update ${POPCORN_SRC} ${MODULES_SRC} ${PARSERS_SRC} ${PLUGINS_SRC} ${PLAYERS_SRC} $(EFFECTS_SRC) ${DIST_DIR}
+complete: setup ${POPCORN_SRC} ${MODULES_SRC} ${PARSERS_SRC} ${PLUGINS_SRC} ${PLAYERS_SRC} $(EFFECTS_SRC) ${DIST_DIR}
 	@@echo "Building popcorn + modules + plugins + parsers + players + effects..."
 	@@cat ${POPCORN_SRC} ${MODULES_SRC} ${PLUGINS_SRC} ${PARSERS_SRC} ${PLAYERS_SRC} $(EFFECTS_SRC) > $(POPCORN_COMPLETE_DIST)
 	@@$(call add_license, $(POPCORN_COMPLETE_DIST))
@@ -264,16 +264,6 @@ clean:
 	@@echo "Removing Distribution directory:" ${DIST_DIR}
 	@@rm -rf ${DIST_DIR}
 
-# Setup any git submodules we need
-SEQUENCE_SRC = ${PLAYERS_DIR}/sequence/popcorn.sequence.js
-
-setup: ${SEQUENCE_SRC} update
-
-update:
+setup:
 	@@echo "Updating submodules..."
-	@@git submodule update
-	@@cd  players/sequence; git pull origin master
-
-${SEQUENCE_SRC}:
-	@@echo "Setting-up submodules..."
-	@@git submodule init
+	@@git submodule update --init
diff --git a/modules/sequence b/modules/sequence
new file mode 160000
index 000000000..45ec9d69a
--- /dev/null
+++ b/modules/sequence
@@ -0,0 +1 @@
+Subproject commit 45ec9d69ae770a3b221d4ba8b935ae19c76cb34f
diff --git a/players/sequence b/players/sequence
deleted file mode 160000
index 01eb7df20..000000000
--- a/players/sequence
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 01eb7df20bc9e58c9cab108789f7b4ea7c347925

From b62da5a0042ece0b1606af406bee0cc6dfa80155 Mon Sep 17 00:00:00 2001
From: Jon Buckley <jon@jbuckley.ca>
Date: Mon, 26 Sep 2011 16:42:38 -0400
Subject: [PATCH 100/140] Fixes for SR

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index ee6e4d10d..b5ccd9f50 100644
--- a/Makefile
+++ b/Makefile
@@ -115,7 +115,7 @@ ${POPCORN_DIST}: $(POPCORN_SRC) | $(DIST_DIR)
 	@@$(call add_license, $(POPCORN_DIST))
 	@@$(call add_version, $(POPCORN_DIST))
 
-min: ${POPCORN_MIN} ${MODULES_MIN} ${PLUGINS_MIN} ${PARSERS_MIN} ${PLAYERS_MIN} $(EFFECTS_MIN) ${POPCORN_COMPLETE_MIN}
+min: setup ${POPCORN_MIN} ${MODULES_MIN} ${PLUGINS_MIN} ${PARSERS_MIN} ${PLAYERS_MIN} $(EFFECTS_MIN) ${POPCORN_COMPLETE_MIN}
 
 ${POPCORN_MIN}: ${POPCORN_DIST}
 	@@echo "Building" ${POPCORN_MIN}
@@ -123,13 +123,13 @@ ${POPCORN_MIN}: ${POPCORN_DIST}
 	@@$(call add_license, $(POPCORN_MIN))
 	@@$(call add_version, $(POPCORN_MIN))
 
-${POPCORN_COMPLETE_MIN}: setup ${POPCORN_SRC} ${MODULES_SRC} ${PLUGINS_SRC} ${PARSERS_SRC} $(EFFECTS_SRC) ${DIST_DIR}
+${POPCORN_COMPLETE_MIN}: ${POPCORN_SRC} ${MODULES_SRC} ${PLUGINS_SRC} ${PARSERS_SRC} $(EFFECTS_SRC) ${DIST_DIR}
 	@@echo "Building" ${POPCORN_COMPLETE_MIN}
 	@@$(call compile, $(POPCORN_COMPLETE_LIST), $(POPCORN_COMPLETE_MIN))
 	@@$(call add_license, $(POPCORN_COMPLETE_MIN))
 	@@$(call add_version, $(POPCORN_COMPLETE_MIN))
 
-modules: ${MODULES_DIST}
+modules: setup ${MODULES_DIST}
 
 ${MODULES_MIN}: ${MODULES_DIST}
 	@@echo "Building" ${MODULES_MIN}

From e70641da9c6b95e2b8ce459225beaad3642bd2bd Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Mon, 26 Sep 2011 17:44:59 -0400
Subject: [PATCH 101/140] Fixed alias in and out problem by removing a
 removeInstance call

---
 test/popcorn.unit.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 98842445a..5f624ea9f 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -2673,17 +2673,16 @@ test("Defaulting Empty End Values", function() {
 
 test( "In/Out aliases", function() {
   var popcorn = Popcorn( "#video" ),
-      expects = 4,
+      expects = 5,
       count = 0,
       counter = 0; 
 
   expect( expects );
-  stop( 5000 );
+  stop();
 
   function plus() {
     if ( ++count === expects ) {
       Popcorn.removePlugin( "aliasTester" );
-      Popcorn.removeInstance( popcorn );
       start();
     }
   }

From 81e7569896c0efad516cfc870775e30291aeb81d Mon Sep 17 00:00:00 2001
From: Matthew Schranz <schranz.m@gmail.com>
Date: Sun, 25 Sep 2011 21:25:33 -0400
Subject: [PATCH 102/140] [#734] Made reference variables for all plugin
 options rather than having option.someValueHere all throughout the code.

---
 plugins/facebook/popcorn.facebook.js | 85 +++++++++++++++++-----------
 1 file changed, 51 insertions(+), 34 deletions(-)

diff --git a/plugins/facebook/popcorn.facebook.js b/plugins/facebook/popcorn.facebook.js
index 8e34871eb..8087cb387 100755
--- a/plugins/facebook/popcorn.facebook.js
+++ b/plugins/facebook/popcorn.facebook.js
@@ -176,7 +176,24 @@
 
     _setup: function( options ) {
 
-      var target = document.getElementById( options.target );
+      var target = document.getElementById( options.target ),
+          _type = options.type,
+          _font = options.font,
+          _xid = options.xid,
+          _href = options.href,
+          _site = options.site,
+          _height = options.height,
+          _width = options.width,
+          _action = options.action,
+          _stream = options.stream,
+          _header = options.header,
+          _layout = options.layout,
+          _maxRows = options.max_rows,
+          _borderColor = options.border_color,
+          _colorScheme = options.colorscheme,
+          _showFaces = options.show_faces,
+          _recom = options.recommendations,
+          _APTF = options.always_post_to_friends;
 
       // facebook script requires a div named fb-root
       if ( !document.getElementById( "fb-root" ) ) {
@@ -205,70 +222,70 @@
       };
 
       // default plugin is like button
-      options.type = ( options.type || "like" ).toLowerCase();
+      _type = ( _type || "like" ).toLowerCase();
 
       // default plugin is like button
-      if ( !validType( options.type ) ) {
-        options.type = "like";
+      if ( !validType( _type ) ) {
+        _type = "like";
       }
 
-      options._container = document.createElement( "fb:" + options.type );
+      options._container = document.createElement( "fb:" +_type );
 
       var setOptions = (function( options ) {
 
         options._container.style.display = "none";
 
         // activity feed uses 'site' rather than 'href'
-        var attr = options.type === "activity" ? "site" : "href";
+        var attr = _type === "activity" ? "site" : "href";
 
         options._container.setAttribute( attr, ( options[ attr ] || document.URL ) );
 
         return {
           "like": function () {
             options._container.setAttribute( "send", ( options.send || false ) );
-            options._container.setAttribute( "width", options.width );
-            options._container.setAttribute( "show_faces", options.show_faces );
-            options._container.setAttribute( "layout", options.layout );
-            options._container.setAttribute( "font", options.font );
-            options._container.setAttribute( "colorscheme", options.colorscheme );
+            options._container.setAttribute( "width", _width );
+            options._container.setAttribute( "show_faces", _showFaces );
+            options._container.setAttribute( "layout", _layout );
+            options._container.setAttribute( "font", _font );
+            options._container.setAttribute( "colorscheme", _colorScheme );
           },
           "like-box": function () {
-            options._container.setAttribute( "height", ( options.height || 250 ) );
-            options._container.setAttribute( "width", options.width );
-            options._container.setAttribute( "show_faces", options.show_faces );
-            options._container.setAttribute( "stream", options.stream );
-            options._container.setAttribute( "header", options.header );
-            options._container.setAttribute( "colorscheme", options.colorscheme );
+            options._container.setAttribute( "height", ( _height || 250 ) );
+            options._container.setAttribute( "width", _width );
+            options._container.setAttribute( "show_faces", _showFaces );
+            options._container.setAttribute( "stream", _stream );
+            options._container.setAttribute( "header", _header );
+            options._container.setAttribute( "colorscheme", _colorScheme );
           },
           "facepile": function () {
-            options._container.setAttribute( "height", options.height );
-            options._container.setAttribute( "width", options.width );
-            options._container.setAttribute( "max_rows", ( options.max_rows || 1 ) );
+            options._container.setAttribute( "height", _height );
+            options._container.setAttribute( "width", _width );
+            options._container.setAttribute( "max_rows", ( _maxRows || 1 ) );
           },
           "activity": function () {
-            options._container.setAttribute( "width", options.width );
-            options._container.setAttribute( "height", options.height );
-            options._container.setAttribute( "header", options.header );
-            options._container.setAttribute( "border_color", options.border_color );
-            options._container.setAttribute( "recommendations", options.recommendations );
-            options._container.setAttribute( "font", options.font );
-            options._container.setAttribute( "colorscheme", options.colorscheme );
+            options._container.setAttribute( "width", _width );
+            options._container.setAttribute( "height", _height );
+            options._container.setAttribute( "header", _header );
+            options._container.setAttribute( "border_color", _borderColor );
+            options._container.setAttribute( "recommendations", _recom );
+            options._container.setAttribute( "font", _font );
+            options._container.setAttribute( "colorscheme", _colorScheme );
           },
           "live-stream": function() {
-            options._container.setAttribute( "width", ( options.width || 400 ) );
-            options._container.setAttribute( "height", ( options.height || 500 ) );
-            options._container.setAttribute( "always_post_to_friends", ( options.always_post_to_friends || false ) );
+            options._container.setAttribute( "width", ( _width || 400 ) );
+            options._container.setAttribute( "height", ( _height || 500 ) );
+            options._container.setAttribute( "always_post_to_friends", ( _APTF || false ) );
             options._container.setAttribute( "event_app_id", options.event_app_id );
-            options._container.setAttribute( "xid", options.xid );
+            options._container.setAttribute( "xid", _xid );
           },
           "send": function() {
-            options._container.setAttribute( "font", options.font );
-            options._container.setAttribute( "colorscheme", options.colorscheme );
+            options._container.setAttribute( "font", _font );
+            options._container.setAttribute( "colorscheme", _colorScheme );
           }
         };
       })( options );
 
-      setOptions[ options.type ]();
+      setOptions[ _type ]();
 
       if ( !target && Popcorn.plugin.debug ) {
         throw new Error( "Facebook target container doesn't exist" );

From f3dadbf526b1e625d347dbcf13530b3fef52c9f0 Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Tue, 27 Sep 2011 12:09:56 -0400
Subject: [PATCH 103/140] review changes and Object.defineProperty use

---
 players/youtube/popcorn.youtube.js | 97 ++++++++++++++++++------------
 popcorn.js                         | 44 +++++++++-----
 2 files changed, 86 insertions(+), 55 deletions(-)

diff --git a/players/youtube/popcorn.youtube.js b/players/youtube/popcorn.youtube.js
index 7d35dca78..09b08b634 100755
--- a/players/youtube/popcorn.youtube.js
+++ b/players/youtube/popcorn.youtube.js
@@ -23,6 +23,11 @@ Popcorn.player( "youtube", {
 
     var youtubeInit = function() {
 
+      var flashvars,
+          params,
+          attributes,
+          src;
+
       // expose a callback to this scope, that is called from the global callback youtube calls
       onYouTubePlayerReady[ container.id ] = function() {
 
@@ -92,59 +97,62 @@ Popcorn.player( "youtube", {
           }
         };
 
-        media.__defineSetter__( "currentTime", function( val ) {
-
-          // make sure val is a number
-          currentTime = seekTime = +val;
-          seeking = true;
-          media.dispatchEvent( "seeked" );
-          media.dispatchEvent( "timeupdate" );
-          youtubeObject.seekTo( currentTime );
-          return currentTime;
-        });
-
-        media.__defineGetter__( "currentTime", function() {
+        Popcorn.player.defineProperty( media, "currentTime", {
+          set: function( val ) {
 
-          return currentTime;
-        });
+            if ( youtubeObject.isMuted() !== val ) {
 
-        media.__defineSetter__( "muted", function( val ) {
+              if ( val ) {
 
-          if ( youtubeObject.isMuted() !== val ) {
+                youtubeObject.mute();
+              } else {
 
-            if ( val ) {
+                youtubeObject.unMute();
+              }
 
-              youtubeObject.mute();
-            } else {
-
-              youtubeObject.unMute();
+              media.dispatchEvent( "volumechange" );
             }
 
-            media.dispatchEvent( "volumechange" );
-          }
+            return youtubeObject.isMuted();
+          },
+          get: function() {
 
-          return youtubeObject.isMuted();
+            return currentTime;
+          }
         });
 
-        media.__defineGetter__( "muted", function() {
+        Popcorn.player.defineProperty( media, "muted", {
+          set: function( val ) {
 
-          return youtubeObject.isMuted();
-        });
+            // make sure val is a number
+            currentTime = seekTime = +val;
+            seeking = true;
+            media.dispatchEvent( "seeked" );
+            media.dispatchEvent( "timeupdate" );
+            youtubeObject.seekTo( currentTime );
+            return currentTime;
+          },
+          get: function() {
 
-        media.__defineSetter__( "volume", function( val ) {
+            return youtubeObject.isMuted();
+          }
+        });
 
-          if ( youtubeObject.getVolume() !== val ) {
+        Popcorn.player.defineProperty( media, "volume", {
+          set: function( val ) {
 
-            youtubeObject.setVolume( val );
-            media.dispatchEvent( "volumechange" );
-          }
+            if ( youtubeObject.getVolume() !== val ) {
 
-          return youtubeObject.getVolume();
-        });
+              youtubeObject.setVolume( val );
+              media.dispatchEvent( "volumechange" );
+            }
 
-        media.__defineGetter__( "volume", function() {
+            return youtubeObject.getVolume();
+          },
+          get: function() {
 
-          return youtubeObject.getVolume();
+            return youtubeObject.getVolume();
+          }
         });
 
         media.readyState = 4;
@@ -164,15 +172,26 @@ Popcorn.player( "youtube", {
       options.controls = +options.controls === 0 || +options.controls === 1 ? options.controls : 1; 
       options.annotations = +options.annotations === 1 || +options.annotations === 3 ? options.annotations : 1;
 
-      var flashvars = {
+      flashvars = {
         playerapiid: container.id,
         controls: options.controls,
         iv_load_policy: options.annotations
       };
 
-      swfobject.embedSWF( "http://www.youtube.com/e/" + /^.*[\/=](.{11})/.exec( media.src )[ 1 ] + "?enablejsapi=1&playerapiid=" + container.id + "&version=3", 
+      params = {
+        wmode: "transparent",
+        allowScriptAccess: "always"
+      };
+
+      attributes = {
+        id: container.id
+      };
+
+      src = /^.*[\/=](.{11})/.exec( media.src )[ 1 ];
+
+      swfobject.embedSWF( "http://www.youtube.com/e/" + src + "?enablejsapi=1&playerapiid=" + container.id + "&version=3", 
                           container.id, media.offsetWidth, media.offsetHeight, "8", null,
-                          flashvars, {wmode: "transparent", allowScriptAccess: "always"}, {id: container.id} );
+                          flashvars, params, attributes );
     };
 
     if ( !window.swfobject ) {
diff --git a/popcorn.js b/popcorn.js
index 4ebd8c4de..334a1d07f 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1507,7 +1507,7 @@
           basePlayer[ val ] = container[ val ];
         } else if ( typeof container[ val ] === "function" ) {
 
-          basePlayer[ val ] = ( function( value ) {
+          basePlayer[ val ] = (function( value ) {
 
             return function() {
 
@@ -1516,13 +1516,17 @@
           }( val ));
         } else {
 
-          basePlayer.__defineGetter__( val, ( function( value ) {
+          Popcorn.player.defineProperty( basePlayer, val, {
+            get: (function( value ) {
 
-            return function() {
+              return function() {
 
-              return container[ value ];
-            };
-          }( val )));
+                return container[ value ];
+              };
+            }( val )),
+            set: Popcorn.nop,
+            configurable: true
+          });
         }
       }
 
@@ -1530,7 +1534,7 @@
 
         date = new Date() / 1000;
 
-        if( !basePlayer.paused ) {
+        if ( !basePlayer.paused ) {
 
           basePlayer.currentTime = basePlayer.currentTime + ( date - baselineTime );
           basePlayer.dispatchEvent( "timeupdate" );
@@ -1558,17 +1562,19 @@
         basePlayer.dispatchEvent( "pause" );
       };
 
-      basePlayer.__defineSetter__( "currentTime", function( val ) {
+      Popcorn.player.defineProperty( basePlayer, "currentTime", {
+        get: function() {
 
-        // make sure val is a number
-        currentTime = +val;
-        basePlayer.dispatchEvent( "timeupdate" );
-        return currentTime;
-      });
-
-      basePlayer.__defineGetter__( "currentTime", function() {
+          return currentTime;
+        },
+        set: function( val ) {
 
-        return currentTime;
+          // make sure val is a number
+          currentTime = +val;
+          basePlayer.dispatchEvent( "timeupdate" );
+          return currentTime;
+        },
+        configurable: true
       });
 
       // Adds an event listener to the object
@@ -1639,6 +1645,12 @@
     Popcorn[ name ] = Popcorn[ name ] || playerFn;
   };
 
+  Popcorn.player.defineProperty = Object.defineProperty || function( object, description, options ) {
+
+    object.__defineGetter__( description, options.get || Popcorn.nop );
+    object.__defineSetter__( description, options.set || Popcorn.nop );
+  };
+
   //  Cache references to reused RegExps
   var rparams = /\?/,
   //  XHR Setup object

From 96b904b9b01eb2b154e0088048c820ec92c7aa70 Mon Sep 17 00:00:00 2001
From: Matthew Schranz <schranz.m@gmail.com>
Date: Mon, 26 Sep 2011 10:47:06 -0400
Subject: [PATCH 104/140] [#734] Removed defaulting plugin type, removed tests
 and added one test.

---
 plugins/facebook/popcorn.facebook.js      | 112 +++++++++-------------
 plugins/facebook/popcorn.facebook.unit.js |  66 +++++--------
 2 files changed, 69 insertions(+), 109 deletions(-)

diff --git a/plugins/facebook/popcorn.facebook.js b/plugins/facebook/popcorn.facebook.js
index 8087cb387..26310b8b0 100755
--- a/plugins/facebook/popcorn.facebook.js
+++ b/plugins/facebook/popcorn.facebook.js
@@ -47,25 +47,13 @@
   */
 
   var ranOnce = false;
-
-  function toggle( container, display ) {
-    if ( container ) {
-      container.style.display = display;
-
-      return;
-    }
-
-    setTimeout(function() {
-      toggle( container, display );
-    }, 10 );
-  }
-
+  
   Popcorn.plugin( "facebook" , {
     manifest: {
       about: {
         name: "Popcorn Facebook Plugin",
         version: "0.1",
-        author: "Dan Ventura",
+        author : "Dan Ventura, Matthew Schranz: @mjschranz",
         website: "dsventura.blogspot.com"
       },
       options: {
@@ -177,23 +165,7 @@
     _setup: function( options ) {
 
       var target = document.getElementById( options.target ),
-          _type = options.type,
-          _font = options.font,
-          _xid = options.xid,
-          _href = options.href,
-          _site = options.site,
-          _height = options.height,
-          _width = options.width,
-          _action = options.action,
-          _stream = options.stream,
-          _header = options.header,
-          _layout = options.layout,
-          _maxRows = options.max_rows,
-          _borderColor = options.border_color,
-          _colorScheme = options.colorscheme,
-          _showFaces = options.show_faces,
-          _recom = options.recommendations,
-          _APTF = options.always_post_to_friends;
+          _type = options.type;
 
       // facebook script requires a div named fb-root
       if ( !document.getElementById( "fb-root" ) ) {
@@ -216,24 +188,25 @@
           });
         };
       }
-
+      
+      // Lowercase to make value consistent no matter what user inputs
+      _type = _type.toLowerCase();
+      
       var validType = function( type ) {
-        return ( [ "like", "like-box", "activity", "facepile", "comments", "live-stream", "send" ].indexOf( type ) > -1 );
+        return ( ["like", "like-box", "activity", "facepile", "live-stream", "send"].indexOf( type ) > -1 );
       };
 
-      // default plugin is like button
-      _type = ( _type || "like" ).toLowerCase();
-
-      // default plugin is like button
+      // Checks if type is valid
       if ( !validType( _type ) ) {
-        _type = "like";
+        throw new Error( "Facebook plugin type was invalid." );
       }
-
+      
+      
       options._container = document.createElement( "fb:" +_type );
 
       var setOptions = (function( options ) {
 
-        options._container.style.display = "none";
+        //options._container.style.display = "none";
 
         // activity feed uses 'site' rather than 'href'
         var attr = _type === "activity" ? "site" : "href";
@@ -243,44 +216,44 @@
         return {
           "like": function () {
             options._container.setAttribute( "send", ( options.send || false ) );
-            options._container.setAttribute( "width", _width );
-            options._container.setAttribute( "show_faces", _showFaces );
-            options._container.setAttribute( "layout", _layout );
-            options._container.setAttribute( "font", _font );
-            options._container.setAttribute( "colorscheme", _colorScheme );
+            options._container.setAttribute( "width", options.width );
+            options._container.setAttribute( "show_faces", options.show_faces );
+            options._container.setAttribute( "layout", options.layout );
+            options._container.setAttribute( "font", options.font );
+            options._container.setAttribute( "colorscheme", options.colorscheme );
           },
           "like-box": function () {
-            options._container.setAttribute( "height", ( _height || 250 ) );
-            options._container.setAttribute( "width", _width );
-            options._container.setAttribute( "show_faces", _showFaces );
-            options._container.setAttribute( "stream", _stream );
-            options._container.setAttribute( "header", _header );
-            options._container.setAttribute( "colorscheme", _colorScheme );
+            options._container.setAttribute( "height", ( options.height || 250 ) );
+            options._container.setAttribute( "width", options.width );
+            options._container.setAttribute( "show_faces", options.show_faces );
+            options._container.setAttribute( "stream", options.stream );
+            options._container.setAttribute( "header", options.header );
+            options._container.setAttribute( "colorscheme", options.colorscheme );
           },
           "facepile": function () {
-            options._container.setAttribute( "height", _height );
-            options._container.setAttribute( "width", _width );
-            options._container.setAttribute( "max_rows", ( _maxRows || 1 ) );
+            options._container.setAttribute( "height", options.height );
+            options._container.setAttribute( "width", options.width );
+            options._container.setAttribute( "max_rows", ( options.max_rows || 1 ) );
           },
           "activity": function () {
-            options._container.setAttribute( "width", _width );
-            options._container.setAttribute( "height", _height );
-            options._container.setAttribute( "header", _header );
-            options._container.setAttribute( "border_color", _borderColor );
-            options._container.setAttribute( "recommendations", _recom );
-            options._container.setAttribute( "font", _font );
-            options._container.setAttribute( "colorscheme", _colorScheme );
+            options._container.setAttribute( "width", options.width );
+            options._container.setAttribute( "height", options.height );
+            options._container.setAttribute( "header", options.header );
+            options._container.setAttribute( "border_color", options.border_color );
+            options._container.setAttribute( "recommendations", options.recommendations );
+            options._container.setAttribute( "font", options.font );
+            options._container.setAttribute( "colorscheme", options.colorscheme );
           },
           "live-stream": function() {
-            options._container.setAttribute( "width", ( _width || 400 ) );
-            options._container.setAttribute( "height", ( _height || 500 ) );
-            options._container.setAttribute( "always_post_to_friends", ( _APTF || false ) );
+            options._container.setAttribute( "width", ( options.width || 400 ) );
+            options._container.setAttribute( "height", ( options.height || 500 ) );
+            options._container.setAttribute( "always_post_to_friends", ( options.always_post_to_friends || false ) );
             options._container.setAttribute( "event_app_id", options.event_app_id );
-            options._container.setAttribute( "xid", _xid );
+            options._container.setAttribute( "xid", options.xid );
           },
           "send": function() {
-            options._container.setAttribute( "font", _font );
-            options._container.setAttribute( "colorscheme", _colorScheme );
+            options._container.setAttribute( "font", options.font );
+            options._container.setAttribute( "colorscheme", options.colorscheme );
           }
         };
       })( options );
@@ -299,7 +272,7 @@
     * options variable
     */
     start: function( event, options ){
-      toggle( options._container, "inline" );
+      options._container.style.display = "inline";
     },
     /**
     * @member facebook
@@ -308,7 +281,8 @@
     * options variable
     */
     end: function( event, options ){
-      toggle ( options._container, "none" );
+      options._container.style.display = "none";
+      options._container.innerHTML = "";
     }
   });
 
diff --git a/plugins/facebook/popcorn.facebook.unit.js b/plugins/facebook/popcorn.facebook.unit.js
index bde1855ea..58e2ac554 100755
--- a/plugins/facebook/popcorn.facebook.unit.js
+++ b/plugins/facebook/popcorn.facebook.unit.js
@@ -1,7 +1,7 @@
-test( "Popcorn Facebook Plugin", function() {
-
-  var popped = Popcorn( "#video" ),
-      expects = 9,
+test("Popcorn Facebook Plugin", function () {
+  
+  var popped = Popcorn("#video"),
+      expects = 5,
       count = 0,
       interval,
       interval2,
@@ -23,23 +23,11 @@ test( "Popcorn Facebook Plugin", function() {
   plus();
 
   popped.facebook({
-        target: "likediv",
-        start: 1,
-        end: 6
-      })
-      .facebook({
-        href: "http://www.facebook.com/senecacollege",
-        type: "LIKE_BOX",
-        target: "likeboxdiv",
-        start: 2,
-        end: 6
-      })
-      .facebook({
-        site: "http://popcornjs.org/",
-        type: "ACTIVITY",
-        target: "activitydiv",
-        start: 3,
-        end: 6
+        site   : "http://popcornjs.org/",
+        type   : "ACTIVITY",
+        target : "activitydiv",
+        start  : 3,
+        end    : 6
       })
       .facebook({
         href: "http://www.facebook.com/senecacollege",
@@ -52,28 +40,14 @@ test( "Popcorn Facebook Plugin", function() {
     .volume( 0 )
     .play();
 
-  ok( document.getElementById( "likediv" ), "likediv exists on the page" );
-  plus();
-  ok( document.getElementById( "likeboxdiv" ), "likeboxdiv exists on the page" );
-  plus();
-  ok( document.getElementById( "activitydiv" ), "activitydiv exists on the page" );
+
+  ok (document.getElementById('activitydiv'), "activitydiv exists on the page" );
   plus();
   ok( document.getElementById( "facepilediv" ), "facepilediv exists on the page" );
   plus();
 
   // I inspected the html genterated by facebook, and found that there are no uniquely identifying attributes between plug-in types
   // so right now, we just check ot make sure that facebook is returning a plugin and displaying it at the correct time.
-
-  popped.exec( 2, function() {
-    ok( document.getElementById( "likediv" ).innerHTML, "likediv is not empty at 0:02 (expected)" );
-    plus();
-  });
-
-  popped.exec( 3, function() {
-    ok( document.getElementById( "likeboxdiv" ).innerHTML, "likeboxdiv is not empty at 0:03 (expected)" );
-    plus();
-  });
-
   popped.exec( 4, function() {
     ok( document.getElementById( "activitydiv" ).innerHTML, "Activitydiv is not empty at 0:04 (expected)" );
     plus();
@@ -83,16 +57,16 @@ test( "Popcorn Facebook Plugin", function() {
     ok( document.getElementById( "facepilediv" ).innerHTML, "Facepilediv is not empty at 0:05 (expected)" );
     plus();
   });
-  
 });
 
-test( "Test Empty Block", function () {
+
+test( "Test Initialized Facebook Blocks", function () {
 
   Popcorn.plugin.debug = true;
 
   var pop = Popcorn( "#video" );
   
-  expect( 1 );
+  expect( 2 );
   
   // Tests for thrown Error on emtpy block
   try {
@@ -101,4 +75,16 @@ test( "Test Empty Block", function () {
     ok( true, "Empty event was caught by debugger" );
   }
   
+  // Tests for thrown Error on invalid plugin type
+  try {
+    pop.facebook({
+        target: "likediv",
+        type: "asdasd",
+        start : 1,
+        end   : 6
+      } );
+  } catch( e ) {
+    ok( true, "Facebook plugin type was invalid." );  
+  }  
 });
+

From bc68cb529a6f2a752a61e03929841c060842b944 Mon Sep 17 00:00:00 2001
From: Matthew Schranz <schranz.m@gmail.com>
Date: Mon, 26 Sep 2011 17:23:53 -0400
Subject: [PATCH 105/140] [#734]Code Refactoring Complete. Return block gone
 replaced with a more stream lined loop of code.

---
 plugins/facebook/popcorn.facebook.js      | 73 +++++++----------------
 plugins/facebook/popcorn.facebook.unit.js |  2 +-
 2 files changed, 22 insertions(+), 53 deletions(-)

diff --git a/plugins/facebook/popcorn.facebook.js b/plugins/facebook/popcorn.facebook.js
index 26310b8b0..20b5c68b4 100755
--- a/plugins/facebook/popcorn.facebook.js
+++ b/plugins/facebook/popcorn.facebook.js
@@ -189,6 +189,7 @@
         };
       }
       
+      
       // Lowercase to make value consistent no matter what user inputs
       _type = _type.toLowerCase();
       
@@ -203,63 +204,31 @@
       
       
       options._container = document.createElement( "fb:" +_type );
-
-      var setOptions = (function( options ) {
-
-        //options._container.style.display = "none";
-
+      
+      // All the the "types" for facebook share largely identical attributes, for loop suffices.
+      // ** Credit to Rick Waldron, it's essentially all his code in this function.
+      var setOptions = function() {
         // activity feed uses 'site' rather than 'href'
         var attr = _type === "activity" ? "site" : "href";
 
         options._container.setAttribute( attr, ( options[ attr ] || document.URL ) );
+      
+        // create an array of Facebook widget attributes
+        var fbAttrs = ( 
+          "width height layout show_faces stream header colorscheme" + 
+          " maxrows border_color recommendations font always_post_to_friends xid" 
+        ).split(" ");
 
-        return {
-          "like": function () {
-            options._container.setAttribute( "send", ( options.send || false ) );
-            options._container.setAttribute( "width", options.width );
-            options._container.setAttribute( "show_faces", options.show_faces );
-            options._container.setAttribute( "layout", options.layout );
-            options._container.setAttribute( "font", options.font );
-            options._container.setAttribute( "colorscheme", options.colorscheme );
-          },
-          "like-box": function () {
-            options._container.setAttribute( "height", ( options.height || 250 ) );
-            options._container.setAttribute( "width", options.width );
-            options._container.setAttribute( "show_faces", options.show_faces );
-            options._container.setAttribute( "stream", options.stream );
-            options._container.setAttribute( "header", options.header );
-            options._container.setAttribute( "colorscheme", options.colorscheme );
-          },
-          "facepile": function () {
-            options._container.setAttribute( "height", options.height );
-            options._container.setAttribute( "width", options.width );
-            options._container.setAttribute( "max_rows", ( options.max_rows || 1 ) );
-          },
-          "activity": function () {
-            options._container.setAttribute( "width", options.width );
-            options._container.setAttribute( "height", options.height );
-            options._container.setAttribute( "header", options.header );
-            options._container.setAttribute( "border_color", options.border_color );
-            options._container.setAttribute( "recommendations", options.recommendations );
-            options._container.setAttribute( "font", options.font );
-            options._container.setAttribute( "colorscheme", options.colorscheme );
-          },
-          "live-stream": function() {
-            options._container.setAttribute( "width", ( options.width || 400 ) );
-            options._container.setAttribute( "height", ( options.height || 500 ) );
-            options._container.setAttribute( "always_post_to_friends", ( options.always_post_to_friends || false ) );
-            options._container.setAttribute( "event_app_id", options.event_app_id );
-            options._container.setAttribute( "xid", options.xid );
-          },
-          "send": function() {
-            options._container.setAttribute( "font", options.font );
-            options._container.setAttribute( "colorscheme", options.colorscheme );
+        Popcorn.forEach( fbAttrs, function( attr ) {
+          // Test for null/undef. Allows 0, false & ""
+          if ( options[ attr ] != null ) {
+            options._container.setAttribute( attr, options[ attr ] );
           }
-        };
-      })( options );
-
-      setOptions[ _type ]();
-
+        });
+      };
+      
+      setOptions();
+      
       if ( !target && Popcorn.plugin.debug ) {
         throw new Error( "Facebook target container doesn't exist" );
       }
@@ -272,7 +241,7 @@
     * options variable
     */
     start: function( event, options ){
-      options._container.style.display = "inline";
+      options._container.style.display = "";
     },
     /**
     * @member facebook
diff --git a/plugins/facebook/popcorn.facebook.unit.js b/plugins/facebook/popcorn.facebook.unit.js
index 58e2ac554..6b59433e3 100755
--- a/plugins/facebook/popcorn.facebook.unit.js
+++ b/plugins/facebook/popcorn.facebook.unit.js
@@ -82,7 +82,7 @@ test( "Test Initialized Facebook Blocks", function () {
         type: "asdasd",
         start : 1,
         end   : 6
-      } );
+    });
   } catch( e ) {
     ok( true, "Facebook plugin type was invalid." );  
   }  

From 8995452b5d964d11c189ef85fa1790cd077697a4 Mon Sep 17 00:00:00 2001
From: Matthew Schranz <schranz.m@gmail.com>
Date: Tue, 27 Sep 2011 12:19:34 -0400
Subject: [PATCH 106/140] [#734] Fixed merge conflicts.

---
 plugins/facebook/popcorn.facebook.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/facebook/popcorn.facebook.js b/plugins/facebook/popcorn.facebook.js
index 20b5c68b4..f93f5e5da 100755
--- a/plugins/facebook/popcorn.facebook.js
+++ b/plugins/facebook/popcorn.facebook.js
@@ -54,7 +54,7 @@
         name: "Popcorn Facebook Plugin",
         version: "0.1",
         author : "Dan Ventura, Matthew Schranz: @mjschranz",
-        website: "dsventura.blogspot.com"
+        website: "dsventura.blogspot.com, mschranz.wordpress.com"
       },
       options: {
         type: {

From e34b85539e9cad0c339fd87d48d9894e3087ec9d Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Tue, 27 Sep 2011 13:00:09 -0400
Subject: [PATCH 107/140] [#423] moved var declaration

---
 popcorn.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/popcorn.js b/popcorn.js
index 334a1d07f..39f6c2156 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1491,12 +1491,12 @@
       var date = new Date() / 1000,
           baselineTime = date,
           currentTime = 0,
-          timeout,
           events = {},
 
           // The container div of the resource
           container = document.getElementById( rIdExp.exec( target ) && rIdExp.exec( target )[ 2 ] ) || document.createElement( "div" ),
           basePlayer = {},
+          timeout,
           popcorn;
 
       // copies a div into the media object

From b8101a4b74b131ab01c57375119942c51a7564fc Mon Sep 17 00:00:00 2001
From: Matthew Schranz <schranz.m@gmail.com>
Date: Tue, 27 Sep 2011 14:00:27 -0400
Subject: [PATCH 108/140] [#734] NOW all merge conflicts are actually fixed.

---
 plugins/facebook/popcorn.facebook.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/facebook/popcorn.facebook.js b/plugins/facebook/popcorn.facebook.js
index f93f5e5da..50c8977cf 100755
--- a/plugins/facebook/popcorn.facebook.js
+++ b/plugins/facebook/popcorn.facebook.js
@@ -53,7 +53,7 @@
       about: {
         name: "Popcorn Facebook Plugin",
         version: "0.1",
-        author : "Dan Ventura, Matthew Schranz: @mjschranz",
+        author: "Dan Ventura, Matthew Schranz: @mjschranz",
         website: "dsventura.blogspot.com, mschranz.wordpress.com"
       },
       options: {

From 30673002a56a02276954f142d98e6ab6234b0924 Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Tue, 27 Sep 2011 14:19:23 -0400
Subject: [PATCH 109/140] [#423] fixed copy and paste error :P

---
 players/youtube/popcorn.youtube.js | 34 +++++++++++++++---------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/players/youtube/popcorn.youtube.js b/players/youtube/popcorn.youtube.js
index 09b08b634..d6f4b6812 100755
--- a/players/youtube/popcorn.youtube.js
+++ b/players/youtube/popcorn.youtube.js
@@ -98,6 +98,23 @@ Popcorn.player( "youtube", {
         };
 
         Popcorn.player.defineProperty( media, "currentTime", {
+          set: function( val ) {
+
+            // make sure val is a number
+            currentTime = seekTime = +val;
+            seeking = true;
+            media.dispatchEvent( "seeked" );
+            media.dispatchEvent( "timeupdate" );
+            youtubeObject.seekTo( currentTime );
+            return currentTime;
+          },
+          get: function() {
+
+            return currentTime;
+          }
+        });
+
+        Popcorn.player.defineProperty( media, "muted", {
           set: function( val ) {
 
             if ( youtubeObject.isMuted() !== val ) {
@@ -115,23 +132,6 @@ Popcorn.player( "youtube", {
 
             return youtubeObject.isMuted();
           },
-          get: function() {
-
-            return currentTime;
-          }
-        });
-
-        Popcorn.player.defineProperty( media, "muted", {
-          set: function( val ) {
-
-            // make sure val is a number
-            currentTime = seekTime = +val;
-            seeking = true;
-            media.dispatchEvent( "seeked" );
-            media.dispatchEvent( "timeupdate" );
-            youtubeObject.seekTo( currentTime );
-            return currentTime;
-          },
           get: function() {
 
             return youtubeObject.isMuted();

From 25ad25162b13f168c5f4ef0406985b62471b635f Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Tue, 27 Sep 2011 15:07:40 -0400
Subject: [PATCH 110/140] [#423] polling volume changes in youtube player.
 youtube API has no events for volume changes, so I have to poll

---
 players/youtube/popcorn.youtube.js | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/players/youtube/popcorn.youtube.js b/players/youtube/popcorn.youtube.js
index d6f4b6812..d74d370e0 100755
--- a/players/youtube/popcorn.youtube.js
+++ b/players/youtube/popcorn.youtube.js
@@ -15,7 +15,12 @@ Popcorn.player( "youtube", {
         currentTime = 0,
         seekTime = 0,
         seeking = false,
-        dataLoaded = false;
+        dataLoaded = false,
+
+        // state code for volume changed polling
+        volumeChanged = false,
+        lastMuted = false,
+        lastVolume = 0;
 
     container.id = media.id + Popcorn.guid();
 
@@ -68,7 +73,24 @@ Popcorn.player( "youtube", {
 
           currentTime = youtubeObject.getCurrentTime();
           media.dispatchEvent( "timeupdate" );
-          timeout = setTimeout( timeupdate, 10 );
+          setTimeout( timeupdate, 10 );
+        };
+
+        var volumeupdate = function() {
+
+          if ( lastMuted !== youtubeObject.isMuted() ) {
+
+            lastMuted = youtubeObject.isMuted();
+            media.dispatchEvent( "volumechange" );
+          }
+
+          if ( lastVolume !== youtubeObject.getVolume() ) {
+
+            lastVolume = youtubeObject.getVolume();
+            media.dispatchEvent( "volumechange" );
+          }
+
+          setTimeout( volumeupdate, 1000 );
         };
 
         media.play = function() {
@@ -127,6 +149,7 @@ Popcorn.player( "youtube", {
                 youtubeObject.unMute();
               }
 
+              lastMuted = youtubeObject.isMuted();
               media.dispatchEvent( "volumechange" );
             }
 
@@ -144,6 +167,7 @@ Popcorn.player( "youtube", {
             if ( youtubeObject.getVolume() !== val ) {
 
               youtubeObject.setVolume( val );
+              lastVolume = youtubeObject.getVolume();
               media.dispatchEvent( "volumechange" );
             }
 
@@ -160,6 +184,7 @@ Popcorn.player( "youtube", {
         dataLoaded = true;
         media.duration = youtubeObject.getDuration();
         media.dispatchEvent( 'durationchange' );
+        volumeupdate();
 
         if ( !media.paused ) {
 

From 8bb4e4c0f94c9e7aa4d6a914cebd21a6d366ddcd Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Tue, 27 Sep 2011 16:28:37 -0400
Subject: [PATCH 111/140] [#423] whitespace fixes

---
 players/youtube/popcorn.youtube.js |  4 ++--
 popcorn.js                         | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/players/youtube/popcorn.youtube.js b/players/youtube/popcorn.youtube.js
index d74d370e0..7b7008056 100755
--- a/players/youtube/popcorn.youtube.js
+++ b/players/youtube/popcorn.youtube.js
@@ -194,7 +194,7 @@ Popcorn.player( "youtube", {
         media.paused && media.dispatchEvent( 'loadeddata' );
       };
 
-      options.controls = +options.controls === 0 || +options.controls === 1 ? options.controls : 1; 
+      options.controls = +options.controls === 0 || +options.controls === 1 ? options.controls : 1;
       options.annotations = +options.annotations === 1 || +options.annotations === 3 ? options.annotations : 1;
 
       flashvars = {
@@ -214,7 +214,7 @@ Popcorn.player( "youtube", {
 
       src = /^.*[\/=](.{11})/.exec( media.src )[ 1 ];
 
-      swfobject.embedSWF( "http://www.youtube.com/e/" + src + "?enablejsapi=1&playerapiid=" + container.id + "&version=3", 
+      swfobject.embedSWF( "http://www.youtube.com/e/" + src + "?enablejsapi=1&playerapiid=" + container.id + "&version=3",
                           container.id, media.offsetWidth, media.offsetHeight, "8", null,
                           flashvars, params, attributes );
     };
diff --git a/popcorn.js b/popcorn.js
index 39f6c2156..dcee995ad 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1584,11 +1584,11 @@
 
           events[ evtName ] = [];
         }
-        
+
         events[ evtName ].push( fn );
         return fn;
       };
-        
+
       // Can take event object or simple string
       basePlayer.dispatchEvent = function( oEvent ) {
 
@@ -1596,20 +1596,20 @@
             self = this,
             eventInterface,
             eventName = oEvent.type;
-            
+
         // A string was passed, create event object
         if ( !eventName ) {
 
           eventName = oEvent;
           eventInterface  = Popcorn.events.getInterface( eventName );
-          
+
           if ( eventInterface ) {
 
             evt = document.createEvent( eventInterface );
             evt.initEvent( eventName, true, true, window, 1 );
           }
         }
-        
+
         Popcorn.forEach( events[ eventName ], function( val ) {
 
           val.call( self, evt, self );

From 57e80e7c4744974e7af9bf167ae3f8c002815c15 Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Tue, 27 Sep 2011 16:44:20 -0400
Subject: [PATCH 112/140] [#423] removed dead variable

---
 players/youtube/popcorn.youtube.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/players/youtube/popcorn.youtube.js b/players/youtube/popcorn.youtube.js
index 7b7008056..3e5efd10a 100755
--- a/players/youtube/popcorn.youtube.js
+++ b/players/youtube/popcorn.youtube.js
@@ -9,7 +9,6 @@ Popcorn.player( "youtube", {
   _setup: function( options ) {
 
     var media = this,
-        player = {},
         youtubeObject,
         container = document.createElement( "div" ),
         currentTime = 0,

From 7c2b51209e94e07027d4763ae15abc7684ea8ec6 Mon Sep 17 00:00:00 2001
From: Matthew Schranz <schranz.m@gmail.com>
Date: Tue, 27 Sep 2011 16:44:44 -0400
Subject: [PATCH 113/140] [#734]Removed Whitespace

---
 plugins/facebook/popcorn.facebook.js      | 26 +++++++++++------------
 plugins/facebook/popcorn.facebook.unit.js | 12 +++++------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/plugins/facebook/popcorn.facebook.js b/plugins/facebook/popcorn.facebook.js
index 50c8977cf..64e68e73a 100755
--- a/plugins/facebook/popcorn.facebook.js
+++ b/plugins/facebook/popcorn.facebook.js
@@ -47,7 +47,7 @@
   */
 
   var ranOnce = false;
-  
+
   Popcorn.plugin( "facebook" , {
     manifest: {
       about: {
@@ -188,11 +188,11 @@
           });
         };
       }
-      
-      
+
+
       // Lowercase to make value consistent no matter what user inputs
       _type = _type.toLowerCase();
-      
+
       var validType = function( type ) {
         return ( ["like", "like-box", "activity", "facepile", "live-stream", "send"].indexOf( type ) > -1 );
       };
@@ -201,10 +201,10 @@
       if ( !validType( _type ) ) {
         throw new Error( "Facebook plugin type was invalid." );
       }
-      
-      
+
+
       options._container = document.createElement( "fb:" +_type );
-      
+
       // All the the "types" for facebook share largely identical attributes, for loop suffices.
       // ** Credit to Rick Waldron, it's essentially all his code in this function.
       var setOptions = function() {
@@ -212,11 +212,11 @@
         var attr = _type === "activity" ? "site" : "href";
 
         options._container.setAttribute( attr, ( options[ attr ] || document.URL ) );
-      
+
         // create an array of Facebook widget attributes
-        var fbAttrs = ( 
-          "width height layout show_faces stream header colorscheme" + 
-          " maxrows border_color recommendations font always_post_to_friends xid" 
+        var fbAttrs = (
+          "width height layout show_faces stream header colorscheme" +
+          " maxrows border_color recommendations font always_post_to_friends xid"
         ).split(" ");
 
         Popcorn.forEach( fbAttrs, function( attr ) {
@@ -226,9 +226,9 @@
           }
         });
       };
-      
+
       setOptions();
-      
+
       if ( !target && Popcorn.plugin.debug ) {
         throw new Error( "Facebook target container doesn't exist" );
       }
diff --git a/plugins/facebook/popcorn.facebook.unit.js b/plugins/facebook/popcorn.facebook.unit.js
index 6b59433e3..f6cf09acc 100755
--- a/plugins/facebook/popcorn.facebook.unit.js
+++ b/plugins/facebook/popcorn.facebook.unit.js
@@ -1,5 +1,5 @@
 test("Popcorn Facebook Plugin", function () {
-  
+
   var popped = Popcorn("#video"),
       expects = 5,
       count = 0,
@@ -65,16 +65,16 @@ test( "Test Initialized Facebook Blocks", function () {
   Popcorn.plugin.debug = true;
 
   var pop = Popcorn( "#video" );
-  
+
   expect( 2 );
-  
+
   // Tests for thrown Error on emtpy block
   try {
     pop.facebook({});
   } catch( e ) {
     ok( true, "Empty event was caught by debugger" );
   }
-  
+
   // Tests for thrown Error on invalid plugin type
   try {
     pop.facebook({
@@ -84,7 +84,7 @@ test( "Test Initialized Facebook Blocks", function () {
         end   : 6
     });
   } catch( e ) {
-    ok( true, "Facebook plugin type was invalid." );  
-  }  
+    ok( true, "Facebook plugin type was invalid." );
+  }
 });
 

From 2c5a77c7ddbc0ce07aa311a03245d055a66dbd6c Mon Sep 17 00:00:00 2001
From: Matthew Schranz <schranz.m@gmail.com>
Date: Tue, 27 Sep 2011 16:59:17 -0400
Subject: [PATCH 114/140] [#734]NOW IT SHOULD BE ALL FIXED STYLE STUFF

---
 plugins/facebook/popcorn.facebook.js      |  4 ++--
 plugins/facebook/popcorn.facebook.unit.js | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/plugins/facebook/popcorn.facebook.js b/plugins/facebook/popcorn.facebook.js
index 64e68e73a..ebafbf82a 100755
--- a/plugins/facebook/popcorn.facebook.js
+++ b/plugins/facebook/popcorn.facebook.js
@@ -1,6 +1,6 @@
 //PLUGIN: facebook
 
-(function(Popcorn, global ) {
+(function( Popcorn, global ) {
 /**
   * Facebook Popcorn plug-in
   * Places Facebook's "social plugins" inside a div ( http://developers.facebook.com/docs/plugins/ )
@@ -194,7 +194,7 @@
       _type = _type.toLowerCase();
 
       var validType = function( type ) {
-        return ( ["like", "like-box", "activity", "facepile", "live-stream", "send"].indexOf( type ) > -1 );
+        return ( [ "like", "like-box", "activity", "facepile", "live-stream", "send" ].indexOf( type ) > -1 );
       };
 
       // Checks if type is valid
diff --git a/plugins/facebook/popcorn.facebook.unit.js b/plugins/facebook/popcorn.facebook.unit.js
index f6cf09acc..5325993c6 100755
--- a/plugins/facebook/popcorn.facebook.unit.js
+++ b/plugins/facebook/popcorn.facebook.unit.js
@@ -1,6 +1,6 @@
-test("Popcorn Facebook Plugin", function () {
+test( "Popcorn Facebook Plugin", function () {
 
-  var popped = Popcorn("#video"),
+  var popped = Popcorn( "#video" ),
       expects = 5,
       count = 0,
       interval,
@@ -23,11 +23,11 @@ test("Popcorn Facebook Plugin", function () {
   plus();
 
   popped.facebook({
-        site   : "http://popcornjs.org/",
-        type   : "ACTIVITY",
-        target : "activitydiv",
-        start  : 3,
-        end    : 6
+        site: "http://popcornjs.org/",
+        type: "ACTIVITY",
+        target: "activitydiv",
+        start: 3,
+        end: 6
       })
       .facebook({
         href: "http://www.facebook.com/senecacollege",
@@ -41,7 +41,7 @@ test("Popcorn Facebook Plugin", function () {
     .play();
 
 
-  ok (document.getElementById('activitydiv'), "activitydiv exists on the page" );
+  ok ( document.getElementById( "activitydiv" ), "activitydiv exists on the page" );
   plus();
   ok( document.getElementById( "facepilediv" ), "facepilediv exists on the page" );
   plus();
@@ -80,8 +80,8 @@ test( "Test Initialized Facebook Blocks", function () {
     pop.facebook({
         target: "likediv",
         type: "asdasd",
-        start : 1,
-        end   : 6
+        start: 1,
+        end: 6
     });
   } catch( e ) {
     ok( true, "Facebook plugin type was invalid." );

From 0f3f6684f0b5bbd4932b31a300614e5698ded362 Mon Sep 17 00:00:00 2001
From: Matthew Schranz <schranz.m@gmail.com>
Date: Tue, 27 Sep 2011 17:08:03 -0400
Subject: [PATCH 115/140] Fixed Styling Issues

---
 plugins/facebook/popcorn.facebook.js      |  2 +-
 plugins/facebook/popcorn.facebook.unit.js | 40 +++++++++++------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/plugins/facebook/popcorn.facebook.js b/plugins/facebook/popcorn.facebook.js
index ebafbf82a..57e2f37ec 100755
--- a/plugins/facebook/popcorn.facebook.js
+++ b/plugins/facebook/popcorn.facebook.js
@@ -203,7 +203,7 @@
       }
 
 
-      options._container = document.createElement( "fb:" +_type );
+      options._container = document.createElement( "fb:" + _type );
 
       // All the the "types" for facebook share largely identical attributes, for loop suffices.
       // ** Credit to Rick Waldron, it's essentially all his code in this function.
diff --git a/plugins/facebook/popcorn.facebook.unit.js b/plugins/facebook/popcorn.facebook.unit.js
index 5325993c6..9201ab2b4 100755
--- a/plugins/facebook/popcorn.facebook.unit.js
+++ b/plugins/facebook/popcorn.facebook.unit.js
@@ -23,22 +23,22 @@ test( "Popcorn Facebook Plugin", function () {
   plus();
 
   popped.facebook({
-        site: "http://popcornjs.org/",
-        type: "ACTIVITY",
-        target: "activitydiv",
-        start: 3,
-        end: 6
-      })
-      .facebook({
-        href: "http://www.facebook.com/senecacollege",
-        type: "FACEPILE",
-        target: "facepilediv",
-        start: 4,
-        end: 6,
-        width: 300
-      })
-    .volume( 0 )
-    .play();
+    site: "http://popcornjs.org/",
+    type: "ACTIVITY",
+    target: "activitydiv",
+    start: 3,
+    end: 6
+  })
+  .facebook({
+    href: "http://www.facebook.com/senecacollege",
+    type: "FACEPILE",
+    target: "facepilediv",
+    start: 4,
+    end: 6,
+    width: 300
+  })
+  .volume( 0 )
+  .play();
 
 
   ok ( document.getElementById( "activitydiv" ), "activitydiv exists on the page" );
@@ -78,10 +78,10 @@ test( "Test Initialized Facebook Blocks", function () {
   // Tests for thrown Error on invalid plugin type
   try {
     pop.facebook({
-        target: "likediv",
-        type: "asdasd",
-        start: 1,
-        end: 6
+      target: "likediv",
+      type: "asdasd",
+      start: 1,
+      end: 6
     });
   } catch( e ) {
     ok( true, "Facebook plugin type was invalid." );

From ad0e9f094b6995a5583790d1083238cc12aad42d Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Wed, 28 Sep 2011 12:14:45 -0400
Subject: [PATCH 116/140] [#423] tightened up volume event listener. fixed
 regression on timeupdate loop. youtube now works with target id, element, or
 hash-id, just like popcorn's html video targeting

---
 players/youtube/popcorn.youtube.js | 11 +++++++----
 popcorn.js                         |  4 +++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/players/youtube/popcorn.youtube.js b/players/youtube/popcorn.youtube.js
index 3e5efd10a..88b61174c 100755
--- a/players/youtube/popcorn.youtube.js
+++ b/players/youtube/popcorn.youtube.js
@@ -70,9 +70,12 @@ Popcorn.player( "youtube", {
 
         var timeupdate = function() {
 
-          currentTime = youtubeObject.getCurrentTime();
-          media.dispatchEvent( "timeupdate" );
-          setTimeout( timeupdate, 10 );
+          if ( !media.paused ) {
+
+            currentTime = youtubeObject.getCurrentTime();
+            media.dispatchEvent( "timeupdate" );
+            setTimeout( timeupdate, 10 );
+          }
         };
 
         var volumeupdate = function() {
@@ -89,7 +92,7 @@ Popcorn.player( "youtube", {
             media.dispatchEvent( "volumechange" );
           }
 
-          setTimeout( volumeupdate, 1000 );
+          setTimeout( volumeupdate, 250 );
         };
 
         media.play = function() {
diff --git a/popcorn.js b/popcorn.js
index dcee995ad..d94c49d41 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1494,7 +1494,9 @@
           events = {},
 
           // The container div of the resource
-          container = document.getElementById( rIdExp.exec( target ) && rIdExp.exec( target )[ 2 ] ) || document.createElement( "div" ),
+          container = document.getElementById( rIdExp.exec( target ) && rIdExp.exec( target )[ 2 ] ) ||
+                        document.getElementById( target ) ||
+                          target,
           basePlayer = {},
           timeout,
           popcorn;

From d76ea3d20eb2408da71123c31e31c80283d3b720 Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Wed, 28 Sep 2011 12:25:47 -0400
Subject: [PATCH 117/140] [#423] quote matching fix

---
 players/youtube/popcorn.youtube.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/players/youtube/popcorn.youtube.js b/players/youtube/popcorn.youtube.js
index 88b61174c..28aa2eb7f 100755
--- a/players/youtube/popcorn.youtube.js
+++ b/players/youtube/popcorn.youtube.js
@@ -182,10 +182,10 @@ Popcorn.player( "youtube", {
         });
 
         media.readyState = 4;
-        media.dispatchEvent( 'load' );
+        media.dispatchEvent( "load" );
         dataLoaded = true;
         media.duration = youtubeObject.getDuration();
-        media.dispatchEvent( 'durationchange' );
+        media.dispatchEvent( "durationchange" );
         volumeupdate();
 
         if ( !media.paused ) {
@@ -193,7 +193,7 @@ Popcorn.player( "youtube", {
           media.play();
         }
 
-        media.paused && media.dispatchEvent( 'loadeddata' );
+        media.paused && media.dispatchEvent( "loadeddata" );
       };
 
       options.controls = +options.controls === 0 || +options.controls === 1 ? options.controls : 1;

From 2a717cfa0017c018f51a8327257c16b7e26cad8d Mon Sep 17 00:00:00 2001
From: Matthew Schranz <schranz.m@gmail.com>
Date: Wed, 28 Sep 2011 12:26:06 -0400
Subject: [PATCH 118/140] [#734] Removed setOptions function as it was not
 needed. Fixed destruction of object. Added _teardown

---
 plugins/facebook/popcorn.facebook.js      | 36 +++++++++++------------
 plugins/facebook/popcorn.facebook.unit.js |  2 +-
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/plugins/facebook/popcorn.facebook.js b/plugins/facebook/popcorn.facebook.js
index 57e2f37ec..dc3676630 100755
--- a/plugins/facebook/popcorn.facebook.js
+++ b/plugins/facebook/popcorn.facebook.js
@@ -207,27 +207,23 @@
 
       // All the the "types" for facebook share largely identical attributes, for loop suffices.
       // ** Credit to Rick Waldron, it's essentially all his code in this function.
-      var setOptions = function() {
-        // activity feed uses 'site' rather than 'href'
-        var attr = _type === "activity" ? "site" : "href";
+      // activity feed uses 'site' rather than 'href'
+      var attr = _type === "activity" ? "site" : "href";
 
-        options._container.setAttribute( attr, ( options[ attr ] || document.URL ) );
+      options._container.setAttribute( attr, ( options[ attr ] || document.URL ) );
 
-        // create an array of Facebook widget attributes
-        var fbAttrs = (
-          "width height layout show_faces stream header colorscheme" +
-          " maxrows border_color recommendations font always_post_to_friends xid"
-        ).split(" ");
+      // create an array of Facebook widget attributes
+      var fbAttrs = (
+        "width height layout show_faces stream header colorscheme" +
+        " maxrows border_color recommendations font always_post_to_friends xid"
+      ).split(" ");
 
-        Popcorn.forEach( fbAttrs, function( attr ) {
-          // Test for null/undef. Allows 0, false & ""
-          if ( options[ attr ] != null ) {
-            options._container.setAttribute( attr, options[ attr ] );
-          }
-        });
-      };
-
-      setOptions();
+      Popcorn.forEach( fbAttrs, function( attr ) {
+        // Test for null/undef. Allows 0, false & ""
+        if ( options[ attr ] != null ) {
+          options._container.setAttribute( attr, options[ attr ] );
+        }
+      });
 
       if ( !target && Popcorn.plugin.debug ) {
         throw new Error( "Facebook target container doesn't exist" );
@@ -251,7 +247,9 @@
     */
     end: function( event, options ){
       options._container.style.display = "none";
-      options._container.innerHTML = "";
+    },
+    _teardown: function( event, options ){
+      target && target.removeChild( options._container );
     }
   });
 
diff --git a/plugins/facebook/popcorn.facebook.unit.js b/plugins/facebook/popcorn.facebook.unit.js
index 9201ab2b4..00b03c019 100755
--- a/plugins/facebook/popcorn.facebook.unit.js
+++ b/plugins/facebook/popcorn.facebook.unit.js
@@ -30,7 +30,7 @@ test( "Popcorn Facebook Plugin", function () {
     end: 6
   })
   .facebook({
-    href: "http://www.facebook.com/senecacollege",
+    href: "https://www.facebook.com/boardwalkempire",
     type: "FACEPILE",
     target: "facepilediv",
     start: 4,

From 2f8fee2dee2d54928cac35a4efbd84068c7d5b9a Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Wed, 28 Sep 2011 13:40:33 -0400
Subject: [PATCH 119/140] [#719] Rebase, fixes tests

---
 popcorn.js           | 33 ++++++++++++++++++++++-----
 test/popcorn.unit.js | 54 +++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 80 insertions(+), 7 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index b012c605f..22c3f52d7 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1176,7 +1176,6 @@
       second = second || Popcorn.nop;
 
       return function() {
-
         first.apply( this, arguments );
         second.apply( this, arguments );
       };
@@ -1188,8 +1187,7 @@
 
     // apply safe, and empty default functions
     methods.forEach(function( method ) {
-
-      definition[ method ] = definition[ method ] || Popcorn.nop;
+      definition[ method ] = safeTry( definition[ method ] || Popcorn.nop, name );
     });
 
     var pluginFn = function( setup, options ) {
@@ -1209,7 +1207,7 @@
       options._running = false;
 
       natives.start = natives.start || natives[ "in" ];
-      natives.end = natives.end || natives[ "out" ]; 
+      natives.end = natives.end || natives[ "out" ];
 
       // Check for previously set default options
       defaults = this.options.defaults && this.options.defaults[ options._natives && options._natives.type ];
@@ -1229,14 +1227,13 @@
 
         // extends previous functions with compose function
         methods.forEach(function( method ) {
-
           natives[ method ] = combineFn( natives[ method ], compose[ method ] );
         });
       });
 
       //  Ensure a manifest object, an empty object is a sufficient fallback
       options._natives.manifest = manifest;
-      
+
       //  Checks for expected properties
       if ( !( "start" in options ) ) {
         options.start = options[ "in" ] || 0;
@@ -1310,6 +1307,30 @@
     return plugin;
   };
 
+  // Storage for plugin function errors
+  Popcorn.plugin.errors = [];
+
+  // Returns wrapped plugin function
+  function safeTry( fn, pluginName ) {
+    return function() {
+      try {
+        return fn.apply( this, arguments );
+      } catch ( ex ) {
+        // Push plugin function errors into logging queue
+        Popcorn.plugin.errors.push({
+          plugin: pluginName,
+          thrown: ex,
+          source: fn.toString()
+        });
+
+        // Trigger an error that the instance can listen for
+        // and react to
+        this.trigger( "error", Popcorn.plugin.errors );
+      }
+    };
+  }
+
+  // Debug-mode flag for plugin development
   Popcorn.plugin.debug = false;
 
   //  removePlugin( type ) removes all tracks of that from all instances of popcorn
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 0c027921b..376f93202 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -1509,6 +1509,56 @@ test("Configurable Defaults", function() {
 
 });
 
+test( "Exceptions", function() {
+
+  var $pop = Popcorn( "#video" ),
+      expects = 5,
+      count = 0;
+
+  Popcorn.plugin.errors = [];
+
+  function plus() {
+    if ( ++count == expects ) {
+      Popcorn.removePlugin( "exceptions" );
+      Popcorn.plugin.errors = [];
+      start();
+      $pop.destroy();
+    }
+  }
+
+  expect( expects );
+  stop( 5000 );
+
+  Popcorn.plugin( "exceptions", {
+    start: function() {
+      foo();
+    },
+    end: function() {
+    }
+  });
+
+  $pop.listen( "canplayall", function() {
+    this.exceptions({
+      start: 1,
+      end: 2
+    }).exec( 3, function() {
+      equal( Popcorn.plugin.errors.length, 1, "Popcorn.plugin.errors has one item");
+      plus();
+    }).currentTime( 0 ).play();
+
+    this.listen( "error", function( errors ) {
+      ok( errors.length, "`errors` array has error objects" );
+      plus();
+      ok( errors[ 0 ].thrown, "`errors[ 0 ].thrown` property exists" );
+      plus();
+      ok( errors[ 0 ].plugin, "`errors[ 0 ].plugin` property exists" );
+      plus();
+      ok( errors[ 0 ].source, "`errors[ 0 ].source` property exists" );
+      plus();
+    });
+  });
+});
+
 test("Start Zero Immediately", function() {
 
   var $pop = Popcorn("#video"),
@@ -2103,6 +2153,8 @@ test( "Popcorn Compose", function() {
       Popcorn.removePlugin("testPlugin");
       Popcorn.removePlugin("pluginOptions1");
       Popcorn.removePlugin("pluginOptions2");
+
+      popped.destroy();
       start();
     }
   }
@@ -2690,7 +2742,7 @@ test( "In/Out aliases", function() {
   var popcorn = Popcorn( "#video" ),
       expects = 5,
       count = 0,
-      counter = 0; 
+      counter = 0;
 
   expect( expects );
   stop();

From c3481894693bfe00f446823b5057958ccffe039e Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Wed, 28 Sep 2011 15:42:47 -0400
Subject: [PATCH 120/140] Fixed bad currentTime call in youtube unit test
 [#423]

---
 players/youtube/popcorn.youtube.unit.js | 35 ++++++++--------
 popcorn.js                              | 33 ++++++++++++---
 test/popcorn.unit.js                    | 54 ++++++++++++++++++++++++-
 3 files changed, 97 insertions(+), 25 deletions(-)

diff --git a/players/youtube/popcorn.youtube.unit.js b/players/youtube/popcorn.youtube.unit.js
index e93b55352..88999424f 100644
--- a/players/youtube/popcorn.youtube.unit.js
+++ b/players/youtube/popcorn.youtube.unit.js
@@ -26,7 +26,7 @@ test("Update Timer", function () {
   }
 
   // These tests come close to 10 seconds on chrome, increasing to 15
-  stop( 15000 );
+  stop();
 
   Popcorn.plugin( "forwards", function () {
     return {
@@ -67,7 +67,6 @@ test("Update Timer", function () {
 
           options.startFired = true;
           backwardStart = !backwardStart;
-          p2.currentTime(0).play();
           ok( true, "backward's start fired" );
           plus();
         }
@@ -80,7 +79,7 @@ test("Update Timer", function () {
           backwardEnd = !backwardEnd;
           ok( backwardEnd, "backward's end fired" );
           plus();
-          p2.currentTime( 5 ).play();
+          p2.currentTime( 0 ).play();
         }
       }
     };
@@ -286,34 +285,34 @@ test("Plugin Factory", function () {
 });
 
 test( "Popcorn YouTube Plugin Url and Duration Tests", function() {
-  function plus(){ 
+  function plus(){
     if ( ++count == expects ) {
-      start(); 
+      start();
     }
   }
-  
+
   QUnit.reset();
-  
+
   var count = 0,
       expects = 3,
       popcorn = Popcorn.youtube( '#video2', 'http://www.youtube.com/watch?v=9oar9glUCL0' );
-      
+
   expect( expects );
   stop( 10000 );
-  
+
   equals( popcorn.media.id, 'video2', 'Video id set' );
   plus();
-  
+
   equals( popcorn.duration(), 0, 'Duration starts as 0');
   plus();
-  
+
   popcorn.listen( "durationchange", function() {
     notEqual( popcorn.duration(), 0, "Duration has been changed from 0" );
     plus();
-    
+
     popcorn.pause();
   });
-  
+
   popcorn.play();
 });
 
@@ -385,21 +384,21 @@ test( "Controls and Annotations toggling", function() {
 
   ok( /controls=1/.test( testTarget.value ), "controls are defaulted to 1 ( displayed )" );
   ok( /iv_load_policy=1/.test( testTarget.value ), "annotations ( iv_load_policy ) are defaulted to ( enabled )" );
-  
+
   targetDiv.innerHTML = "";
-  
+
   popcorn = Popcorn.youtube( "#video", "http://www.youtube.com/watch?v=9oar9glUCL0", { controls: 1, annotations: 1 } );
 
   testTarget = targetDiv.querySelector( "object" ).querySelector( "param[name=flashvars]" );
   ok( /controls=1/.test( testTarget.value ), "controls is set to 1 ( displayed )" );
   ok( /iv_load_policy=1/.test( testTarget.value ), "annotations ( iv_load_policy ) is set to 1 ( enabled )" );
-  
+
   targetDiv.innerHTML = "";
-  
+
   popcorn = Popcorn.youtube( "#video", "http://www.youtube.com/watch?v=9oar9glUCL0", { controls: 0, annotations: 3 } );
   testTarget = targetDiv.querySelector( "object" ).querySelector( "param[name=flashvars]" );
   ok( /controls=0/.test( testTarget.value ), "controls is set to 0 ( hidden )" );
   ok( /iv_load_policy=3/.test( testTarget.value ), "annotations ( iv_load_policy ) is set to 3 ( hidden )" );
-   
+
 });
 
diff --git a/popcorn.js b/popcorn.js
index 83ecbb645..81857b195 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1176,7 +1176,6 @@
       second = second || Popcorn.nop;
 
       return function() {
-
         first.apply( this, arguments );
         second.apply( this, arguments );
       };
@@ -1188,8 +1187,7 @@
 
     // apply safe, and empty default functions
     methods.forEach(function( method ) {
-
-      definition[ method ] = definition[ method ] || Popcorn.nop;
+      definition[ method ] = safeTry( definition[ method ] || Popcorn.nop, name );
     });
 
     var pluginFn = function( setup, options ) {
@@ -1209,7 +1207,7 @@
       options._running = false;
 
       natives.start = natives.start || natives[ "in" ];
-      natives.end = natives.end || natives[ "out" ]; 
+      natives.end = natives.end || natives[ "out" ];
 
       // Check for previously set default options
       defaults = this.options.defaults && this.options.defaults[ options._natives && options._natives.type ];
@@ -1229,14 +1227,13 @@
 
         // extends previous functions with compose function
         methods.forEach(function( method ) {
-
           natives[ method ] = combineFn( natives[ method ], compose[ method ] );
         });
       });
 
       //  Ensure a manifest object, an empty object is a sufficient fallback
       options._natives.manifest = manifest;
-      
+
       //  Checks for expected properties
       if ( !( "start" in options ) ) {
         options.start = options[ "in" ] || 0;
@@ -1310,6 +1307,30 @@
     return plugin;
   };
 
+  // Storage for plugin function errors
+  Popcorn.plugin.errors = [];
+
+  // Returns wrapped plugin function
+  function safeTry( fn, pluginName ) {
+    return function() {
+      try {
+        return fn.apply( this, arguments );
+      } catch ( ex ) {
+        // Push plugin function errors into logging queue
+        Popcorn.plugin.errors.push({
+          plugin: pluginName,
+          thrown: ex,
+          source: fn.toString()
+        });
+
+        // Trigger an error that the instance can listen for
+        // and react to
+        this.trigger( "error", Popcorn.plugin.errors );
+      }
+    };
+  }
+
+  // Debug-mode flag for plugin development
   Popcorn.plugin.debug = false;
 
   //  removePlugin( type ) removes all tracks of that from all instances of popcorn
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index d4d93c43e..310e3d2f0 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -1509,6 +1509,56 @@ test("Configurable Defaults", function() {
 
 });
 
+test( "Exceptions", function() {
+
+  var $pop = Popcorn( "#video" ),
+      expects = 5,
+      count = 0;
+
+  Popcorn.plugin.errors = [];
+
+  function plus() {
+    if ( ++count == expects ) {
+      Popcorn.removePlugin( "exceptions" );
+      Popcorn.plugin.errors = [];
+      start();
+      $pop.destroy();
+    }
+  }
+
+  expect( expects );
+  stop( 5000 );
+
+  Popcorn.plugin( "exceptions", {
+    start: function() {
+      foo();
+    },
+    end: function() {
+    }
+  });
+
+  $pop.listen( "canplayall", function() {
+    this.exceptions({
+      start: 1,
+      end: 2
+    }).exec( 3, function() {
+      equal( Popcorn.plugin.errors.length, 1, "Popcorn.plugin.errors has one item");
+      plus();
+    }).currentTime( 0 ).play();
+
+    this.listen( "error", function( errors ) {
+      ok( errors.length, "`errors` array has error objects" );
+      plus();
+      ok( errors[ 0 ].thrown, "`errors[ 0 ].thrown` property exists" );
+      plus();
+      ok( errors[ 0 ].plugin, "`errors[ 0 ].plugin` property exists" );
+      plus();
+      ok( errors[ 0 ].source, "`errors[ 0 ].source` property exists" );
+      plus();
+    });
+  });
+});
+
 test("Start Zero Immediately", function() {
 
   var $pop = Popcorn("#video"),
@@ -2103,6 +2153,8 @@ test( "Popcorn Compose", function() {
       Popcorn.removePlugin("testPlugin");
       Popcorn.removePlugin("pluginOptions1");
       Popcorn.removePlugin("pluginOptions2");
+
+      popped.destroy();
       start();
     }
   }
@@ -2690,7 +2742,7 @@ test( "In/Out aliases", function() {
   var popcorn = Popcorn( "#video" ),
       expects = 5,
       count = 0,
-      counter = 0; 
+      counter = 0;
 
   expect( expects );
   stop();

From b27d151ae6e39cbf7ff7a79a5c7bb9015a87105c Mon Sep 17 00:00:00 2001
From: Matthew Schranz <schranz.m@gmail.com>
Date: Wed, 28 Sep 2011 16:40:32 -0400
Subject: [PATCH 121/140] [#734]Each plugin in it's own div. Trying to get one
 test working

---
 plugins/facebook/popcorn.facebook.html    | 14 +++++-----
 plugins/facebook/popcorn.facebook.js      | 34 +++++++++++++++--------
 plugins/facebook/popcorn.facebook.unit.js | 10 +++++--
 3 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/plugins/facebook/popcorn.facebook.html b/plugins/facebook/popcorn.facebook.html
index 4a4fbbdd7..4da792618 100755
--- a/plugins/facebook/popcorn.facebook.html
+++ b/plugins/facebook/popcorn.facebook.html
@@ -14,7 +14,7 @@
         type: "live-stream",
         target: "activitydiv",
         start: 1,
-        end: 10,
+        end: 50,
         // id is from example http://developers.facebook.com/docs/reference/plugins/live-stream/
         event_app_id: 174243249296725
       })
@@ -23,13 +23,13 @@
         target: "likediv",
         layout: "box_count",
         start: 5,
-        end: 10
+        end: 50
       })
       .facebook({
         type: "send",
         target: "likediv",
         start: 1,
-        end: 5
+        end: 15
       })
       .facebook({
         href: "http://www.facebook.com/senecacollege",
@@ -38,7 +38,7 @@
         header: "false",
         target: "likeboxdiv",
         start: 6,
-        end: 10
+        end: 50
       })
       .facebook({
         site: "http://popcornjs.org/",
@@ -46,15 +46,15 @@
         target: "activitydiv",
         header: true,
         start: 11,
-        end: 15
+        end: 50
       })
       .facebook({
-        href: "http://www.facebook.com/senecacollege",
+        href: "https://www.facebook.com/boardwalkempire",
         type: "FACEPILE",
         target: "facepilediv",
         width: 300,
         start: 10,
-        end: 15
+        end: 50
       });
     }, false);
 
diff --git a/plugins/facebook/popcorn.facebook.js b/plugins/facebook/popcorn.facebook.js
index dc3676630..55256ce45 100755
--- a/plugins/facebook/popcorn.facebook.js
+++ b/plugins/facebook/popcorn.facebook.js
@@ -46,7 +46,7 @@
   * This will show how many people "like" Seneca College's Facebook page, and show their profile pictures
   */
 
-  var ranOnce = false;
+  var ranOnce = false, idx = 0;
 
   Popcorn.plugin( "facebook" , {
     manifest: {
@@ -165,8 +165,17 @@
     _setup: function( options ) {
 
       var target = document.getElementById( options.target ),
-          _type = options.type;
-
+          _type = options.type,
+          facebookdiv;
+      
+      /*
+      // Ensure target container chosen by user exists
+      if ( !target && Popcorn.plugin.debug ) {
+        throw new Error( "Facebook target container doesn't exist" );
+      }
+      target && target.appendChild( containerDiv );
+      */
+      
       // facebook script requires a div named fb-root
       if ( !document.getElementById( "fb-root" ) ) {
         var fbRoot = document.createElement( "div" );
@@ -203,14 +212,17 @@
       }
 
 
-      options._container = document.createElement( "fb:" + _type );
+      options.container = document.createElement( "div" );
+      options.container.id = "facebookdiv-" + Popcorn.guid();
+      facebookdiv = document.createElement( "fb:" + _type );
+      options.container.appendChild( facebookdiv );
 
       // All the the "types" for facebook share largely identical attributes, for loop suffices.
       // ** Credit to Rick Waldron, it's essentially all his code in this function.
       // activity feed uses 'site' rather than 'href'
       var attr = _type === "activity" ? "site" : "href";
 
-      options._container.setAttribute( attr, ( options[ attr ] || document.URL ) );
+      facebookdiv.setAttribute( attr, ( options[ attr ] || document.URL ) );
 
       // create an array of Facebook widget attributes
       var fbAttrs = (
@@ -221,14 +233,14 @@
       Popcorn.forEach( fbAttrs, function( attr ) {
         // Test for null/undef. Allows 0, false & ""
         if ( options[ attr ] != null ) {
-          options._container.setAttribute( attr, options[ attr ] );
+          facebookdiv.setAttribute( attr, options[ attr ] );
         }
       });
 
       if ( !target && Popcorn.plugin.debug ) {
         throw new Error( "Facebook target container doesn't exist" );
       }
-      target && target.appendChild( options._container );
+      target && target.appendChild( options.container );
     },
     /**
     * @member facebook
@@ -237,7 +249,7 @@
     * options variable
     */
     start: function( event, options ){
-      options._container.style.display = "";
+      options.container.style.display = "";
     },
     /**
     * @member facebook
@@ -246,11 +258,11 @@
     * options variable
     */
     end: function( event, options ){
-      options._container.style.display = "none";
+      options.container.style.display = "none";
     },
     _teardown: function( event, options ){
-      target && target.removeChild( options._container );
+      target && target.removeChild( facebookdiv );
     }
   });
 
-})( Popcorn, this );
+})( Popcorn, this );
\ No newline at end of file
diff --git a/plugins/facebook/popcorn.facebook.unit.js b/plugins/facebook/popcorn.facebook.unit.js
index 00b03c019..5d70e6530 100755
--- a/plugins/facebook/popcorn.facebook.unit.js
+++ b/plugins/facebook/popcorn.facebook.unit.js
@@ -1,7 +1,7 @@
 test( "Popcorn Facebook Plugin", function () {
 
   var popped = Popcorn( "#video" ),
-      expects = 5,
+      expects = 6,
       count = 0,
       interval,
       interval2,
@@ -39,7 +39,8 @@ test( "Popcorn Facebook Plugin", function () {
   })
   .volume( 0 )
   .play();
-
+  
+  setupId = popped.getLastTrackEventId();
 
   ok ( document.getElementById( "activitydiv" ), "activitydiv exists on the page" );
   plus();
@@ -56,7 +57,12 @@ test( "Popcorn Facebook Plugin", function () {
   popped.exec( 5, function() {
     ok( document.getElementById( "facepilediv" ).innerHTML, "Facepilediv is not empty at 0:05 (expected)" );
     plus();
+    
+    popped.pause().removeTrackEvent( setupId );
+    ok( !facepilediv, "removed facebook social plugin was properly destroyed" );
+    plus();
   });
+  
 });
 
 

From 3fcc9579d0eeb3128bc022bf4183c437bc19bbae Mon Sep 17 00:00:00 2001
From: Matthew Schranz <schranz.m@gmail.com>
Date: Wed, 28 Sep 2011 17:02:14 -0400
Subject: [PATCH 122/140] More trying to fix tests

---
 plugins/facebook/popcorn.facebook.js | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/plugins/facebook/popcorn.facebook.js b/plugins/facebook/popcorn.facebook.js
index 55256ce45..0ae26b97d 100755
--- a/plugins/facebook/popcorn.facebook.js
+++ b/plugins/facebook/popcorn.facebook.js
@@ -212,17 +212,17 @@
       }
 
 
-      options.container = document.createElement( "div" );
-      options.container.id = "facebookdiv-" + Popcorn.guid();
-      facebookdiv = document.createElement( "fb:" + _type );
-      options.container.appendChild( facebookdiv );
+      options._container = document.createElement( "div" );
+      options._container.id = "facebookdiv-" + Popcorn.guid();
+      options._facebookdiv = document.createElement( "fb:" + _type );
+      options._container.appendChild( options._facebookdiv );
 
       // All the the "types" for facebook share largely identical attributes, for loop suffices.
       // ** Credit to Rick Waldron, it's essentially all his code in this function.
       // activity feed uses 'site' rather than 'href'
       var attr = _type === "activity" ? "site" : "href";
 
-      facebookdiv.setAttribute( attr, ( options[ attr ] || document.URL ) );
+      options._facebookdiv.setAttribute( attr, ( options[ attr ] || document.URL ) );
 
       // create an array of Facebook widget attributes
       var fbAttrs = (
@@ -233,14 +233,14 @@
       Popcorn.forEach( fbAttrs, function( attr ) {
         // Test for null/undef. Allows 0, false & ""
         if ( options[ attr ] != null ) {
-          facebookdiv.setAttribute( attr, options[ attr ] );
+          options._facebookdiv.setAttribute( attr, options[ attr ] );
         }
       });
 
       if ( !target && Popcorn.plugin.debug ) {
         throw new Error( "Facebook target container doesn't exist" );
       }
-      target && target.appendChild( options.container );
+      target && target.appendChild( options._container );
     },
     /**
     * @member facebook
@@ -249,7 +249,7 @@
     * options variable
     */
     start: function( event, options ){
-      options.container.style.display = "";
+      options._container.style.display = "";
     },
     /**
     * @member facebook
@@ -258,10 +258,11 @@
     * options variable
     */
     end: function( event, options ){
-      options.container.style.display = "none";
+      options._container.style.display = "none";
     },
-    _teardown: function( event, options ){
-      target && target.removeChild( facebookdiv );
+    _teardown: function( options ){
+      var target = document.getElementById( options.target );
+      target && target.removeChild( options._facebookdiv );
     }
   });
 

From d1084e91d911c7d87af154c54eaef2d1fd77cec1 Mon Sep 17 00:00:00 2001
From: Matthew Schranz <schranz.m@gmail.com>
Date: Wed, 28 Sep 2011 19:12:14 -0400
Subject: [PATCH 123/140] [#734] Added _teardown method. Added unit tests for
 _teardown.

---
 plugins/facebook/popcorn.facebook.js      | 19 +++++--------------
 plugins/facebook/popcorn.facebook.unit.js |  8 ++++----
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/plugins/facebook/popcorn.facebook.js b/plugins/facebook/popcorn.facebook.js
index 0ae26b97d..2ec920b54 100755
--- a/plugins/facebook/popcorn.facebook.js
+++ b/plugins/facebook/popcorn.facebook.js
@@ -46,7 +46,7 @@
   * This will show how many people "like" Seneca College's Facebook page, and show their profile pictures
   */
 
-  var ranOnce = false, idx = 0;
+  var ranOnce = false;
 
   Popcorn.plugin( "facebook" , {
     manifest: {
@@ -165,17 +165,8 @@
     _setup: function( options ) {
 
       var target = document.getElementById( options.target ),
-          _type = options.type,
-          facebookdiv;
-      
-      /*
-      // Ensure target container chosen by user exists
-      if ( !target && Popcorn.plugin.debug ) {
-        throw new Error( "Facebook target container doesn't exist" );
-      }
-      target && target.appendChild( containerDiv );
-      */
-      
+          _type = options.type;
+
       // facebook script requires a div named fb-root
       if ( !document.getElementById( "fb-root" ) ) {
         var fbRoot = document.createElement( "div" );
@@ -262,8 +253,8 @@
     },
     _teardown: function( options ){
       var target = document.getElementById( options.target );
-      target && target.removeChild( options._facebookdiv );
+      target && target.removeChild( options._container );
     }
   });
 
-})( Popcorn, this );
\ No newline at end of file
+})( Popcorn, this );
diff --git a/plugins/facebook/popcorn.facebook.unit.js b/plugins/facebook/popcorn.facebook.unit.js
index 5d70e6530..8602fb81b 100755
--- a/plugins/facebook/popcorn.facebook.unit.js
+++ b/plugins/facebook/popcorn.facebook.unit.js
@@ -39,7 +39,7 @@ test( "Popcorn Facebook Plugin", function () {
   })
   .volume( 0 )
   .play();
-  
+
   setupId = popped.getLastTrackEventId();
 
   ok ( document.getElementById( "activitydiv" ), "activitydiv exists on the page" );
@@ -57,12 +57,12 @@ test( "Popcorn Facebook Plugin", function () {
   popped.exec( 5, function() {
     ok( document.getElementById( "facepilediv" ).innerHTML, "Facepilediv is not empty at 0:05 (expected)" );
     plus();
-    
+
     popped.pause().removeTrackEvent( setupId );
-    ok( !facepilediv, "removed facebook social plugin was properly destroyed" );
+    ok( !document.getElementById( "facepilediv" ).innerHTML, "removed facebook social plugin was properly destroyed" );
     plus();
   });
-  
+
 });
 
 

From 0c473b6d9b569a700e804ca785c32885a3598e3f Mon Sep 17 00:00:00 2001
From: Matthew Schranz <schranz.m@gmail.com>
Date: Wed, 28 Sep 2011 21:24:48 -0400
Subject: [PATCH 124/140] [#734]Added additional tests.

---
 plugins/facebook/popcorn.facebook.unit.js | 55 +++++++++++++++++++++--
 1 file changed, 51 insertions(+), 4 deletions(-)

diff --git a/plugins/facebook/popcorn.facebook.unit.js b/plugins/facebook/popcorn.facebook.unit.js
index 8602fb81b..0eeae3eb0 100755
--- a/plugins/facebook/popcorn.facebook.unit.js
+++ b/plugins/facebook/popcorn.facebook.unit.js
@@ -1,7 +1,7 @@
 test( "Popcorn Facebook Plugin", function () {
 
   var popped = Popcorn( "#video" ),
-      expects = 6,
+      expects = 12,
       count = 0,
       interval,
       interval2,
@@ -27,39 +27,86 @@ test( "Popcorn Facebook Plugin", function () {
     type: "ACTIVITY",
     target: "activitydiv",
     start: 3,
-    end: 6
+    end: 11
   })
   .facebook({
     href: "https://www.facebook.com/boardwalkempire",
     type: "FACEPILE",
     target: "facepilediv",
     start: 4,
-    end: 6,
+    end: 11,
     width: 300
   })
+  .facebook({
+    type: "LIKE",
+    target: "likediv",
+    layout: "box_count",
+    start: 2,
+    end: 11
+  })
+  .facebook({
+    type: "send",
+    target: "likediv",
+    start: 1,
+    end: 11
+  })
+  .facebook({
+    href: "http://www.facebook.com/senecacollege",
+    type: "LIKE-BOX",
+    show_faces: "true",
+    header: "false",
+    target: "likeboxdiv",
+    start: 2,
+    end: 13
+  })
   .volume( 0 )
   .play();
 
   setupId = popped.getLastTrackEventId();
 
+  // Checks if all div elements exist on the page
   ok ( document.getElementById( "activitydiv" ), "activitydiv exists on the page" );
   plus();
   ok( document.getElementById( "facepilediv" ), "facepilediv exists on the page" );
   plus();
+  ok ( document.getElementById( "likediv" ), "activitydiv exists on the page" );
+  plus();
+  ok( document.getElementById( "likeboxdiv" ), "facepilediv exists on the page" );
+  plus();
 
   // I inspected the html genterated by facebook, and found that there are no uniquely identifying attributes between plug-in types
   // so right now, we just check ot make sure that facebook is returning a plugin and displaying it at the correct time.
+  popped.exec( 3, function() {
+    // Counts number of children elements in likediv
+    equals( likediv.childElementCount, 2, "likediv has 2 inner elements" );
+    plus();
+    // Checks display style is set correctly on startup
+    equals( likediv.children[ 0 ].style.display , "", "likediv is visible on the page with '' display style" );
+    plus();
+    // Checks if likediv is empty at specific time
+    ok( document.getElementById( "likediv" ).innerHTML, "likediv is not empty at 0:03 (expected)" );
+    plus();
+  });
+
+  // Checks if activitydiv is emtpy at specific time
   popped.exec( 4, function() {
     ok( document.getElementById( "activitydiv" ).innerHTML, "Activitydiv is not empty at 0:04 (expected)" );
     plus();
+    // Checks if likeboxdiv is empty at specific time
+    ok( document.getElementById( "likeboxdiv" ).innerHTML, "likeboxdiv is not empty at 0:04 (expected)" );
+    plus();
   });
 
+  // Checks if facepilediv is empty at a specific time
   popped.exec( 5, function() {
     ok( document.getElementById( "facepilediv" ).innerHTML, "Facepilediv is not empty at 0:05 (expected)" );
     plus();
+  });
 
+  // Checks if _teardown function is run properly on like-box
+  popped.exec( 12, function() {
     popped.pause().removeTrackEvent( setupId );
-    ok( !document.getElementById( "facepilediv" ).innerHTML, "removed facebook social plugin was properly destroyed" );
+    ok( !document.getElementById( "likeboxdiv" ).innerHTML, "likebox facebook social plugin was properly destroyed" );
     plus();
   });
 

From 99939793a39356f119ca5bd965eb9c365cb60a63 Mon Sep 17 00:00:00 2001
From: Matthew Schranz <schranz.m@gmail.com>
Date: Wed, 28 Sep 2011 22:36:56 -0400
Subject: [PATCH 125/140] [#734]Fixed one test. All working now

---
 plugins/facebook/popcorn.facebook.unit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/facebook/popcorn.facebook.unit.js b/plugins/facebook/popcorn.facebook.unit.js
index 0eeae3eb0..96daed537 100755
--- a/plugins/facebook/popcorn.facebook.unit.js
+++ b/plugins/facebook/popcorn.facebook.unit.js
@@ -7,7 +7,7 @@ test( "Popcorn Facebook Plugin", function () {
       interval2,
       interval3,
       interval4,
-      subtitlediv;
+      likediv = document.getElementById( "likediv" );
 
   expect( expects );
 

From 90295a89c67686fd04b5a57370158139466e1092 Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Thu, 29 Sep 2011 11:40:00 -0400
Subject: [PATCH 126/140] [#743] basePlayer caching state for custom players

---
 players/youtube/popcorn.youtube.js      | 15 +------
 players/youtube/popcorn.youtube.unit.js |  7 +++-
 popcorn.js                              | 56 ++++++++++++++++++++++---
 3 files changed, 58 insertions(+), 20 deletions(-)

diff --git a/players/youtube/popcorn.youtube.js b/players/youtube/popcorn.youtube.js
index 28aa2eb7f..3af9f2ef6 100755
--- a/players/youtube/popcorn.youtube.js
+++ b/players/youtube/popcorn.youtube.js
@@ -14,7 +14,6 @@ Popcorn.player( "youtube", {
         currentTime = 0,
         seekTime = 0,
         seeking = false,
-        dataLoaded = false,
 
         // state code for volume changed polling
         volumeChanged = false,
@@ -100,12 +99,6 @@ Popcorn.player( "youtube", {
           media.paused = false;
           media.dispatchEvent( "play" );
 
-          if ( dataLoaded ) {
-
-            media.dispatchEvent( "loadeddata" );
-            dataLoaded = false;
-          }
-
           media.dispatchEvent( "playing" );
           timeupdate();
           youtubeObject.playVideo();
@@ -183,17 +176,11 @@ Popcorn.player( "youtube", {
 
         media.readyState = 4;
         media.dispatchEvent( "load" );
-        dataLoaded = true;
         media.duration = youtubeObject.getDuration();
         media.dispatchEvent( "durationchange" );
         volumeupdate();
 
-        if ( !media.paused ) {
-
-          media.play();
-        }
-
-        media.paused && media.dispatchEvent( "loadeddata" );
+        media.dispatchEvent( "loadeddata" );
       };
 
       options.controls = +options.controls === 0 || +options.controls === 1 ? options.controls : 1;
diff --git a/players/youtube/popcorn.youtube.unit.js b/players/youtube/popcorn.youtube.unit.js
index e93b55352..d5e9b89d5 100644
--- a/players/youtube/popcorn.youtube.unit.js
+++ b/players/youtube/popcorn.youtube.unit.js
@@ -162,7 +162,12 @@ test("Update Timer", function () {
     }
   });
 
-  p2.currentTime(3).play();
+  p2.exec( 3, function() {
+
+    p2.play();
+  });
+
+  p2.currentTime(3);
 
 });
 
diff --git a/popcorn.js b/popcorn.js
index d94c49d41..9ead0d716 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1491,6 +1491,8 @@
       var date = new Date() / 1000,
           baselineTime = date,
           currentTime = 0,
+          volume = 1,
+          muted = false,
           events = {},
 
           // The container div of the resource
@@ -1579,6 +1581,36 @@
         configurable: true
       });
 
+      Popcorn.player.defineProperty( basePlayer, "volume", {
+        get: function() {
+
+          return volume;
+        },
+        set: function( val ) {
+
+          // make sure val is a number
+          volume = +val;
+          basePlayer.dispatchEvent( "volumechange" );
+          return volume;
+        },
+        configurable: true
+      });
+
+      Popcorn.player.defineProperty( basePlayer, "muted", {
+        get: function() {
+
+          return muted;
+        },
+        set: function( val ) {
+
+          // make sure val is a number
+          muted = +val;
+          basePlayer.dispatchEvent( "volumechange" );
+          return muted;
+        },
+        configurable: true
+      });
+
       // Adds an event listener to the object
       basePlayer.addEventListener = function( evtName, fn ) {
 
@@ -1625,10 +1657,6 @@
       basePlayer.paused = true;
       basePlayer.ended = 0;
 
-      // basePlayer has no concept of sound
-      basePlayer.volume = 1;
-      basePlayer.muted = false;
-
       if ( player._setup ) {
 
         player._setup.call( basePlayer, options );
@@ -1636,9 +1664,27 @@
 
         // there is no setup, which means there is nothing to load
         basePlayer.readyState = 4;
-        basePlayer.dispatchEvent( 'load' );
+        basePlayer.dispatchEvent( "load" );
+        basePlayer.dispatchEvent( "loadeddata" );
       }
 
+      // when a custom player is loaded, load basePlayer state into custom player
+      basePlayer.addEventListener( "load", function() {
+
+        // if a player is not ready before currentTime is called, this will set it after it is ready
+        basePlayer.currentTime = currentTime;
+
+        // same as above with volume and muted
+        basePlayer.volume = volume;
+        basePlayer.muted = muted;
+      });
+
+      basePlayer.addEventListener( "loadeddata", function() {
+
+        // if play was called before player ready, start playing video
+        !basePlayer.paused && basePlayer.play();
+      });
+
       popcorn = new Popcorn.p.init( basePlayer, options );
 
       return popcorn;

From ab56b14f84a83aaf6e5a073b7ce217eb24d5c175 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Thu, 29 Sep 2011 14:57:58 -0400
Subject: [PATCH 127/140] Added mathew to the authors file

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index 3a0855118..2a396c4da 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -19,3 +19,4 @@ Cole Gillespie
 Nick Doiron
 Bobby Richter
 Jon Buckley
+Mathew Schranz

From d2ec6a70b00b8bed734b9e67f9223785eef1d81c Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Thu, 29 Sep 2011 16:57:09 -0400
Subject: [PATCH 128/140] Popcorn.plugin.debug toggles error suppression [#744]

---
 plugins/facebook/popcorn.facebook.unit.js | 4 ++--
 popcorn.js                                | 6 ++++++
 test/popcorn.unit.js                      | 2 ++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/plugins/facebook/popcorn.facebook.unit.js b/plugins/facebook/popcorn.facebook.unit.js
index 96daed537..64780ff21 100755
--- a/plugins/facebook/popcorn.facebook.unit.js
+++ b/plugins/facebook/popcorn.facebook.unit.js
@@ -1,5 +1,7 @@
 test( "Popcorn Facebook Plugin", function () {
 
+  Popcorn.plugin.debug = true;
+
   var popped = Popcorn( "#video" ),
       expects = 12,
       count = 0,
@@ -115,8 +117,6 @@ test( "Popcorn Facebook Plugin", function () {
 
 test( "Test Initialized Facebook Blocks", function () {
 
-  Popcorn.plugin.debug = true;
-
   var pop = Popcorn( "#video" );
 
   expect( 2 );
diff --git a/popcorn.js b/popcorn.js
index c4b0f4aa7..8cf77dc2b 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1313,9 +1313,15 @@
   // Returns wrapped plugin function
   function safeTry( fn, pluginName ) {
     return function() {
+
+      if ( Popcorn.plugin.debug ) {
+        return fn.apply( this, arguments );
+      }
+
       try {
         return fn.apply( this, arguments );
       } catch ( ex ) {
+
         // Push plugin function errors into logging queue
         Popcorn.plugin.errors.push({
           plugin: pluginName,
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 310e3d2f0..00700c8ae 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -1515,11 +1515,13 @@ test( "Exceptions", function() {
       expects = 5,
       count = 0;
 
+  Popcorn.plugin.debug = false;
   Popcorn.plugin.errors = [];
 
   function plus() {
     if ( ++count == expects ) {
       Popcorn.removePlugin( "exceptions" );
+      Popcorn.plugin.debug = true;
       Popcorn.plugin.errors = [];
       start();
       $pop.destroy();

From 769dae58c8f3a9145e863e6fe9d4d9b34eb59082 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Fri, 30 Sep 2011 10:44:15 -0400
Subject: [PATCH 129/140] Added Brian Chirls

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index 2a396c4da..3af491513 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -20,3 +20,4 @@ Nick Doiron
 Bobby Richter
 Jon Buckley
 Mathew Schranz
+Brian Chirls

From e74800754ed964aee05fdfa46b99f3009374a7fc Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Fri, 30 Sep 2011 11:35:09 -0400
Subject: [PATCH 130/140] Added comment above debug mode check [#744]

---
 popcorn.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/popcorn.js b/popcorn.js
index 8cf77dc2b..b7594b541 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1314,6 +1314,7 @@
   function safeTry( fn, pluginName ) {
     return function() {
 
+      //  When Popcorn.plugin.debug is true, do not suppress errors
       if ( Popcorn.plugin.debug ) {
         return fn.apply( this, arguments );
       }

From 6b84fbe2b7fda0689bf18fb509a01542a4426c0c Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Fri, 30 Sep 2011 13:35:14 -0400
Subject: [PATCH 131/140] Added falback support if Object.keys does not exist

---
 popcorn.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/popcorn.js b/popcorn.js
index b7594b541..daabe46f8 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -2025,9 +2025,23 @@
   // alias for exec function
   Popcorn.p.cue = Popcorn.p.exec;
 
+  function getItems() {
+
+    var item,
+        list = [];
+
+    for ( item in Popcorn.p ) {
+      if ( Popcorn.p.hasOwnProperty( item ) ) {
+        list.push( item );
+      }
+    }
+
+    return list.join( "," ).toLowerCase().split( ",");
+  }
+
   //  Protected API methods
   Popcorn.protect = {
-    natives: Object.keys( Popcorn.p ).join( "," ).toLowerCase().split( "," )
+    natives: Object.keys ? Object.keys( Popcorn.p ).join( "," ).toLowerCase().split( "," ) : getItems() 
   };
 
   //  Exposes Popcorn to global context

From 11be1190661ba14ba8bd38b6a3a3764ee461a908 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Fri, 30 Sep 2011 14:18:15 -0400
Subject: [PATCH 132/140] Added all checking functionality inside getItems and
 used hasOwn over hasOwnProperty

---
 popcorn.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index daabe46f8..ed1309dc9 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -2027,11 +2027,15 @@
 
   function getItems() {
 
+    if ( Object.keys ) {
+      return Object.keys( Popcorn.p ).join( "," ).toLowerCase().split( "," ); 
+    }
+
     var item,
         list = [];
 
     for ( item in Popcorn.p ) {
-      if ( Popcorn.p.hasOwnProperty( item ) ) {
+      if ( hasOwn.call( Popcorn.p, item ) ) {
         list.push( item );
       }
     }
@@ -2041,7 +2045,7 @@
 
   //  Protected API methods
   Popcorn.protect = {
-    natives: Object.keys ? Object.keys( Popcorn.p ).join( "," ).toLowerCase().split( "," ) : getItems() 
+    natives: getItems() 
   };
 
   //  Exposes Popcorn to global context

From 0d74dbda15e09e5fc03b054813d9497740fdae1d Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Fri, 30 Sep 2011 14:26:09 -0400
Subject: [PATCH 133/140] Cleaned up code further

---
 popcorn.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index ed1309dc9..f685b662f 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -2027,16 +2027,17 @@
 
   function getItems() {
 
-    if ( Object.keys ) {
-      return Object.keys( Popcorn.p ).join( "," ).toLowerCase().split( "," ); 
-    }
-
     var item,
         list = [];
 
-    for ( item in Popcorn.p ) {
-      if ( hasOwn.call( Popcorn.p, item ) ) {
-        list.push( item );
+    if ( Object.keys ) {
+      list = Object.keys( Popcorn.p );
+    } else {
+
+      for ( item in Popcorn.p ) {
+        if ( hasOwn.call( Popcorn.p, item ) ) {
+          list.push( item );
+        }
       }
     }
 

From a53aca6c7ea120971461047b17102fc816477117 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Fri, 30 Sep 2011 15:46:43 -0400
Subject: [PATCH 134/140] Fixed issue where track events were not getting
 removed in unit tests

---
 plugins/timeline/popcorn.timeline.unit.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/timeline/popcorn.timeline.unit.js b/plugins/timeline/popcorn.timeline.unit.js
index 176c30aa2..4eccb5f8d 100644
--- a/plugins/timeline/popcorn.timeline.unit.js
+++ b/plugins/timeline/popcorn.timeline.unit.js
@@ -109,11 +109,16 @@ test( "Popcorn Timeline Plugin", function() {
 	  plus();
 
     var uid, did;
-    while ( uid === upIds.pop() ) {
+    uid = upIds.pop();
+    did = upIds.pop();
+
+    while ( uid ) {
       popped.removeTrackEvent( uid );
+      uid = upIds.pop();
     }
-    while ( did === downIds.pop() ) {
+    while ( did ) {
       popped.removeTrackEvent( did );
+      did = downIds.pop();
     }
 
     popped.pause();

From c660c7e2649e6ac9b39f12c6245410f707b4c466 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Fri, 30 Sep 2011 16:00:29 -0400
Subject: [PATCH 135/140] Fixed issue where events firing at zero now fire
 right at zero ( because of path this release ) which did not happen before.
 We were checking if the events were hidden when in acutality 1 one showing.

---
 plugins/processing/popcorn.processing.unit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/processing/popcorn.processing.unit.js b/plugins/processing/popcorn.processing.unit.js
index d4da15b14..fd71d5e49 100644
--- a/plugins/processing/popcorn.processing.unit.js
+++ b/plugins/processing/popcorn.processing.unit.js
@@ -35,7 +35,7 @@ test( "Processing plugin tests", function() {
   plus();
 
   popped.processing({
-    start: 0,
+    start: 0.25,
     end: 1,
     target: "processing-div-1",
     sketch: "test.pjs"

From 66cf725c41d70d8b0fd85255d5334ce94c2d74b8 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Fri, 30 Sep 2011 16:05:45 -0400
Subject: [PATCH 136/140] Call Popcorn.destroy() on the instance in the in/out
 tests that was polluting the parsing integrity tests in Safari [#755]

---
 test/popcorn.unit.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 00700c8ae..bf2d55cc7 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -2752,6 +2752,7 @@ test( "In/Out aliases", function() {
   function plus() {
     if ( ++count === expects ) {
       Popcorn.removePlugin( "aliasTester" );
+      Popcorn.destroy( popcorn );
       start();
     }
   }

From de4eab98ce0a9abbdd27d06c14d5d85ea46b1746 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Fri, 30 Sep 2011 17:02:13 -0400
Subject: [PATCH 137/140] Added method in unit tests to get the auto-generated
 Popcorn instance [#758]

---
 .../parserJSON/popcorn.parserJSON.unit.html   | 29 ++++++++++---------
 parsers/parserJSON/popcorn.parserJSON.unit.js | 16 +++++++++-
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/parsers/parserJSON/popcorn.parserJSON.unit.html b/parsers/parserJSON/popcorn.parserJSON.unit.html
index 10caa5e61..4f2132fa9 100644
--- a/parsers/parserJSON/popcorn.parserJSON.unit.html
+++ b/parsers/parserJSON/popcorn.parserJSON.unit.html
@@ -4,13 +4,14 @@
   <title>Popcorn 0.3 JSON parser Plug-in Tes</title>
   <link rel="stylesheet" href="../../test/qunit/qunit.css" type="text/css" media="screen">
   <script src="../../test/qunit/qunit.js"></script>
-  <!-- 
-    do not move - this must be called immediately prior to 
+  <!--
+    do not move - this must be called immediately prior to
     popcorn-api-draft.js
   -->
   <script src="../../test/jquery.js"></script>
-  
+
   <script src="../../popcorn.js"></script>
+  <script src="../../modules/timeline-sources/popcorn.timeline-sources.js"></script>
   <script src="../../plugins/webpage/popcorn.webpage.js"></script>
   <script src="../../plugins/footnote/popcorn.footnote.js"></script>
   <script src="../../plugins/googlemap/popcorn.googlemap.js"></script>
@@ -24,33 +25,33 @@ <h2 id="qunit-banner"></h2>
   <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
   <div id="qunit-fixture">  </div>
-  
-  <video id='video' 
+
+  <video id='video'
     controls
     width= '250px'
-    poster="../../test/poster.png"> 
+    poster="../../test/poster.png">
 
     <source id='mp4'
       src="../../test/trailer.mp4"
-      type='video/mp4; codecs="avc1, mp4a"'> 
+      type='video/mp4; codecs="avc1, mp4a"'>
 
     <source id='ogv'
       src="../../test/trailer.ogv"
-      type='video/ogg; codecs="theora, vorbis"'> 
-      
+      type='video/ogg; codecs="theora, vorbis"'>
+
     <source id='webm'
       src="../../test/trailer.webm"
       type='video/webm; codecs="vp8, vorbis"'>
 
-    <p>Your user agent does not support the HTML5 Video element.</p> 
+    <p>Your user agent does not support the HTML5 Video element.</p>
 
-  </video> 
+  </video>
 
   <audio id='audio' data-timeline-sources="data/audio.json" controls>
     <source src="../../test/italia.mp4" type='audio/mp4; codecs="mp4a.40.2"'>
     <source src="../../test/italia.ogg" type='audio/ogg; codecs="vorbis"'>
 	</audio>
-  
+
   <style>
     .displays {
       width: 300px;
@@ -61,12 +62,12 @@ <h2 id="qunit-userAgent"></h2>
   <div style="width:300px;float:left">
 		<div class="displays" id="video-iframe-container"></div>
 		<div class="displays" id="video-map-container"></div>
-		<div class="displays" id="video-footnote-container"></div> 
+		<div class="displays" id="video-footnote-container"></div>
 	</div>
 	<div style="width:300px;float:left">
 		<div class="displays" id="audio-iframe-container"></div>
 		<div class="displays" id="audio-map-container"></div>
-		<div class="displays" id="audio-footnote-container"></div>   
+		<div class="displays" id="audio-footnote-container"></div>
 	</div>
 </body>
 </html>
diff --git a/parsers/parserJSON/popcorn.parserJSON.unit.js b/parsers/parserJSON/popcorn.parserJSON.unit.js
index dd05c5783..575855160 100644
--- a/parsers/parserJSON/popcorn.parserJSON.unit.js
+++ b/parsers/parserJSON/popcorn.parserJSON.unit.js
@@ -85,7 +85,21 @@ test("Popcorn 0.3 JSON Parser Plugin - AUDIO", function () {
       trackData,
       trackEvents,
       interval,
-      audiocorn = Popcorn("#audio");
+      audiocorn;
+
+  function getInstance( id ){
+    var instance;
+    for ( var i = 0, l = Popcorn.instances.length; i < l; i++ ) {
+      instance = instance = Popcorn.instances[ i ];
+      console.log( instance );
+      if ( instance.media.id === id ) {
+        return instance;
+      }
+    }
+    throw( "instance not found" );
+  }
+
+  audiocorn = getInstance( "audio" );
 
   function plus() {
     if ( ++count === expects ) {

From d2e2d1eb592d5fee0d9282343a77cfb73a5e2ef3 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Fri, 30 Sep 2011 17:15:00 -0400
Subject: [PATCH 138/140] Fixed test failing due to Object.keys reference

---
 test/popcorn.unit.js | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index bf2d55cc7..b7518c08e 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -2679,11 +2679,19 @@ test("Remove Plugin", function() {
 
 test( "Protected Names", function() {
 
-  var keys = Object.keys( Popcorn.p ),
-      len = keys.length,
+  var keys = [], 
+      len,
       count = 0,
       popped = Popcorn( "#video" );
 
+  for ( item in Popcorn.p ) {
+    if ( Popcorn.p.hasOwnProperty( item ) ) {
+      keys.push( item );
+    }
+  }
+
+  len = keys.length;
+
   expect( len );
 
   function plus() {
@@ -2703,7 +2711,7 @@ test( "Protected Names", function() {
     };
   });
 
-  stop( 5000 );
+  stop();
 
 });
 
@@ -2760,7 +2768,7 @@ test( "In/Out aliases", function() {
   Popcorn.plugin( "aliasTester", function() {
 
     return {
-      in: function() {
+      "in": function() {
         counter++;
       },
       out: function() {
@@ -2770,7 +2778,7 @@ test( "In/Out aliases", function() {
   });
 
   popcorn.aliasTester({
-    in: 1,
+    "in": 1,
     out: 3
   });
 

From 80761077620bdf65376120c566dc54bd50367367 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Fri, 30 Sep 2011 17:19:29 -0400
Subject: [PATCH 139/140] removed console.logs, fixed whitespace [#758]

---
 parsers/parserJSON/popcorn.parserJSON.unit.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/parsers/parserJSON/popcorn.parserJSON.unit.js b/parsers/parserJSON/popcorn.parserJSON.unit.js
index 575855160..283e89b9f 100644
--- a/parsers/parserJSON/popcorn.parserJSON.unit.js
+++ b/parsers/parserJSON/popcorn.parserJSON.unit.js
@@ -31,11 +31,8 @@ test("Popcorn 0.3 JSON Parser Plugin", function () {
 
       var idx = 0;
 
-      //console.log( data );
-
       Popcorn.forEach( data.json.data, function (dataObj) {
 
-        //console.log( dataObj );
         Popcorn.forEach( dataObj, function ( obj, key ) {
 
           equals( trackData.history[idx].indexOf(key), 0, "history item '" + trackData.history[idx] + "' matches data key '"+ key+ "' at correct index" );
@@ -87,11 +84,10 @@ test("Popcorn 0.3 JSON Parser Plugin - AUDIO", function () {
       interval,
       audiocorn;
 
-  function getInstance( id ){
+  function getInstance( id ) {
     var instance;
     for ( var i = 0, l = Popcorn.instances.length; i < l; i++ ) {
       instance = instance = Popcorn.instances[ i ];
-      console.log( instance );
       if ( instance.media.id === id ) {
         return instance;
       }
@@ -129,8 +125,7 @@ test("Popcorn 0.3 JSON Parser Plugin - AUDIO", function () {
 
           var historyItem = trackData.history[ idx ];
 
-          console.log( historyItem, key );
-          equal( historyItem.indexOf(key), 0, "history item '" + historyItem + "' matches data key '"+ key+ "' at correct index" );
+          equal( historyItem.indexOf( key ), 0, "history item '" + historyItem + "' matches data key '"+ key+ "' at correct index" );
           plus();
 
           idx++;

From aeaec0bad1963d337ac1aaaea0b497b604981910 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Sat, 1 Oct 2011 18:28:02 -0400
Subject: [PATCH 140/140] Fixed failing unit test in opera

---
 test/popcorn.unit.js | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index b7518c08e..7d98cf6ae 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -636,23 +636,16 @@ test( "play(n)/pause(n) custom stop()", function() {
   $pop.listen( "canplayall", function() {
 
     this.exec( 4, function() {
-
-      this.listen( "seeked", function() {
-
-        this.unlisten( "seeked" );
+    
+      this.exec( 0, function() {
 
         equal( this.currentTime(), 0, "currentTime is 0" );
         plus();
 
         equal( this.media.paused, true, "The media is paused" );
         plus();
-
-      // Call custom "stop()"
       }).stop();
-    });
-
-    // Play from 3s
-    this.play( 3 );
+    }).play( 3 );
   });
 });