From ff4c81b3b1a9696a5347b8128e1d95ec0b18c60a Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Fri, 30 Sep 2011 00:09:46 -0400
Subject: [PATCH 01/78] Re-write of the Vimeo Player plug-in to use the new
 Player API [#728]

---
 players/vimeo/popcorn.vimeo.html      |  59 +-
 players/vimeo/popcorn.vimeo.js        | 767 +++++++-------------------
 players/vimeo/popcorn.vimeo.unit.html |  19 +-
 players/vimeo/popcorn.vimeo.unit.js   | 487 +++++++++++-----
 4 files changed, 581 insertions(+), 751 deletions(-)

diff --git a/players/vimeo/popcorn.vimeo.html b/players/vimeo/popcorn.vimeo.html
index 6c0bea897..63f0a9089 100644
--- a/players/vimeo/popcorn.vimeo.html
+++ b/players/vimeo/popcorn.vimeo.html
@@ -21,7 +21,7 @@
                 padding-left: 20px;
             }
         </style>
-        
+
         <script src="../../popcorn.js"></script>
         <script type="text/javascript" src="popcorn.vimeo.js"></script>
         <script src="../../plugins/footnote/popcorn.footnote.js"></script>
@@ -32,67 +32,61 @@
         <script src="../../plugins/image/popcorn.image.js"></script>
         <script src="../../plugins/subtitle/popcorn.subtitle.js"></script>
         <script src="../../plugins/twitter/popcorn.twitter.js"></script>
-        
+
         <script type="text/javascript">
             // Called as onload function
             // Set up interface controls
             VimeoEmbedLoaded = function( player ) {
                 var loop = 0,
                     volume = 1;
-                
+
                 // Hook up custom controls
                 // Single play/pause buttons
                 document.getElementById( "btnPlay" ).addEventListener( "click", function(e) {
                   player.play();
                 }, false);
-                
+
                 document.getElementById( "btnPause" ).addEventListener( "click", function(e) {
                     player.pause();
                 }, false);
-                
+
                 //Seek
                 document.getElementById( "btnSeek" ).addEventListener( "click", function() {
                   player.currentTime( 30 );
                 }, false);
 
-                // Loop
-                document.getElementById( "btnLoop" ).addEventListener( "click", function() {
-                  loop = loop === "loop" ? "" : "loop";
-                  player.video.setLoop( loop );
-                }, false);
-
                 // Volume
                 document.getElementById( "btnVolume" ).addEventListener( "click", function() {
-                  volume = volume === 1 ? 0.5 : 1;
+                  volume = volume === 100 ? 50 : 100;
                   player.volume( volume );
                 }, false);
-                
+
                 // Mute
                 document.getElementById( "btnMute" ).addEventListener( "click", function() {
-                  player.mute();
+                  player.mute( !player.media.muted );
                 }, false);
-                
+
                 // Hook into player events
                 // Timeupdate, as the video plays
                 player.listen( "timeupdate", function() {
                   document.getElementById( "player_time" ).innerHTML = player.currentTime();
                 });
-                
+
                 // When the volume changes
                 player.listen( "volumechange", function() {
                   document.getElementById( "player_vol" ).innerHTML = player.volume();
                 });
-                
+
                 // When the video duration changes
                 player.listen( "durationchange", function() {
                   document.getElementById( "player_duration" ).innerHTML = player.duration();
                 });
-                
+
                 // When the meddia ready state changes
                 player.listen( "readystatechange", function() {
                   document.getElementById( "player_state" ).innerHTML = player.readyState();
                 });
-                
+
                 // Output some initial UI values so we caan see what the player is doing
                 document.getElementById( "player_time" ).innerHTML = player.currentTime();
                 document.getElementById( "player_vol" ).innerHTML = player.volume();
@@ -101,12 +95,7 @@
 
             //On document ready
             document.addEventListener( "DOMContentLoaded", function() {
-              var player = Popcorn( Popcorn.vimeo( "player_1", "http://player.vimeo.com/video/11127501", {
-                  css: {
-                    width: "500px",
-                    height: "281px"
-                  }
-                }) )
+              var player = Popcorn.vimeo( "player_1", "http://player.vimeo.com/video/6960892" )
                     .footnote({
                       start: 5, // seconds
                       end: 40, // seconds
@@ -145,7 +134,7 @@
                       language: "en"
                     })
                     .webpage({
-                      id: "webpages-a", 
+                      id: "webpages-a",
                       start: 0, // seconds
                       end: 15, // seconds
                       src: 'http://webmademovies.org/',
@@ -165,34 +154,34 @@
                       href: 'http://www.drumbeat.org/',
                       src: 'https://www.drumbeat.org/media//images/drumbeat-logo-splash.png',
                       target: 'imagediv'
-                    })
-                    .listen( "load", function() {
+                    });
+                    player.listen( "load", function() {
+                      //console.log( "asdfasdf" );
                       VimeoEmbedLoaded( player );
                     })
-                    .listen( "loadstart", function() {
+                   .listen( "loadstart", function() {
                       document.getElementById( "player_load" ).innerHTML = "Started";
                     })
                     .listen( "canplaythrough", function() {
                       document.getElementById( "player_load" ).innerHTML = "Finished";
                     })
-                    .volume(0)
+                    //.volume(0)
                     .play();
             }, false);
         </script>
     </head>
     <body>
           <div>
-            <div id="player_1" ></div><br />
+            <div id="player_1" style="width: 400px; height: 400px;"></div><br />
             <button class="simple" id="btnPlay">Play</button>
             <button class="simple" id="btnPause">Pause</button>
             <button class="seek" id="btnSeek">Seek to 30</button>
-            <button class="loop" id="btnLoop">Toggle Loop</button>
             <button class="volume" id="btnVolume">Toggle Volume</button>
             <button class="volume" id="btnMute">Mute</button>
             <div>
               Current Time (s): <span id="player_time"></span>
               <br />Video Duration (s): <span id="player_duration"></span>
-              <br />Volume (0-1): <span id="player_vol"></span>
+              <br />Volume (0-100): <span id="player_vol"></span>
               <br />Load Status: <span id="player_load">Not Started</span>
             </div>
           </div>
@@ -243,9 +232,9 @@ <h4>Expected Events</h4>
               <strong>Web Page Area</strong><br />
             </div>
           </div>
-          
+
           <br />
           <br />
-          
+
     </body>
 </html>
diff --git a/players/vimeo/popcorn.vimeo.js b/players/vimeo/popcorn.vimeo.js
index c995f47c7..5f73eb6f8 100644
--- a/players/vimeo/popcorn.vimeo.js
+++ b/players/vimeo/popcorn.vimeo.js
@@ -1,613 +1,246 @@
-// Popcorn Vimeo Player Wrapper
-( function( Popcorn, global ) {
-  /**
-  * Vimeo wrapper for Popcorn.
-  * This player adds enables Popcorn.js to handle Vimeo videos. It does so by masking an embedded Vimeo video Flash object
-  * as a video and implementing the HTML5 Media Element interface.
-  *
-  * You can specify the video in four ways:
-  *  1. Use the embed code path supplied by Vimeo as a div's src, and pass the div id into a new Popcorn.vimeo object
-  *
-  *    <div id="player_1" width="500" height="281" src="http://player.vimeo.com/video/11127501" ></div>
-  *    <script type="text/javascript">
-  *      document.addEventListener("DOMContentLoaded", function() {
-  *        var popcorn = Popcorn( Popcorn.vimeo( "player_1" ) );
-  *      }, false);
-  *    </script>
-  &
-  *  2. Pass the div id and the embed code path supplied by Vimeo into a new Popcorn.vimeo object
-  *
-  *    <div id="player_1" width="500" height="281" ></div>
-  *    <script type="text/javascript">
-  *      document.addEventListener("DOMContentLoaded", function() {
-  *        var popcorn = Popcorn( Popcorn.vimeo( "player_1", "http://player.vimeo.com/video/11127501" ) );
-  *      }, false);
-  *    </script>
-  *
-  *  3. Use a web url as a div's src, and pass the div id into a new Popcorn.vimeo object
-  *
-  *    <div id="player_1" width="500" height="281" src="http://vimeo.com/11127501" ></div>
-  *    <script type="text/javascript">
-  *      document.addEventListener("DOMContentLoaded", function() {
-  *        var popcorn = Popcorn( Popcorn.vimeo( "player_1" ) );
-  *      }, false);
-  *    </script>
-  *
-  *  4. Pass the div id and the web url into a new Popcorn.vimeo object
-  *
-  *    <div id="player_1" width="500" height="281" ></div>
-  *    <script type="text/javascript">
-  *      document.addEventListener("DOMContentLoaded", function() {
-  *        var popcorn = Popcorn( Popcorn.vimeo( "player_1", "http://vimeo.com/11127501" ) );
-  *      }, false);
-  *    </script>
-  *
-  * Due to Vimeo's API, certain events must be subscribed to at different times, and some not at all.
-  * These events are completely custom-implemented and may be subscribed to at any time:
-  *   canplaythrough
-  *   durationchange
-  *   load
-  *   loadedmetadata
-  *   loadstart
-  *   play
-  *   readystatechange
-  *   volumechange
-  *
-  * These events are related to player functionality and must be subscribed to during or after the load event:
-  *   abort
-  *   emptied
-  *   ended
-  *   pause
-  *   playing
-  *   progress
-  *   seeked
-  *   timeupdate
-  *
-  * These events are not supported:
-  *   canplay
-  *   error
-  *   loadeddata
-  *   ratechange
-  *   seeking
-  *   stalled
-  *   suspend
-  *   waiting
-  *
-  * Due to Vimeo's API, some attributes are be supported while others are not.
-  * Supported media attributes:
-  *   autoplay ( via Popcorn )
-  *   currentTime
-  *   duration ( get only )
-  *   ended ( get only )
-  *   initialTime ( get only, always 0 )
-  *   loop ( get only, set by calling setLoop() )
-  *   muted ( get only )
-  *   paused ( get only )
-  *   readyState ( get only )
-  *   volume
-  *
-  *   load() function
-  *   mute() function ( toggles on/off )
-  *
-  * Unsupported media attributes:
-  *   buffered
-  *   defaultPlaybackRate
-  *   networkState
-  *   playbackRate
-  *   played
-  *   preload
-  *   seekable
-  *   seeking
-  *   src
-  *   startOffsetTime
-  */
-
-  // Trackers
-  var timeupdateInterval = 33,
-      timeCheckInterval = 0.75,
-      abs = Math.abs,
-      registry = {};
-
-  // base object for DOM-related behaviour like events
-  var EventManager = function ( owner ) {
-    var evts = {};
-
-    function makeHandler( evtName ) {
-      if ( !evts[evtName] ) {
-        evts[evtName] = [];
-
-        // Create a wrapper function to all registered listeners
-        this["on"+evtName] = function( args ) {
-          Popcorn.forEach( evts[evtName], function( fn ) {
-            if ( fn ) {
-              fn.call( owner, args );
-            }
-          });
-        };
-      }
-    }
-
-    return {
-      addEventListener: function( evtName, fn, doFire ) {
-        evtName = evtName.toLowerCase();
-
-        makeHandler.call( this, evtName );
-        evts[evtName].push( fn );
-
-        if ( doFire ) {
-          dispatchEvent( evtName );
-        }
-
-        return fn;
-      },
-      // Add many listeners for a single event
-      // Takes an event name and array of functions
-      addEventListeners: function( evtName, events ) {
-        evtName = evtName.toLowerCase();
-
-        makeHandler.call( this, evtName );
-        evts[evtName] = evts[evtName].concat( events );
-      },
-      removeEventListener: function( evtName, fn ) {
-        var evtArray = this.getEventListeners( evtName ),
-            i,
-            l;
-
-        // Find and remove from events array
-        for ( i = 0, l = evtArray.length; i < l; i++) {
-          if ( evtArray[i] === fn ) {
-            var removed = evtArray[i];
-            evtArray[i] = 0;
-            return removed;
-          }
-        }
-      },
-      getEventListeners: function( evtName ) {
-        if( evtName ) {
-          return evts[ evtName.toLowerCase() ] || [];
-        } else {
-          return evts;
-        }
-      },
-      dispatchEvent: function( evt, args ) {
-        // If event object was passed in, toString will yield event type as string (timeupdate)
-        // If a string, toString() will return the string itself (timeupdate)
-        evt = "on"+evt.toString().toLowerCase();
-        this[evt] && this[evt]( args );
-      }
-    };
-  };
+(function() {
 
-  Popcorn.vimeo = function( mediaId, list, options ) {
-    return new Popcorn.vimeo.init( mediaId, list, options );
+  // global callback for vimeo.. yuck.
+  vimeo_player_loaded = function( playerId ) {
+    vimeo_player_loaded[ playerId ] && vimeo_player_loaded[ playerId ]();
   };
+  vimeo_player_loaded.seek = {};
+  vimeo_player_loaded.loadProgress = {};
+  vimeo_player_loaded.play = {};
+  vimeo_player_loaded.pause = {};
+
+  Popcorn.player( "vimeo", {
+    _setup: function( options ) {
+
+      var media = this,
+          vimeoObject,
+          vimeoContainer = document.createElement( "div" ),
+          currentTime = 0,
+          seekTime = 0,
+          seeking = false,
+          volumeChanged = false,
+          lastMuted = false,
+          lastVolume = 0;
+
+      vimeoContainer.id = media.id + Popcorn.guid();
+
+      media.appendChild( vimeoContainer );
+
+      var vimeoInit = function() {
+
+        var flashvars,
+            params,
+            attributes = {},
+            src = media.src,
+            toggleMuteVolume = 0,
+            loadStarted = false;
+
+        vimeo_player_loaded[ vimeoContainer.id ] = function() {
+          vimeoObject = document.getElementById( vimeoContainer.id );
+
+          vimeo_player_loaded.seek[ vimeoContainer.id ] = function( time ) {
+            if( time !== currentTime ) {
+              currentTime = time;
+              media.dispatchEvent( "seeked" );
+              media.dispatchEvent( "timeupdate" );
+            }
+          };
 
-  Popcorn.vimeo.onLoad = function( playerId ) {
-    var player = registry[ playerId ];
+          vimeo_player_loaded.play[ vimeoContainer.id ] = function() {
+            if ( media.paused ) {
+              media.paused = false;
+              media.dispatchEvent( "play" );
 
-    player.swfObj = document.getElementById( playerId );
+              media.dispatchEvent( "playing" );
+              timeUpdate();
+            }
+          };
 
-    // For calculating position relative to video (like subtitles)
-    player.offsetWidth = player.swfObj.offsetWidth;
-    player.offsetHeight = player.swfObj.offsetHeight;
-    player.offsetParent = player.swfObj.offsetParent;
-    player.offsetLeft = player.swfObj.offsetLeft;
-    player.offsetTop = player.swfObj.offsetTop;
+          vimeo_player_loaded.pause[ vimeoContainer.id ] = function() {
+            if ( !media.paused ) {
+              media.paused = true;
+              media.dispatchEvent( "pause" );
+            }
+          };
 
-    player.dispatchEvent( "load" );
-  };
+          vimeo_player_loaded.loadProgress[ vimeoContainer.id ] = function( progress ) {
 
-  Popcorn.getScript( "http://ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js" );
+            if ( !loadStarted ) {
+              loadStarted = true;
+              media.dispatchEvent( "loadstart" );
+            }
 
-  // A constructor, but we need to wrap it to allow for "static" functions
-  Popcorn.vimeo.init = (function() {
-    var rPlayerUri = /^http:\/\/player\.vimeo\.com\/video\/[\d]+/i,
-        rWebUrl = /vimeo\.com\/[\d]+/,
-        hasAPILoaded = false;
+            if ( progress.percent === 100 ) {
+              media.dispatchEvent( "canplaythrough" );
+            }
+          };
 
-    // Extract the numeric video id from container uri: 'http://player.vimeo.com/video/11127501' or 'http://player.vimeo.com/video/4282282'
-    // Expect id to be a valid 32/64-bit unsigned integer
-    // Returns string, empty string if could not match
-    function extractIdFromUri( uri ) {
-      if ( !uri ) {
-        return;
-      }
+          vimeoObject.api_addEventListener( "seek", "vimeo_player_loaded.seek." + vimeoContainer.id );
+          vimeoObject.api_addEventListener( "loadProgress", "vimeo_player_loaded.loadProgress." + vimeoContainer.id );
+          vimeoObject.api_addEventListener( "play", "vimeo_player_loaded.play." + vimeoContainer.id );
+          vimeoObject.api_addEventListener( "pause", "vimeo_player_loaded.pause." + vimeoContainer.id );
 
-      var matches = uri.match( rPlayerUri );
-      return matches ? matches[0].substr(30) : "";
-    }
+          var timeUpdate = function() {
+            if ( !media.paused ) {
+              currentTime = vimeoObject.api_getCurrentTime();
+              media.dispatchEvent( "timeupdate" );
+              setTimeout( timeUpdate, 10 );
+            }
+          },
 
-    // Extract the numeric video id from url: 'http://vimeo.com/11127501' or simply 'vimeo.com/4282282'
-    // Ignores protocol and subdomain, but one would expecct it to be http://www.vimeo.com/#######
-    // Expect id to be a valid 32/64-bit unsigned integer
-    // Returns string, empty string if could not match
-    function extractIdFromUrl( url ) {
-      if ( !url ) {
-        return;
-      }
+          isMuted = function() {
 
-      var matches = url.match( rWebUrl );
-      return matches ? matches[0].substr(10) : "";
-    }
+            return vimeoObject.api_getVolume() === 0;
+          };
 
-    function makeSwf( self, vidId, containerId ) {
-      if ( !window.swfobject ) {
-        setTimeout( function() {
-          makeSwf( self, vidId, containerId );
-        }, 1);
-        return;
-      }
+          var volumeUpdate = function() {
 
-      var params,
-          flashvars,
-          attributes = {};
-
-      flashvars = {
-        clip_id: vidId,
-        show_portrait: 1,
-        show_byline: 1,
-        show_title: 1,
-        // required in order to use the Javascript API
-        js_api: 1,
-        // moogaloop will call this JS function when it's done loading (optional)
-        js_onLoad: 'Popcorn.vimeo.onLoad',
-        // this will be passed into all event methods so you can keep track of multiple moogaloops (optional)
-        js_swf_id: containerId
-      };
-      params = {
-        allowscriptaccess: 'always',
-        allowfullscreen: 'true',
-        // This is so we can overlay html ontop o fFlash
-        wmode: 'transparent'
-      };
+            m = isMuted();
+            vol = vimeoObject.api_getVolume();
+            if ( lastMuted !== m ) {
+              lastMuted = m;
+              media.dispatchEvent( "volumechange" );
+            }
 
-      swfobject.embedSWF( "http://vimeo.com/moogaloop.swf", containerId, self.offsetWidth, self.offsetHeight, "9.0.0", "expressInstall.swf", flashvars, params, attributes );
-    }
+            if ( lastVolume !== vol ) {
+              lastVolume = vol;
+              media.dispatchEvent( "volumechange" );
+            }
 
-    // If container id is not supplied, assumed to be same as player id
-    var ctor = function ( containerId, videoUrl, options ) {
-      if ( !containerId ) {
-        throw "Must supply an id!";
-      } else if ( /file/.test( location.protocol ) ) {
-        throw "Must run from a web server!";
-      }
+            setTimeout( volumeUpdate, 250 );
+          };
 
-      var vidId,
-          that = this,
-          tmp;
-
-      this._container = document.createElement( "div" );
-      this._container.id = containerId + "object";
-      this._target = document.getElementById( containerId );
-      this._target.appendChild( this._container );
-
-      options = options || {};
-
-      options.css && Popcorn.extend( this._target.style, options.css );
-
-      this.addEventFn = null;
-      this.evtHolder = null;
-      this.paused = true;
-      this.duration = Number.MAX_VALUE;
-      this.ended = 0;
-      this.currentTime = 0;
-      this.volume = 1;
-      this.loop = 0;
-      this.initialTime = 0;
-      this.played = 0;
-      this.readyState = 0;
-      this.parentNode = this._target.parentNode;
-
-      this.previousCurrentTime = this.currentTime;
-      this.previousVolume = this.volume;
-      this.evtHolder = new EventManager( this );
-
-      // For calculating position relative to video (like subtitles)
-      this.width = this._target.style.width || "504px";
-      this.height = this._target.style.height || "340px";
-
-      if ( !/[\d]%/.test( this.width ) ) {
-        this.offsetWidth = parseInt( this.width, 10 );
-        this._target.style.width = this.width + "px";
-      } else {
-        // convert from pct to abs pixels
-        tmp = this._target.style.width;
-        this._target.style.width = this.width;
-        this.offsetWidth = this._target.offsetWidth;
-        this._target.style.width = tmp;
-      }
+          var mute = function() {
 
-      if ( !/[\d]%/.test( this.height ) ) {
-        this.offsetHeight = parseInt( this.height, 10 );
-        this._target.style.height = this.height + "px";
-      } else {
-        // convert from pct to abs pixels
-        tmp = this._target.style.height;
-        this._target.style.height = this.height;
-        this.offsetHeight = this._target.offsetHeight;
-        this._target.style.height = tmp;
-      }
+          };
 
-      this.offsetLeft = 0;
-      this.offsetTop = 0;
+          media.play = function() {
+            media.paused = false;
+            media.dispatchEvent( "play" );
 
-      // Try and get a video id from a vimeo site url
-      // Try either from ctor param or from iframe itself
-      vidId = extractIdFromUrl( videoUrl ) || extractIdFromUri( videoUrl );
+            media.dispatchEvent( "playing" );
+            timeUpdate();
+            vimeoObject.api_play();
+          };
 
-      if ( !vidId ) {
-        throw "No video id";
-      }
+          media.pause = function() {
 
-      registry[ this._container.id ] = this;
+            if ( !media.paused ) {
 
-      makeSwf( this, vidId, this._container.id );
+              media.paused = true;
+              media.dispatchEvent( "pause" );
+              vimeoObject.api_pause();
+            }
+          };
 
-      // Set up listeners to internally track state as needed
-      this.addEventListener( "load", function() {
-        var hasLoaded = false;
+          Popcorn.player.defineProperty( media, "currentTime", {
+
+            set: function( val ) {
+              if ( !val ) {
+                return currentTime;
+              }
+              currentTime = seekTime = +val;
+              seeking = true;
+              media.dispatchEvent( "seeked" );
+              media.dispatchEvent( "timeupdate" );
+              vimeoObject.api_seekTo( currentTime );
+              return currentTime;
+            },
+            get: function() {
+              return currentTime;
+            }
+          });
 
-        that.duration = that.swfObj.api_getDuration();
-        that.evtHolder.dispatchEvent( "durationchange" );
-        that.evtHolder.dispatchEvent( "loadedmetadata" );
+          Popcorn.player.defineProperty( media, "muted", {
+            set: function( val ) {
+              if ( isMuted() !== val ) {
+                if ( val ) {
+                  toggleMuteVolume = vimeoObject.api_getVolume();
+                  vimeoObject.api_setVolume( 0 );
+                } else {
+                  vimeoObject.api_setVolume( toggleMuteVolume );
+                }
+              }
+            },
+            get: function() {
+              return isMuted();
+            }
+          });
 
-        // Chain events and calls together so that this.currentTime reflects the current time of the video
-        // Done by Getting the Current Time while the video plays
-        that.addEventListener( "timeupdate", function() {
-          that.currentTime = that.swfObj.api_getCurrentTime();
-        });
+          Popcorn.player.defineProperty( media, "volume", {
+            set: function( val ) {
 
-        // Add pause listener to keep track of playing state
+              if ( !val || typeof val !== "number" || ( val < 0 && val > 1 ) ) {
+                return vimeoObject.api_getVolume();
+              }
 
-        that.addEventListener( "pause", function() {
-          that.paused = true;
-        });
+              if ( vimeoObject.api_getVolume() !== val ) {
+                vimeoObject.api_setVolume( val );
+                lastVolume = vimeoObject.api_getVolume();
+                media.dispatchEvent( "volumechange" );
+              }
 
-        // Add play listener to keep track of playing state
-        that.addEventListener( "playing", function() {
-          that.paused = false;
-          that.ended = 0;
-        });
+              return vimeoObject.api_getVolume();
+            },
+            get: function() {
+              return vimeoObject.api_getVolume();
+            }
+          });
 
-        // Add ended listener to keep track of playing state
-        that.addEventListener( "ended", function() {
-          if ( that.loop !== "loop" ) {
-            that.paused = true;
-            that.ended = 1;
-          }
-        });
+          media.readyState = 4;
+          media.dispatchEvent( "load" );
+          media.duration = vimeoObject.api_getDuration();
+          media.dispatchEvent( "durationchange" );
+          volumeUpdate();
 
-        // Add progress listener to keep track of ready state
-        that.addEventListener( "progress", function( data ) {
-          if ( !hasLoaded ) {
-            hasLoaded = 1;
-            that.readyState = 3;
-            that.evtHolder.dispatchEvent( "readystatechange" );
-          }
+          media.dispatchEvent( "loadeddata" );
+        }
 
-          // Check if fully loaded
-          if ( data.percent === 100 ) {
-            that.readyState = 4;
-            that.evtHolder.dispatchEvent( "readystatechange" );
-            that.evtHolder.dispatchEvent( "canplaythrough" );
+        function extractId( videoUrl ) {
+          if ( !videoUrl ) {
+            return;
           }
-        });
-      });
-    };
-    return ctor;
-  })();
-
-  Popcorn.vimeo.init.prototype = Popcorn.vimeo.prototype;
-
-  // Sequence object prototype
-  Popcorn.extend( Popcorn.vimeo.prototype, {
-    // Do everything as functions instead of get/set
-    setLoop: function( val ) {
-      if ( !val ) {
-        return;
-      }
+          var rPlayerUri = /^http:\/\/player\.vimeo\.com\/video\/[\d]+/i,
+              rWebUrl = /vimeo\.com\/[\d]+/;
 
-      this.loop = val;
-      var isLoop = val === "loop" ? 1 : 0;
-      // HTML convention says to loop if value is 'loop'
-      this.swfObj.api_setLoop( isLoop );
-    },
-    // Set the volume as a value between 0 and 1
-    setVolume: function( val ) {
-      if ( !val && val !== 0 ) {
-        return;
-      }
-
-      // Normalize in case outside range of expected values
-      if ( val < 0 ) {
-        val = -val;
-      }
-
-      if ( val > 1 ) {
-        val %= 1;
-      }
-
-      // HTML video expects to be 0.0 -> 1.0, Vimeo expects 0-100
-      this.volume = this.previousVolume = val;
-      this.swfObj.api_setVolume( val*100 );
-      this.evtHolder.dispatchEvent( "volumechange" );
-    },
-    // Seeks the video
-    setCurrentTime: function ( time ) {
-      if ( !time && time !== 0 ) {
-        return;
-      }
-
-      this.currentTime = this.previousCurrentTime = time;
-      this.ended = time >= this.duration;
-      this.swfObj.api_seekTo( time );
-
-      // Fire events for seeking and time change
-      this.evtHolder.dispatchEvent( "seeked" );
-      this.evtHolder.dispatchEvent( "timeupdate" );
-    },
-    // Play the video
-    play: function() {
-      // In case someone is cheeky enough to try this before loaded
-      if ( !this.swfObj ) {
-        this.addEventListener( "load", this.play );
-        return;
-      }
-
-      if ( !this.played ) {
-        this.played = 1;
-        this.startTimeUpdater();
-        this.evtHolder.dispatchEvent( "loadstart" );
-      }
-
-      this.evtHolder.dispatchEvent( "play" );
-      this.swfObj.api_play();
-    },
-    // Pause the video
-    pause: function() {
-      // In case someone is cheeky enough to try this before loaded
-      if ( !this.swfObj ) {
-        this.addEventListener( "load", this.pause );
-        return;
-      }
-
-      this.swfObj.api_pause();
-    },
-    // Toggle video muting
-    // Unmuting will leave it at the old value
-    mute: function() {
-      // In case someone is cheeky enough to try this before loaded
-      if ( !this.swfObj ) {
-        this.addEventListener( "load", this.mute );
-        return;
-      }
-
-      if ( !this.muted() ) {
-        this.oldVol = this.volume;
-
-        if ( this.paused ) {
-          this.setVolume( 0 );
-        } else {
-          this.volume = 0;
+          var matches = videoUrl.match( rPlayerUri ) ? videoUrl.match( rPlayerUri )[ 0 ].substr( 30 ) : "";
+          return matches ? matches : videoUrl.match( rWebUrl ) ? videoUrl.match( rWebUrl )[ 0 ].substr( 10 ) : "";
         }
-      } else {
-        if ( this.paused ) {
-          this.setVolume( this.oldVol );
-        } else {
-          this.volume = this.oldVol;
+
+        if ( !( src = extractId( src ) ) ) {
+          throw "Invalid Video Id";
         }
-      }
-    },
-    muted: function() {
-      return this.volume === 0;
-    },
-    // Force loading by playing the player. Pause afterwards
-    load: function() {
-      // In case someone is cheeky enough to try this before loaded
-      if ( !this.swfObj ) {
-        this.addEventListener( "load", this.load );
-        return;
-      }
 
-      this.play();
-      this.pause();
-    },
-    unload: function() {
-      // In case someone is cheeky enough to try this before loaded
-      if ( !this.swfObj ) {
-        this.addEventListener( "load", this.unload );
-        return;
-      }
+        flashvars = {
+          clip_id: src,
+          show_portrait: 1,
+          show_byline: 1,
+          show_title: 1,
+          js_api: 1,
+          js_swf_id: vimeoContainer.id
+        };
+        params = {
+          allowscriptaccess: "always",
+          allowfullscreen: "true",
+          wmode: "transparent"
+        };
 
-      this.pause();
-
-      this.swfObj.api_unload();
-      this.evtHolder.dispatchEvent( "abort" );
-      this.evtHolder.dispatchEvent( "emptied" );
-    },
-    // Hook an event listener for the player event into internal event system
-    // Stick to HTML conventions of add event listener and keep lowercase, without prependinng "on"
-    addEventListener: function( evt, fn ) {
-      var playerEvt,
-          that = this;
-
-      // In case event object is passed in
-      evt = evt.type || evt.toLowerCase();
-
-      // If it's an HTML media event supported by player, map
-      if ( evt === "seeked" ) {
-        playerEvt = "onSeek";
-      } else if ( evt === "timeupdate" ) {
-        playerEvt = "onProgress";
-      } else if ( evt === "progress" ) {
-        playerEvt = "onLoading";
-      } else if ( evt === "ended" ) {
-        playerEvt = "onFinish";
-      } else if ( evt === "playing" ) {
-        playerEvt = "onPlay";
-      } else if ( evt === "pause" ) {
-        // Direct mapping, CamelCase the event name as vimeo API expects
-        playerEvt = "on"+evt[0].toUpperCase() + evt.substr(1);
-      }
+        swfobject.embedSWF( "http://vimeo.com/moogaloop.swf", vimeoContainer.id,
+                            media.offsetWidth + "", media.offsetHeight + "", "9.0.0", "expressInstall.swf",
+                            flashvars, params, attributes );
 
-      // Vimeo only stores 1 callback per event
-      // Have vimeo call internal collection of callbacks
-      this.evtHolder.addEventListener( evt, fn, false );
+        vimeoContainer.addEventListener( "load", function() {
+          console.log("asdfasdf");
+        });
 
-      // Link manual event structure with Vimeo's if not already
-      if( playerEvt && this.evtHolder.getEventListeners( evt ).length === 1 ) {
-        // Setup global functions on Popcorn.vimeo to sync player events to an internal collection
-        // Some events expect 2 args, some only one (the player id)
-        if ( playerEvt === "onSeek" || playerEvt === "onProgress" || playerEvt === "onLoading" ) {
-          Popcorn.vimeo[playerEvt] = function( arg1, arg2 ) {
-            var player = registry[arg2];
+      };
 
-            player.evtHolder.dispatchEvent( evt, arg1 );
-          };
-        } else {
-          Popcorn.vimeo[playerEvt] = function( arg1 ) {
-            var player = registry[arg1];
-            player.evtHolder.dispatchEvent( evt );
-          };
-        }
+      if ( !window.swfobject ) {
 
-        this.swfObj.api_addEventListener( playerEvt, "Popcorn.vimeo."+playerEvt );
-      }
-    },
-    removeEventListener: function( evtName, fn ) {
-      return this.evtHolder.removeEventListener( evtName, fn );
-    },
-    dispatchEvent: function( evtName ) {
-      return this.evtHolder.dispatchEvent( evtName );
-    },
-    getBoundingClientRect: function() {
-      return this._target.getBoundingClientRect();
-    },
-    startTimeUpdater: function() {
-      var self = this,
-          seeked = 0;
-
-      if ( abs( this.currentTime - this.previousCurrentTime ) > timeCheckInterval ) {
-        // Has programatically set the currentTime
-        this.setCurrentTime( this.currentTime );
-        seeked = 1;
+        Popcorn.getScript( "http://ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js", vimeoInit );
       } else {
-        this.previousCurrentTime = this.currentTime;
-      }
-
-      if ( this.volume !== this.previousVolume ) {
-        this.setVolume( this.volume );
-      }
-
-      if ( !self.paused || seeked ) {
-        this.dispatchEvent( 'timeupdate' );
-      }
-
-      if( !self.ended ) {
-        setTimeout( function() {
-          self.startTimeUpdater.call(self);
-        }, timeupdateInterval);
+        vimeoInit();
       }
     }
   });
-})( Popcorn, window );
+})();
\ No newline at end of file
diff --git a/players/vimeo/popcorn.vimeo.unit.html b/players/vimeo/popcorn.vimeo.unit.html
index 91c9d37f1..8936e85a7 100644
--- a/players/vimeo/popcorn.vimeo.unit.html
+++ b/players/vimeo/popcorn.vimeo.unit.html
@@ -1,28 +1,29 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Popcorn API</title>
+  <title>Vimeo Player Unit Test Suite</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.vimeo.unit.js"></script>
   <script src="popcorn.vimeo.js"></script>
-  
+
 </head>
 <body>
-  <h1 id="qunit-header">Popcorn Vimeo Player Plugin</h1>
+  <h1 id="qunit-header">Popcorn Vimeo Player Unit Tests</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>
-  
-  <div id="player_1"></div>
+
+  <div id="player_1" style="width: 400px; height: 400px;"></div>
+  <div id="player_2" style="width: 400px; height: 400px;"></div>
 </body>
 </html>
diff --git a/players/vimeo/popcorn.vimeo.unit.js b/players/vimeo/popcorn.vimeo.unit.js
index 42e4262a0..194012337 100644
--- a/players/vimeo/popcorn.vimeo.unit.js
+++ b/players/vimeo/popcorn.vimeo.unit.js
@@ -1,159 +1,366 @@
-test("Popcorn Vimeo Plugin", function () {
-  function makeHandler( evtName ) {
-    return( function() {
-      var count = 0;
-      return function() {
-        count++;
-        
-        if ( count === 1 ) {
-          ok( true, "Event '"+evtName+"' is supported" );
+test("Update Timer", function () {
+
+  QUnit.reset();
+
+  var p2 = Popcorn.vimeo( "#player_1", "http://player.vimeo.com/video/6960892" ),
+      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" );
+      p2.pause();
+      start();
+    }
+  }
+
+  // These tests come close to 10 seconds on chrome, increasing to 15
+  stop();
+
+  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;
+          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( 0 ).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.exec( 3, function() {
+
+    p2.play();
+  });
+
+  p2.currentTime(3);
+
+});
+
+test("Plugin Factory", function () {
+
+  QUnit.reset();
+
+  var popped = Popcorn.vimeo( "#player_1", "http://player.vimeo.com/video/6960892" ),
+      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 ) {
+    if ( ++count == expects ) {
+      Popcorn.removePlugin("executor");
+      Popcorn.removePlugin("complicator");
+      popped.pause();
       start();
     }
   }
-  
-  var popped = Popcorn( Popcorn.vimeo( "player_1", "http://vimeo.com/11127501" ) ),
-      expects = 22,
-      playCount = 0,
-      pauseCount = 0,
-      count = 0,
-      events = {
-        "durationchange": makeHandler( "durationchange" ),
-        "play": makeHandler( "play" ),
-        "loadstart": function() {
-          (makeHandler( "loadstart" ))();
-          this.play();
-        },
-        "readystatechange": makeHandler( "readystatechange" ),
-        "volumechange": (function() {
-          var timesCalled = 0;
-          
-          return function() {
-            timesCalled++;
-            
-            if (timesCalled === 1) {
-              ok( true, "Volume changed event works" );
-              plus();
-              
-              equals( popped.volume(), 0, "Volume correctly set" );
-              plus();
-              
-              ok( popped.video.muted(), "Muted set when player volume 0" );
-              plus();
-              
-              popped.volume( 0.333 );
-            } else if ( timesCalled === 2 ) {
-              ok( !popped.video.muted(), "Unmuted when volume not 0" );
-              plus();
-              
-              popped.mute();
-            } else if ( timesCalled === 3 ) {
-              ok( popped.video.muted(), "Mute mutes when volume is non-zero" );
-              plus();
-              
-              popped.mute();
-            } else if ( timesCalled === 4 ) {
-              equals( popped.volume(), 0.333, "Mute unmutes to last volume" );
-              plus();
-              
-              popped.exec( 4, function() {
-                popped.video.unload();
-              });
-            }
-          };
-        })(),
-        "emptied": makeHandler( "emptied" ),
-        "ended": 0,
-        "pause": (function() {
-          var timesCalled = 0;
-          
-          return function() {
-            timesCalled++;
-            
-            if ( timesCalled === 1 ) {
-              ok( true, "Pause event works" );
-              plus();
-              ok( popped.video.paused, "Pause attribute set" );
-              plus();
-              popped.play();
-            }
-          };
-        })(),
-        "playing": (function() {
-          var timesCalled = 0;
-          
-          return function() {
-            timesCalled++;
-            
-            if ( timesCalled === 1 ) {
-              ok( true, "Play event works" );
-              plus();
-              
-              ok( true, "Video autoplay attribute works" );
-              plus();
-              
-              ok( !popped.video.paused, "Player paused attribute not set" );
-              plus();
-              
-              popped.exec( 5, function() {
-                popped.currentTime( 0 );
-                popped.pause();
-              });
-            } else if ( timesCalled === 2 ) {
-              ok( true, "Popcorn play function works" );
-              plus();
-              popped.volume( 0 );
-            }
-          };
-        })(),
-        "progress": makeHandler( "progress" ),
-        "seeked": makeHandler( "seeked" ),
-        "timeupdate": makeHandler( "timeupdate" )
-      };
-  
+
   expect( expects );
-  
-  stop( 20000 );
-  
-  ok( "vimeo" in Popcorn, "Vimeo is a method of Popcorn" );
+  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( "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 () {
+
+      }
+    };
+
+  });
+
+  ok( "executor" in popped, "executor plugin is now available to instance" );
   plus();
-  
-  equals( popped.video.initialTime, 0, "Player initial time is 0" );
+  equals( Popcorn.registry.length, 1, "One item in the registry");
   plus();
-  
-  Popcorn.plugin( "timingTest", {
-    start: function ( event, options ) {
-      ok( true, "Popcorn plugin started" );
+
+  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();
-    },
-    end: function ( event, options ) {
-      ok( true, "Popcorn plugin stopped" );
+      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 () {
     }
   });
-  
-  popped.timingTest({
-    start: 3, // seconds
-    end: 4, // seconds
+
+  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.listen( "load", function() {
-    ok ( this.video.swfObj.id === popped.video.swfObj.id, "Correctly kept track of 'this'" );
+
+  popped.currentTime(0).play();
+
+});
+
+test( "Popcorn vimeo Plugin Url and Duration Tests", function() {
+  function plus(){
+    if ( ++count == expects ) {
+      popcorn.pause();
+      start();
+    }
+  }
+
+  QUnit.reset();
+
+  var count = 0,
+      expects = 3,
+      popcorn = Popcorn.vimeo( "#player_1", "http://player.vimeo.com/video/6960892" );
+
+  expect( expects );
+  stop( 10000 );
+
+  equals( popcorn.media.id, "player_1", "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.forEach( events, function( fn, evtName ) {
-      fn && popped.listen( evtName, fn );
+
+    popcorn.pause();
+  });
+
+  popcorn.play();
+});
+
+test( "Popcorn vimeo Plugin Url Regex Test", function() {
+
+  QUnit.reset();
+
+  var urlTests = [
+    { name: 'standard',
+      url: 'http://player.vimeo.com/video/6960892',
+      expected: 'http://player.vimeo.com/video/6960892',
+    },
+    { name: 'short url',
+      url: 'http://vimeo.com/6960892',
+      expected: 'http://vimeo.com/6960892',
+    }
+  ];
+
+  var count = 0,
+      expects = urlTests.length;
+
+  expect( expects );
+  stop( 10000 );
+
+  Popcorn.forEach( urlTests, function( values, key ) {
+
+    var urlTest = urlTests[ key ],
+        popcorn = Popcorn.vimeo( '#player_2', urlTest.url );
+
+    popcorn.listen( "loadeddata", function() {
+
+      equals( popcorn.media.src, urlTest.expected, 'Video id is correct for ' + urlTest.name + ': ' + urlTest.url );
+      popcorn.pause();
+
+      count++;
+      if ( count === expects ) {
+
+        start();
+        popcorn.pause();
+      }
     });
-    
-    // Queue load
-    // Load event will play when beginning to load
-    popped.load();
   });
 });

From 27a2fbdb41c93ff242bafbbcfb8c52f97affcb3f Mon Sep 17 00:00:00 2001
From: stevenaw <sweerdenburg@gmail.com>
Date: Sat, 1 Oct 2011 10:57:44 -0400
Subject: [PATCH 02/78] [#402] Refactored, updated to spec changes since last
 version

---
 parsers/parserVTT/data/data.vtt             |  52 ++++--
 parsers/parserVTT/data/unit.vtt             |  23 +--
 parsers/parserVTT/popcorn.parserVTT.js      | 184 +++++++++++---------
 parsers/parserVTT/popcorn.parserVTT.unit.js |  20 +--
 4 files changed, 158 insertions(+), 121 deletions(-)

diff --git a/parsers/parserVTT/data/data.vtt b/parsers/parserVTT/data/data.vtt
index f2e62a0f1..d36aef71f 100644
--- a/parsers/parserVTT/data/data.vtt
+++ b/parsers/parserVTT/data/data.vtt
@@ -1,12 +1,40 @@
-1
-00:00:02.400 --> 00:00:07.200
-Senator, we're making
-our final approach into Coruscant.
-
-2
-00:00:09.712 --> 00:00:13.399
-Very good, Lieutenant.
-
-Track-3
-00:00:15.542 --> 00:00:18.542 A:start D:vertical L:98%
-It's a <i>trap!</i>
\ No newline at end of file
+WEBVTT
+
+00:11.000 --> 00:13.000
+<v Roger Bingham>We are in New York City
+
+00:13.000 --> 00:16.000
+<v Roger Bingham>We're actually at the Lucern Hotel, just down the street
+
+00:16.000 --> 00:18.000
+<v Roger Bingham>from the American Museum of Natural History
+
+00:18.000 --> 00:20.000
+<v Roger Bingham>And with me is Neil DeGrasse Tyson
+
+00:20.000 --> 00:22.000
+<v Roger Bingham>Astrophysicist, Director of the Hayden Planetarium
+
+00:22.000 --> 00:24.000
+<v Roger Bingham>at the AMNH.
+
+00:24.000 --> 00:26.000
+<v Roger Bingham>Thank you for walking down here.
+
+00:27.000 --> 00:30.000
+<v Roger Bingham>And I want to do a follow-up on the last conversation we did.
+
+00:30.000 --> 00:31.500 A:end S:50%
+<v Roger Bingham>When we e-mailed—
+
+00:30.500 --> 00:32.500 A:start S:50%
+<v Neil DeGrass Tyson>Didn't we talk about enough in that conversation?
+
+00:32.000 --> 00:35.500 A:end S:50%
+<v Roger Bingham>No! No no no no; 'cos 'cos obviously 'cos
+
+00:32.500 --> 00:33.500 A:start S:50%
+<v Neil DeGrass Tyson><i>Laughs</i>
+
+00:35.500 --> 00:38.000
+<v Roger Bingham>You know I'm so excited my glasses are falling off here.
\ No newline at end of file
diff --git a/parsers/parserVTT/data/unit.vtt b/parsers/parserVTT/data/unit.vtt
index b7ead465e..a252a8854 100644
--- a/parsers/parserVTT/data/unit.vtt
+++ b/parsers/parserVTT/data/unit.vtt
@@ -1,43 +1,32 @@
-1
+WEBVTT
+
 00:00:02.400 --> 00:00:07.200
-Senator, we're making
-our final approach into Coruscant.
+A typical multiline
+subtitle.
 
-2
 00:09.712-->00:13.399
-Very good, Lieutenant.
+No whitespace between time tokens
 
 
 
-3
 00:00:13.400 --> 00:00:20
 A bad cue, no milliseconds. Should be ignored
 
--->
-00:00:14.456--> 00:00:20.000
-A bad cue, bad id. Should be ignored
-
-4
 00:00:9.456--> 00:00:20.000
 A bad cue, seconds are single digit. Should be ignored
 
-5
 00:1:00.456--> 00:00:20.000
 A bad cue, minutes are single digit. Should be ignored
 
-6
 1:00:00.456--> 00:00:20.000
 A bad cue, hours are supplied as single digit. Should be ignored
 
-7
 00:00:00.46--> 00:00:20.000
 A bad cue, ms are not 3 digits. Should be ignored
 
-Track-3
 00:00:15.042 --> 00:00:18.042 A:start D:vertical L:98%
-It's a trap!
+It's a trap! Ignore the timeline styling for now!
 
 
-ID9
 00:00:20.000--> 00:00:21.670
 This text is <b>boldy <i>italicized</i></b>
\ No newline at end of file
diff --git a/parsers/parserVTT/popcorn.parserVTT.js b/parsers/parserVTT/popcorn.parserVTT.js
index 1bcdbc73c..e7acf2567 100644
--- a/parsers/parserVTT/popcorn.parserVTT.js
+++ b/parsers/parserVTT/popcorn.parserVTT.js
@@ -2,123 +2,143 @@
 
 (function ( Popcorn ) {
   /**
-   * WebSRT/VTT popcorn parser plug-in 
-   * Parses subtitle files in the WebSRT/VTT format.
-   * Styles which appear after timing information are ignored.
-   * Inline styling tags follow HTML conventions and are left in for the browser to handle
-   * TrackEvents (cues) which are malformed are ignored.
-   * Data parameter is given by Popcorn, will need a text.
+   * WebVTT popcorn parser plug-in 
+   * Parses subtitle files in the WebVTT format.
+   * Specification here: http://www.whatwg.org/specs/web-apps/current-work/webvtt.html
+   * Styles which appear after timing information are presently ignored.
+   * Inline styling tags follow HTML conventions and are left in for the browser to handle (or ignore if VTT-specific)
+   * Data parameter is given by Popcorn, text property holds file contents.
    * Text is the file contents to be parsed
    * 
    * @param {Object} data
    * 
    * Example:
-    Track-3
-    00:00:15.542 --> 00:00:18.542 A:start D:vertical L:98%
-    It's a <i>trap!</i>
-   */
-  Popcorn.parser( "parseVTT", function( data ) {
+    00:32.500 --> 00:00:33.500 A:start S:50% D:vertical L:98%
+    <v Neil DeGrass Tyson><i>Laughs</i>
+   */  
+  Popcorn.parser( 'parseVTT', function( data ) {
   
     // declare needed variables
     var retObj = {
-          title: "",
-          remote: "",
+          title: '',
+          remote: '',
           data: []
         },
         subs = [],        
         i = 0,
         len = 0,
-        idx = 0,
         lines,
-        time,
         text,
-        sub;
+        sub,
+        rNewLine = /(?:\r\n|\r|\n)/gm;
     
-    // [HH:]MM:SS.mmm string to SS.mmm float
-    // Throws exception if invalid
-    var toSeconds = function( t_in ) {
-      var t = t_in.split( ":" ),
-          l = t_in.length,
-          time;
-      
-      // Invalid time string provided
-      if ( l !== 12 && l !== 9 ) {
-        throw "Bad cue";
-      }
-      
-      l = t.length - 1;
-      
-      try {        
-        time = parseInt( t[l-1], 10 )*60 + parseFloat( t[l], 10 );
-        
-        // Hours were given
-        if ( l === 2 ) {
-          time += parseInt( t[0], 10 )*3600;
-        }
-      } catch ( e ) {
-        throw "Bad cue";
-      }
-      
-      return time;
-    };
-    
-    var createTrack = function( name, attributes ) {
-      var track = {};
-      track[name] = attributes;
-      return track;
-    };
-  
     // Here is where the magic happens
     // Split on line breaks
-    lines = data.text.split( /(?:\r\n|\r|\n)/gm );
+    lines = data.text.split( rNewLine );
     len = lines.length;
     
+    // Check for BOF token
+    if ( len === 0 || lines[0] !== 'WEBVTT' ) {
+      return retObj;
+    }
+    
+    i++;
+    
     while ( i < len ) {
-      sub = {};
       text = [];
       
       try {
-        sub.id = lines[i++];
-        // Ignore if id contains "-->"
-        if ( !sub.id || sub.id.indexOf( "-->" ) !== -1 ) {
-          throw "Bad cue";
-        }
-        
-        time = lines[i++].split( /[\t ]*-->[\t ]*/ );
-        
-        sub.start = toSeconds(time[0]);
-        
-        // Filter out any trailing styling info
-        idx = time[1].indexOf( " " );
-        if ( idx !== -1 ) {
-          time[1] = time[1].substr( 0, idx );
-        }
-        
-        sub.end = toSeconds( time[1] );
+        i = skipWhitespace( lines, len, i );
+        sub = parseCueHeader( lines[i++] );
         
         // Build single line of text from multi-line subtitle in file
         while ( i < len && lines[i] ) {
           text.push( lines[i++] );
         }
         
-        // Join lines together to one and build subtitle
-        sub.text = text.join( "<br />" );
-        subs.push( createTrack( "subtitle", sub ) );
+        // Join lines together to one and build subtitle text
+        sub.text = text.join( '<br />' );        
+        subs.push( createTrack( 'subtitle', sub ) );
       } catch ( e ) {
-         // Bad cue, advance to end of cue
-        while ( i < len && lines[i] ) {
-          i++;
-        }
-      }
-      
-      // Consume empty whitespace after a cue
-      while ( i < len && !lines[i] ) {
-        i++;
+        i = skipNonWhitespace( lines, len, i );
       }
     }
     
     retObj.data = subs;
     return retObj;
   });
-
+    
+  // [HH:]MM:SS.mmm string to SS.mmm float
+  // Throws exception if invalid
+  function toSeconds ( t_in ) {
+    var t = t_in.split( ':' ),
+        l = t_in.length,
+        time;
+    
+    // Invalid time string provided
+    if ( l !== 12 && l !== 9 ) {
+      throw 'Bad cue';
+    }
+    
+    l = t.length - 1;
+    
+    try {        
+      time = parseInt( t[l-1], 10 ) * 60 + parseFloat( t[l], 10 );
+      
+      // Hours were given
+      if ( l === 2 ) {
+        time += parseInt( t[0], 10 ) * 3600;
+      }
+    } catch ( e ) {
+      throw 'Bad cue';
+    }
+    
+    return time;
+  };
+  
+  function createTrack( name, attributes ) {
+    var track = {};
+    track[name] = attributes;
+    return track;
+  }
+  
+  function parseCueHeader ( line ) {
+    var lineSegments,
+        args,
+        sub = {},
+        rToken = /-->/,
+        rWhitespace = /[\t ]+/;
+      
+    if ( !line || line.indexOf( '-->' ) === -1 ) {
+      throw 'Bad cue';
+    }
+  
+    lineSegments = line.replace( rToken, ' --> ' ).split( rWhitespace );
+    
+    if ( lineSegments.length < 2 ) {
+      throw 'Bad cue';
+    }
+    
+    sub.id = line;
+    sub.start = toSeconds( lineSegments[0] );
+    sub.end = toSeconds( lineSegments[2] );
+    
+    return sub;
+  }
+  
+  function skipWhitespace ( lines, len, i ) {
+    while ( i < len && !lines[i] ) {
+      i++;
+    }
+    
+    return i;
+  }
+  
+  function skipNonWhitespace ( lines, len, i ) {
+    while ( i < len && lines[i] ) {
+      i++;
+    }
+    
+    return i;
+  }
 })( Popcorn );
diff --git a/parsers/parserVTT/popcorn.parserVTT.unit.js b/parsers/parserVTT/popcorn.parserVTT.unit.js
index c8ea8f4f6..f9be8e602 100644
--- a/parsers/parserVTT/popcorn.parserVTT.unit.js
+++ b/parsers/parserVTT/popcorn.parserVTT.unit.js
@@ -6,25 +6,25 @@ test( "Popcorn 0.3 WebSRT/VTT Parser Plugin", function () {
       poppercorn = Popcorn( "#video" ),
       expectedSubs = [
         {
-          id: "1",
-          text: "Senator, we're making<br />our final approach into Coruscant.",
+          id: "00:00:02.400 --> 00:00:07.200",
+          text: "A typical multiline<br />subtitle.",
           start: 2.4,
           end: 7.2
         },
         {
-          id: "2",
-          text: "Very good, Lieutenant.",
+          id: "00:09.712-->00:13.399",
+          text: "No whitespace between time tokens",
           start: 9.712,
           end: 13.399
         },
         {
-          id: "Track-3",
-          text: "It's a trap!",
+          id: "00:00:15.042 --> 00:00:18.042 A:start D:vertical L:98%",
+          text: "It's a trap! Ignore the timeline styling for now!",
           start: 15.042,
           end: 18.042
         },
         {
-          id: "ID9",
+          id: "00:00:20.000--> 00:00:21.670",
           text: "This text is <b>boldy <i>italicized</i></b>",
           start: 20.000,
           end: 21.670
@@ -50,11 +50,11 @@ test( "Popcorn 0.3 WebSRT/VTT Parser Plugin", function () {
         
         strictEqual( evt.id, sub.id, "Correctly parsed id" );
         plus();
-        strictEqual( evt.text, sub.text, "Correctly parsed text of " + evt.id );
+        strictEqual( evt.text, sub.text, "Correctly parsed text of '" + evt.id + "'" );
         plus();
-        strictEqual( evt.start, sub.start, "Correctly parsed start at " + evt.id );
+        strictEqual( evt.start, sub.start, "Correctly parsed start at '" + evt.id + "'" );
         plus();
-        strictEqual( evt.end, sub.end, "Correctly parsed end at " + evt.id );
+        strictEqual( evt.end, sub.end, "Correctly parsed end at '" + evt.id + "'" );
         plus();
       }
     });

From 18e818f640a4df29e65db0a67539ed7898e30c91 Mon Sep 17 00:00:00 2001
From: stevenaw <sweerdenburg@gmail.com>
Date: Sat, 1 Oct 2011 13:41:18 -0400
Subject: [PATCH 03/78] [#751] Refactored

---
 parsers/parserSSA/popcorn.parserSSA.js | 160 +++++++++++++------------
 1 file changed, 85 insertions(+), 75 deletions(-)

diff --git a/parsers/parserSSA/popcorn.parserSSA.js b/parsers/parserSSA/popcorn.parserSSA.js
index 51574c192..993752b9b 100644
--- a/parsers/parserSSA/popcorn.parserSSA.js
+++ b/parsers/parserSSA/popcorn.parserSSA.js
@@ -26,53 +26,25 @@
       Dialogue: 0,0:00:15.04,0:00:18.04,Default,,0000,0000,0000,,It's \Na \ntrap!
    *
    */
-  
+   
   // Register for SSA extensions
   Popcorn.parser( "parseSSA", function( data ) {
-  
     // declare needed variables
     var retObj = {
           title: "",
           remote: "",
           data: []
         },
+        rNewLineFile = /(?:\r\n|\r|\n)/gm,
         subs = [],
-        startIdx,
-        endIdx,
-        textIdx,
         lines,
-        fields,
-        numFields,
-        sub,
-        text,
+        headers,
         i = 0,
-        j = 0,
-        len = 0,
-        fieldLen = 0;
-    
-    // h:mm:ss.cc (centisec) string to SS.mmm
-    // Returns -1 if invalid
-    var toSeconds = function( t_in ) {
-      var t = t_in.split( ":" ),
-          l = t.length - 1;
-      
-      // Not all there
-      if ( t_in.length !== 10 ) {
-        return -1;
-      }
-      
-      return parseInt( t[0], 10 )*3600 + parseInt( t[l-1], 10 )*60 + parseFloat( t[l], 10 );
-    };
-    
-    var createTrack = function( name, attributes ) {
-      var track = {};
-      track[name] = attributes;
-      return track;
-    };
+        len;
   
     // Here is where the magic happens
     // Split on line breaks
-    lines = data.text.split( /(?:\r\n|\r|\n)/gm );
+    lines = data.text.split( rNewLineFile );
     len = lines.length;
     
     // Ignore non-textual info
@@ -80,53 +52,91 @@
       i++;
     }
     
-    fields = lines[++i].substr( 8 ).split( ", " ); // Trim 'Format: ' off front, split on delim
-    numFields = fields.length;
-    
-    //Find where in Dialogue string the start, end and text info is
-    for ( ; j < numFields; j++ ) {
-      if ( fields[j] === "Start" ) {
-        startIdx = j;
-      } else if ( fields[j] === "End" ) {
-        endIdx = j;
-      } else if ( fields[j] === "Text" ) {
-        textIdx = j;
-      }
-    }
+    headers = parseFieldHeaders( lines[++i] );
     
     while ( ++i < len && lines[i] && lines[i][0] !== "[" ) {
-      sub = {};
-      
-      // Trim beginning 'Dialogue: ' and split on delim
-      fields = lines[i].substr( 10 ).split( "," );
-      
-      sub.start = toSeconds( fields[startIdx] );
-      sub.end = toSeconds( fields[endIdx] );
-      
-      // Invalid time, skip
-      if ( sub.start === -1 || sub.end === -1 ) {
-        continue;
-      }
-      
-      if ( ( fieldLen = fields.length ) === numFields ) {
-        sub.text = fields[textIdx];
-      } else {
-        // There were commas in the text which were split, append back together into one line
-        text = [];
-        
-        for( j = textIdx; j < fieldLen; j++ ) {
-          text.push( fields[j] );
-        }
-        sub.text = text.join( "," );
-      }
-      
-      // Eliminate advanced styles and convert forced line breaks
-      sub.text = sub.text.replace( /\{(\\[\w]+\(?([\w\d]+,?)+\)?)+\}/gi, "" ).replace( /\\N/gi, "<br />" );
-      subs.push( createTrack( "subtitle", sub ) );
+      try {
+        subs.push( createTrack( "subtitle", parseSub( lines[i], headers ) ) );
+      } catch ( e ) {}
     }
     
     retObj.data = subs;
     return retObj;
   });
-
+  
+  function parseSub( line, headers ) {
+    // Trim beginning 'Dialogue: ' and split on delim
+    var fields = line.substr( 10 ).split( "," ),
+        rAdvancedStyles = /\{(\\[\w]+\(?([\w\d]+,?)+\)?)+\}/gi,
+        rNewLineSSA = /\\N/gi,
+        sub;
+        
+    sub = {
+      start: toSeconds( fields[headers.start] ),
+      end: toSeconds( fields[headers.end] )
+    };
+    
+    // Invalid time, skip
+    if ( sub.start === -1 || sub.end === -1 ) {
+      throw "Invalid time";
+    }
+    
+    // Eliminate advanced styles and convert forced line breaks
+    sub.text = getTextFromFields( fields, headers.text ).replace( rAdvancedStyles, "" ).replace( rNewLineSSA, "<br />" );
+    
+    return sub;
+  }
+  
+  // h:mm:ss.cc (centisec) string to SS.mmm
+  // Returns -1 if invalid
+  function toSeconds( t_in ) {
+    var t = t_in.split( ":" );
+    
+    // Not all there
+    if ( t_in.length !== 10 || t.length < 3 ) {
+      return -1;
+    }
+    
+    return parseInt( t[0], 10 )*3600 + parseInt( t[1], 10 )*60 + parseFloat( t[2], 10 );
+  }
+  
+  function getTextFromFields( fields, startIdx ) {
+    var fieldLen = fields.length,
+        text = [],
+        i = startIdx;
+    
+    // There may be commas in the text which were split, append back together into one line      
+    for( ; i < fieldLen; i++ ) {
+      text.push( fields[i] );
+    }
+    
+    return text.join( "," );
+  }
+  
+  function createTrack( name, attributes ) {
+    var track = {};
+    track[name] = attributes;
+    return track;
+  }
+  
+  function parseFieldHeaders( line ) {
+    // Trim 'Format: ' off front, split on delim
+    var fields = line.substr( 8 ).split( ", " ),
+        result = {},
+        len,
+        i;
+     
+     //Find where in Dialogue string the start, end and text info is
+    for ( i = 0, len = fields.length; i < len; i++ ) {
+      if ( fields[i] === "Start" ) {
+        result.start = i;
+      } else if ( fields[i] === "End" ) {
+        result.end = i;
+      } else if ( fields[i] === "Text" ) {
+        result.text = i;
+      }
+    }
+    
+    return result;
+  }
 })( Popcorn );

From 4c30f02987a33d14c52d99afb948d3b71e5d53e0 Mon Sep 17 00:00:00 2001
From: Matthew Schranz <schranz.m@gmail.com>
Date: Tue, 4 Oct 2011 13:14:52 -0400
Subject: [PATCH 04/78] [#740] Initial workings of Comment Plugin. Still need
 to see if it's current functionality is indended.

---
 plugins/facebook/popcorn.facebook.html | 10 ++++++++++
 plugins/facebook/popcorn.facebook.js   | 12 +++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/plugins/facebook/popcorn.facebook.html b/plugins/facebook/popcorn.facebook.html
index 4da792618..66c5900da 100755
--- a/plugins/facebook/popcorn.facebook.html
+++ b/plugins/facebook/popcorn.facebook.html
@@ -10,6 +10,7 @@
       var p = Popcorn( "#video" )
       .volume( 0 )
       .play()
+      /*
       .facebook({
         type: "live-stream",
         target: "activitydiv",
@@ -55,6 +56,13 @@
         width: 300,
         start: 10,
         end: 50
+      })*/
+      .facebook({
+        href: "facebook.com",
+        type: "COMMENTS",
+        target: "commentdiv",
+        start: 5,
+        end: 60
       });
     }, false);
 
@@ -85,6 +93,8 @@ <h1 id="qunit-header">Popcorn Facebook Plug-in Demo</h1>
     </video>
   </div>
   <div>
+    <div id="commentdiv"></div>
+    <br />
     <div id="likediv"></div>
     <br />
     <div id="likeboxdiv"></div>
diff --git a/plugins/facebook/popcorn.facebook.js b/plugins/facebook/popcorn.facebook.js
index 2ec920b54..976092011 100755
--- a/plugins/facebook/popcorn.facebook.js
+++ b/plugins/facebook/popcorn.facebook.js
@@ -59,7 +59,7 @@
       options: {
         type: {
           elem: "select",
-          options: [ "LIKE", "LIKE-BOX", "ACTIVITY", "FACEPILE", "LIVE-STREAM", "SEND" ],
+          options: [ "LIKE", "LIKE-BOX", "ACTIVITY", "FACEPILE", "LIVE-STREAM", "SEND", "COMMENTS" ],
           label: "Type"
         },
         target: "facebook-container",
@@ -158,6 +158,11 @@
           elem: "input",
           options: [ "false", "true" ],
           label: "Always_post_to_friends"
+        },
+        num_posts: {
+          elem: "input",
+          type: "number",
+          label: "Number of Comments"
         }
       }
     },
@@ -194,7 +199,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", "comments" ].indexOf( type ) > -1 );
       };
 
       // Checks if type is valid
@@ -218,7 +223,8 @@
       // 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"
+        " maxrows border_color recommendations font always_post_to_friends xid" +
+        " num_posts"
       ).split(" ");
 
       Popcorn.forEach( fbAttrs, function( attr ) {

From c9ebedd2378c23584085cedf6d1f4aeb72a9427a Mon Sep 17 00:00:00 2001
From: Matthew Schranz <schranz.m@gmail.com>
Date: Tue, 4 Oct 2011 20:50:06 -0400
Subject: [PATCH 05/78] [#734]Setup demo to show how comment is currently
 functioning

---
 plugins/facebook/popcorn.facebook.html | 18 ++++++++++--------
 plugins/facebook/popcorn.facebook.js   |  6 +++---
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/plugins/facebook/popcorn.facebook.html b/plugins/facebook/popcorn.facebook.html
index 66c5900da..656390d59 100755
--- a/plugins/facebook/popcorn.facebook.html
+++ b/plugins/facebook/popcorn.facebook.html
@@ -24,12 +24,12 @@
         target: "likediv",
         layout: "box_count",
         start: 5,
-        end: 50
+        end: 15
       })
       .facebook({
         type: "send",
         target: "likediv",
-        start: 1,
+        start: 10,
         end: 15
       })
       .facebook({
@@ -39,7 +39,7 @@
         header: "false",
         target: "likeboxdiv",
         start: 6,
-        end: 50
+        end: 15
       })
       .facebook({
         site: "http://popcornjs.org/",
@@ -47,7 +47,7 @@
         target: "activitydiv",
         header: true,
         start: 11,
-        end: 50
+        end: 15
       })
       .facebook({
         href: "https://www.facebook.com/boardwalkempire",
@@ -55,14 +55,16 @@
         target: "facepilediv",
         width: 300,
         start: 10,
-        end: 50
-      })*/
+        end: 15
+      })
+      */
       .facebook({
-        href: "facebook.com",
+        href: "popcornjs.org",
         type: "COMMENTS",
         target: "commentdiv",
         start: 5,
-        end: 60
+        end: 50,
+        width: 400
       });
     }, false);
 
diff --git a/plugins/facebook/popcorn.facebook.js b/plugins/facebook/popcorn.facebook.js
index 976092011..43d09bf6f 100755
--- a/plugins/facebook/popcorn.facebook.js
+++ b/plugins/facebook/popcorn.facebook.js
@@ -161,14 +161,14 @@
         },
         num_posts: {
           elem: "input",
-          type: "number",
-          label: "Number of Comments"
+          type: "text",
+          label: "Number_of_Comments"
         }
       }
     },
 
     _setup: function( options ) {
-
+      
       var target = document.getElementById( options.target ),
           _type = options.type;
 

From 08e08ddc045e1eaff933d1feb44915eca2b7ce0c Mon Sep 17 00:00:00 2001
From: Matthew Schranz <schranz.m@gmail.com>
Date: Tue, 4 Oct 2011 21:03:23 -0400
Subject: [PATCH 06/78] [#734]Setup demo to show how comment is currently
 functioning

---
 plugins/facebook/popcorn.facebook.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/facebook/popcorn.facebook.js b/plugins/facebook/popcorn.facebook.js
index 43d09bf6f..5eb3e513e 100755
--- a/plugins/facebook/popcorn.facebook.js
+++ b/plugins/facebook/popcorn.facebook.js
@@ -233,7 +233,11 @@
           options._facebookdiv.setAttribute( attr, options[ attr ] );
         }
       });
-
+      
+      if ( _type === "comments" ) {
+        target.style.overflow = "auto";
+      }
+      
       if ( !target && Popcorn.plugin.debug ) {
         throw new Error( "Facebook target container doesn't exist" );
       }

From cedcd7646c25e5e9a040b1e1e62d19a9918a544f Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Thu, 6 Oct 2011 11:30:57 -0400
Subject: [PATCH 07/78] [#770] Removed the old baseplayer code from the players
 directory

---
 players/baseplayer/popcorn.baseplayer.html    |  90 ---------
 players/baseplayer/popcorn.baseplayer.js      | 142 --------------
 .../baseplayer/popcorn.baseplayer.unit.html   |  78 --------
 players/baseplayer/popcorn.baseplayer.unit.js | 180 ------------------
 4 files changed, 490 deletions(-)
 delete mode 100644 players/baseplayer/popcorn.baseplayer.html
 delete mode 100644 players/baseplayer/popcorn.baseplayer.js
 delete mode 100644 players/baseplayer/popcorn.baseplayer.unit.html
 delete mode 100644 players/baseplayer/popcorn.baseplayer.unit.js

diff --git a/players/baseplayer/popcorn.baseplayer.html b/players/baseplayer/popcorn.baseplayer.html
deleted file mode 100644
index 85358cbf9..000000000
--- a/players/baseplayer/popcorn.baseplayer.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>Popcorn Base Player Example</title>
-        <style>
-            body > div {
-                width: 100%;
-                float: left;
-                overflow: hidden;
-            }
-            div div {
-                margin-bottom:20px;
-            }
-            
-            #player_1 {
-              position: absolute;
-              left: 250px;
-              top: 20px;
-              width: 300px;
-              height: 150px;
-              background: #FFAAAA;
-            }
-        </style>
-        
-        
-        <script src="../../popcorn.js"></script>
-        <script type="text/javascript" src="popcorn.baseplayer.js"></script>
-        
-        <script type="text/javascript">            
-            //On document ready
-            document.addEventListener( "DOMContentLoaded", function() {
-              var ticks = 0,
-                  player = Popcorn.baseplayer(),
-                  dimensions,
-                  popcorn;
-                  
-              document.getElementById( "btnPlay" ).addEventListener( "click", function() { popcorn.play(); }, false );
-              document.getElementById( "btnPause" ).addEventListener( "click", function() { popcorn.pause(); }, false );
-              
-              player._resource = document.getElementById('player_1');
-              
-              player._resource.innerHTML += '<br />Width and Height: '+player.getStyle( 'width' ) + ' by ' + player.getStyle( 'height' )
-                                            + '<br /> Positioned at: '+player.getStyle( 'left' ) + ',' + player.getStyle( 'top' );
-              
-              dimensions = player.getBoundingClientRect();
-              document.getElementById( "playerTop" ).innerHTML = dimensions.top;
-              document.getElementById( "playerLeft" ).innerHTML = dimensions.left;
-              document.getElementById( "playerBottom" ).innerHTML = dimensions.bottom;
-              document.getElementById( "playerRight" ).innerHTML = dimensions.right;
-              document.getElementById( "playerWidth" ).innerHTML = dimensions.width;
-              document.getElementById( "playerHeight" ).innerHTML = dimensions.height;
-              
-              popcorn = Popcorn( player )
-                .listen( "timeupdate", function() {
-                  document.getElementById( "playerTicks" ).innerHTML = ++ticks;
-                  document.getElementById( "playerMs" ).innerHTML = popcorn.currentTime().toFixed(5);
-                })
-                .exec( 2, function() {
-                  document.getElementById( "playerOutput" ).innerHTML = "2 seconds reached";
-                });
-              
-              // The ready state and resource selection would be handled by the player extending this base player
-              player.readyState = 2;
-              popcorn.play();
-            }, false);
-        </script>
-    </head>
-    <body>
-          <div>
-            Ticks: <span id="playerTicks" ></span><br />
-            Seconds: <span id="playerMs" ></span><br />
-            Event Output: <span id="playerOutput" ></span><br />
-            <button class="simple" id="btnPlay">Play</button>
-            <button class="simple" id="btnPause">Pause</button><br r/>
-            Top: <span id="playerTop" ></span><br />
-            Left: <span id="playerLeft" ></span><br />
-            Bottom: <span id="playerBottom" ></span><br />
-            Right: <span id="playerRight" ></span><br />
-            Width: <span id="playerWidth" ></span><br />
-            Height: <span id="playerHeight" ></span><br />
-          </div>
-          
-          <span id="player_1">This is a container for the player, auto-sized for testing purposes. It displays CSS values.</span>
-          
-          <br />
-          <br />
-          This demo showcases basic functionality of a player. It is a shell of an HTMLMediaElement with basic timing routines.<br />
-          At 2 seconds, the phrase "2 seconds reached" will appear beside 'Event Output'<br />
-    </body>
-</html>
diff --git a/players/baseplayer/popcorn.baseplayer.js b/players/baseplayer/popcorn.baseplayer.js
deleted file mode 100644
index 5e3d1dce7..000000000
--- a/players/baseplayer/popcorn.baseplayer.js
+++ /dev/null
@@ -1,142 +0,0 @@
-(function( global, doc ) {
-  Popcorn.baseplayer = function() {
-    return new Popcorn.baseplayer.init();
-  };
-
-  Popcorn.baseplayer.init = function() {
-    this.readyState = 0;
-    this.currentTime = 0;
-    this.baselineTime = new Date();
-    this.duration = 0;
-    this.paused = 1;
-    this.ended = 0;
-    this.volume = 1;
-    this.muted = 0;
-    this.playbackRate = 1;
-
-    // These are considered to be "on" by being defined. Initialize to undefined
-    this.autoplay = null;
-    this.loop = null;
-
-    // List of events
-    this._events = {};
-
-    // The underlying player resource. May be <canvas>, <iframe>, <object>, array, etc
-    this._resource = null;
-    // The container div of the resource
-    this._container = null;
-
-    this.offsetWidth = this.width = 0;
-    this.offsetHeight = this.height = 0;
-    this.offsetLeft = 0;
-    this.offsetTop = 0;
-    this.offsetParent = null;
-  };
-
-  Popcorn.baseplayer.init.prototype = {
-    load: function() {},
-
-    play: function() {
-      this.paused = 0;
-      this.timeupdate();
-    },
-
-    pause: function() {
-      this.paused = 1;
-    },
-
-    timeupdate: function() {
-
-      // So we can refer to the instance when setTimeout is run
-      var self = this;
-
-      if( !this.paused ) {
-        this.currentTime += ( new Date() - this.baselineTime ) / 1000;
-        this.dispatchEvent( "timeupdate" );
-      }
-
-      this.baselineTime = new Date();
-
-      setTimeout(function() {
-        self.timeupdate.call( self );
-      }, 50 );
-    },
-
-    // By default, assumes this.resource is a DOM Element
-    // Changing the type of this.resource requires this method to be overridden
-    getBoundingClientRect: function() {
-			return Popcorn.position( this._resource || this._container );
-	  },
-
-    // Add an event listener to the object
-    addEventListener: function( evtName, fn ) {
-      if ( !this._events[ evtName ] ) {
-        this._events[ evtName ] = [];
-      }
-
-      this._events[ evtName ].push( fn );
-      return fn;
-    },
-
-    // Can take event object or simple string
-    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( this._events[ eventName ], function( val ) {
-        val.call( self, evt, self );
-      });
-    },
-
-    // Extracts values from container onto this object
-    extractContainerValues: function( id ) {
-      this._container = document.getElementById( id );
-
-      if ( !this._container ) {
-        return;
-      }
-
-      var bounds = this._container.getBoundingClientRect();
-
-      this.offsetWidth = this.width = this.getStyle( "width" ) || 0;
-      this.offsetHeight = this.height = this.getStyle( "height" ) || 0;
-      this.offsetLeft = bounds.left;
-      this.offsetTop = bounds.top;
-      this.offsetParent = this._container.offsetParent;
-
-      return this._container;
-    },
-
-    // By default, assumes this.resource is a DOM Element
-    // Changing the type of this.resource requires this method to be overridden
-    // Returns the computed value for CSS style 'prop' as computed by the browser
-    getStyle: function( prop ) {
-
-      var elem = this._resource || this._container;
-
-      if ( elem.currentStyle ) {
-        // IE syntax
-        return elem.currentStyle[ prop ];
-      } else if ( global.getComputedStyle ) {
-        // Firefox, Chrome et. al
-        return doc.defaultView.getComputedStyle( elem, null ).getPropertyValue( prop );
-      } else {
-        // Fallback, just in case
-        return elem.style[ prop ];
-      }
-    }
-  };
-})( window, document );
diff --git a/players/baseplayer/popcorn.baseplayer.unit.html b/players/baseplayer/popcorn.baseplayer.unit.html
deleted file mode 100644
index a369ac0ed..000000000
--- a/players/baseplayer/popcorn.baseplayer.unit.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Popcorn Base Player 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 
-    popcorn-api-draft.js
-  -->
-  
-  <script src="../../popcorn.js"></script>
-  
-  <script src="popcorn.baseplayer.unit.js"></script>
-  <script src="popcorn.baseplayer.js"></script>
-  
-  <style>
-    body > div {
-        width: 100%;
-        float: left;
-        overflow: hidden;
-    }
-    div div {
-        margin-bottom:20px;
-    }
-    
-    #player_1 {
-      position: absolute;
-      left: 220px;
-      top: 260px;
-      width: 300px;
-      height: 250px;
-      background: #FFAAAA;
-    }
-
-    #video {
-      position: absolute;
-      left:620px;
-      top: 260px;
-      width: 300px;
-      height: 175px;
-      background: #FFAAAA;
-    }
-  </style>
-</head>
-<body>
-  <h1 id="qunit-header">Popcorn Base Player Plugin</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>
-  
-  <span id="player_1">This is a container for the player, auto-sized for testing purposes.</span>
-  <div >
-    <video id='video'
-      controls
-      width= '250px'
-      poster="../../test/poster.png">
-
-      <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>
-  </div>
-</body>
-</html>
diff --git a/players/baseplayer/popcorn.baseplayer.unit.js b/players/baseplayer/popcorn.baseplayer.unit.js
deleted file mode 100644
index 9aebb5527..000000000
--- a/players/baseplayer/popcorn.baseplayer.unit.js
+++ /dev/null
@@ -1,180 +0,0 @@
-module( "Popcorn Base Player" );
-test( "API", function () {
-
-  var expects = 0,
-      count = 0,
-      player = Popcorn.baseplayer(),
-      members = {
-        // HTMLMediaElement members
-        'readyState' : 'number',
-        'currentTime' : 'number',
-        'duration' : 'number',
-        'paused' : 'number',
-        'ended' : 'number',
-        'volume' : 'number',
-        'muted' : 'number',
-        'playbackRate' : 'number',
-        'autoplay' : 'undefined',
-        'loop' : 'undefined',
-        'load' : 'function',
-        'play' : 'function',
-        'pause' : 'function',
-        'timeupdate' : 'function',
-        
-        // DOMElement members
-        'addEventListener' : 'function',
-        'dispatchEvent' : 'function',
-        'getBoundingClientRect' : 'function',
-        'width' : 'number',
-        'height' : 'number',
-        'offsetWidth' : 'number',
-        'offsetHeight' : 'number',
-        'offsetTop' : 'number',
-        'offsetLeft' : 'number',
-        'offsetParent' : 'undefined',
-        
-        // Helper functions and members
-        '_events' : 'object',
-        '_resource' : 'undefined',
-        '_container' : 'undefined',
-        'getStyle' : 'function',
-        'extractContainerValues' : 'function'
-      };
-      
-  function plus() {
-    if ( ++count === expects ) {
-      start();
-    }
-  }
-  
-  Popcorn.forEach( members, function () {
-    expects++;
-  });
-  
-  expect( expects );
-  stop( 10000 );
-  
-  Popcorn.forEach( members, function ( type, prop ) {
-    ok( typeof player[ prop ] === type, "player." + prop + " is type: " + type );
-    plus();
-  });
-});
-
-test( "Default Functionality", function () {
-  var expects = 7,
-      count = 0,
-      player = Popcorn.baseplayer(),
-      dimensions,
-      expectedVals = {
-        left: 220,
-        top: 260,
-        width: 300,
-        height: 250
-      };
-      
-  function plus() {
-    if ( ++count === expects ) {
-      start();
-    }
-  }
-  
-  player._resource = document.getElementById( 'player_1' );
-  dimensions = player.getBoundingClientRect();
-  
-  Popcorn.forEach( expectedVals, function() {
-    expects += 2;
-  });
-  
-  expect( expects );
-  stop( 1000 );
-  
-  Popcorn.forEach( expectedVals, function( val, prop ) {
-    equals( player.getStyle( prop ), val + 'px', "Style '" + prop + "' correctly got" );
-    plus();
-    
-    equals( dimensions[prop], val, "Bounding Client " + prop + " works" );
-    plus();
-  });
-  
-  equals( dimensions.right, expectedVals.left + expectedVals.width, "Bounding Client right works" );
-  plus();
-  equals( dimensions.bottom, expectedVals.top + expectedVals.height, "Bounding Client bottom works" );
-  plus();
-  
-  player.addEventListener( 'timeupdate', function( evt, caller ) {
-    ok( true, "Time update called" );
-    plus();
-    
-    equals( player, this, "'this' is kept as player" );
-    plus();
-    
-    equals( player, caller, "caller is kept as player" );
-    plus();
-    
-    ok( evt instanceof window.Event, "Event object passed in" );
-    plus();
-    
-    ok( evt.type === 'timeupdate', "Event object is type 'timeupdate'" );
-    plus();
-    
-    player.pause();
-  });
-  player.play();
-});
-
-
-test( "Extension and Method Overriding", function () {
-  var expects = 5,
-      count = 0,
-      player = Popcorn.baseplayer(),
-      playerForPopcorn = Popcorn.baseplayer(),
-      player2 = Popcorn("#video"),
-      popcorn;
-      
-  function plus() {
-    if ( ++count === expects ) {
-      start();
-    }
-  }
-  
-  expect( expects );
-  stop( 4000 );
-  
-  Popcorn.extend( player, {
-    load: function() {
-      ok( true, "Load overridden" );
-      plus();
-    },
-    timeupdate: function() {
-      ok( true, "Timeupdate overridden" );
-      plus();
-      
-      // Must dispatch event so event listeners can work!
-      this.dispatchEvent( "timeupdate" );
-      
-      // We don't want to cue custom timing loop using setTimeout because we only want this to run once
-    }
-  });
-  
-  player.addEventListener( "timeupdate", function() {
-    ok( true, "Timeupdate event dispatched!" );
-    plus();
-  });
-  
-  popcorn = Popcorn( playerForPopcorn )
-  .exec( 2, function() {
-    ok( Math.abs( player2.currentTime() - playerForPopcorn.currentTime ) < 0.2, "Time update is within a reasonable range" );
-    plus();
-    ok( true, "Exec triggereed from popcorn after 2 seconds" );
-    plus();
-  });
-  
-  player.load();
-  player2.play();
-  player.play();
-  
-  // Each player will define its own criteria for when readyState should be changed
-  // No logic in base player for this, so we must do it manually so popcorn will be able to cue track events
-  playerForPopcorn.readyState = 2;
-  popcorn.play();
-});

From 192759354fb84f3ce8886202081df23c8ece9e24 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Thu, 6 Oct 2011 13:30:32 -0400
Subject: [PATCH 08/78] [#712] Began fixing core unit tests styling

---
 test/index.html      |   12 +-
 test/popcorn.unit.js | 1228 ++++++++++++++++++++----------------------
 2 files changed, 594 insertions(+), 646 deletions(-)

diff --git a/test/index.html b/test/index.html
index d86a119e7..009c2f4cc 100644
--- a/test/index.html
+++ b/test/index.html
@@ -29,20 +29,20 @@ <h2 id="qunit-userAgent"></h2>
 
   </div>
 
-  <video id='video'
+  <video id="video"
     style="display:;width:300px"
     controls
     preload="auto">
 
-    <source id='mp4'
+    <source id="mp4"
       src="trailer.mp4"
       type='video/mp4; codecs="avc1, mp4a"'>
 
-    <source id='ogv'
+    <source id="ogv"
       src="trailer.ogv"
       type='video/ogg; codecs="theora, vorbis"'>
-      
-    <source id='webm'
+
+    <source id="webm"
       src="trailer.webm"
       type='video/webm; codecs="vp8, vorbis"'>
 
@@ -50,7 +50,7 @@ <h2 id="qunit-userAgent"></h2>
 
   </video>
 
-  <audio id='audio' data-timeline-sources="data/parserData.json" controls>
+  <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"'>
   </audio>
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 7d98cf6ae..d1c17dc01 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -1,4 +1,4 @@
-module("Core");
+module( "Core" );
 test( "Core", function() {
 
   var expects = 3,
@@ -15,21 +15,21 @@ test( "Core", function() {
   stop( 10000 );
 
   try {
-    ok( Popcorn, "Popcorn exists");
+    ok( Popcorn, "Popcorn exists" );
     plus();
   } catch (e) {};
 
   try {
-    ok( typeof Popcorn === "function", "Popcorn is a function");
+    ok( typeof Popcorn === "function", "Popcorn is a function" );
     plus();
-  } catch (e) {};
+  } catch ( e ) {};
 
   try {
-    Popcorn(function() {
-      ok(1, "Popcorn calls its function argument");
+    Popcorn( function() {
+      ok (1, "Popcorn calls its function argument" );
       plus();
     });
-  } catch (e) {};
+  } catch ( e ) {};
 });
 
 test( "noConflict", function() {
@@ -53,75 +53,76 @@ test( "noConflict", function() {
   Popcorn = $$;
 });
 
-test("isSupported", function () {
+test( "isSupported", function () {
 
   expect( 2 );
 
-  ok( "isSupported" in Popcorn, "Popcorn.isSupported boolean flag exists");
-  ok( Popcorn.isSupported, "Popcorn.isSupported boolean flag is true");
+  ok( "isSupported" in Popcorn, "Popcorn.isSupported boolean flag exists" );
+  ok( Popcorn.isSupported, "Popcorn.isSupported boolean flag is true" );
 });
 
-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", "timeUpdate" ],
-    substatics = [ "addTrackEvent", "removeTrackEvent", "getTrackEvents", "getTrackEvent"];
-
-  expect(statics.length + substatics.length);
+    substatics = [ "addTrackEvent", "removeTrackEvent", "getTrackEvents", "getTrackEvent" ];
 
-  statics.forEach(function(val, idx) {
+  expect( statics.length + substatics.length );
 
-    equals( typeof Popcorn[val], "function" , "Popcorn."+val+"() is a provided static function");
+  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");
-
+    equals( typeof Popcorn[ val ].ref, "function" , "Popcorn." + val + ".ref() is a private use static function" );
   });
 });
 
-test("Popcorn.forEach", function() {
+test( "Popcorn.forEach", function() {
 
-  expect(3);
+  expect( 3 );
 
   var count = 0,
-    nodelist = document.querySelectorAll("div[id^='qunit-']"),
-    array = [ 1, 2 ],
-    object = { a: "1", b: "2" };
+      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");
+  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");
+  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");
+  equal( count, Popcorn.sizeOf(object), Popcorn.sizeOf(object) + " properties in object" );
 });
 
-test("Popcorn.version", function() {
+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);
+  expect( 1 );
 
-  equal(typeof Popcorn.version, "string", "Popcorn.version exists and returns a string");
+  equal( typeof Popcorn.version, "string", "Popcorn.version exists and returns a string" );
 });
 
-test("Popcorn.util.toSeconds" , function() {
+test( "Popcorn.util.toSeconds" , function() {
   var framerate = 24,
       storedStartTime,
       storedEndTime,
@@ -135,67 +136,78 @@ test("Popcorn.util.toSeconds" , function() {
   //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
+    {
+      //Testing double quotes
       start: "01.234",
       end: "4.003",
       correctStartTime: 1.234,
       correctEndTime: 4.003
     },
-    { //Tesing actual numbers
+    {
+      //Tesing actual numbers
       start: 5.333,
       end: 6,
       correctStartTime: 5.333,
       correctEndTime: 6.000
     },
-    { //Testing times in different data types (number and string)
+    {
+      //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)
+    {
+      //Testing times in different data types (string and number)
       start: "8.090",
       end: 9.11111111,
       correctStartTime: 8.090,
       correctEndTime: 9.11111111
     },
-    { //Testing double quotes
+    {
+      //Testing double quotes
       start: "10;4",
       end: "10;17",
       correctStartTime: 10.1666,
       correctEndTime: 10.7083
     },
-    { //Testing single quotes
+    {
+      //Testing single quotes
       start: '12;1',
       end: '13;2',
       correctStartTime: 12.0416,
       correctEndTime: 13.0833
     },
-    { //Testing mixed quotes
+    {
+      //Testing mixed quotes
       start: "20;11",
       end: '23;17',
       correctStartTime: 20.4583,
       correctEndTime: 23.7083
     },
-    { //Testing mixed quotes
+    {
+      //Testing mixed quotes
       start: '27;7',
       end: "27;22",
       correctStartTime: 27.2916,
       correctEndTime: 27.9166
     },
-    { //Testing double quotes
+    {
+      //Testing double quotes
       start: "12:04;12",
       end: "22:59;23",
       correctStartTime: 724.5,
       correctEndTime: 1379.9583
     },
-    { //Testing single quotes
+    {
+      //Testing single quotes
       start: '1:48:27;9',
       end: '3:23:15;1',
       correctStartTime: 6507.375,
       correctEndTime: 12195.0416
     },
-    { //Testing mixed quotes
+    {
+      //Testing mixed quotes
       start: '12:56;7',
       end: "2:02:42;8",
       correctStartTime: 776.2916,
@@ -212,7 +224,7 @@ test("Popcorn.util.toSeconds" , function() {
   var logMessage = function( timeStr, correctTime, incorrectTime ) {
     return "Time stored in seconds for '" + timeStr +
            "' should be " + correctTime +
-           ". Time stored was " + incorrectTime ;
+           ". Time stored was " + incorrectTime;
   };
 
   for ( var periodsIdx = 0, timPeriodsLength = timePeriods.length; periodsIdx < timPeriodsLength; periodsIdx++ ) {
@@ -280,56 +292,54 @@ test("guid", function() {
   }
 
 });
-test("isArray", function() {
+test( "isArray", function() {
 
-  expect(18);
+  expect( 18 );
 
   var empty = [],
-      fastSmall = [1],
+      fastSmall = [ 1 ],
       slow = [],
       slowSmall = [],
       all = null;
 
-  slowSmall[999999] = 0;
+  slowSmall[ 999999 ] = 0;
   slowSmall.length = 0;
   slow.slow = 0;
 
-  all = [ [], [1], new Array, Array(0),'abc'.match(/(a)/g), slow, slowSmall ];
+  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)+")" );
+  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}");
+  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() {
+test( "Protected", function() {
 
-  expect(1);
+  expect( 1 );
   //  TODO: comprehensive tests for these utilities
 
-  ok( !!Popcorn.protect , "Popcorn.protect exists");
-
-
+  ok( !!Popcorn.protect , "Popcorn.protect exists" );
 });
 
-test("Protected from removal", function() {
+test( "Protected from removal", function() {
 
   expect( Popcorn.protect.natives.length * 2 );
 
-  Popcorn.protect.natives.forEach(function( name ) {
+  Popcorn.protect.natives.forEach( function( name ) {
 
     try {
       Popcorn.plugin( name );
@@ -345,8 +355,6 @@ test("Protected from removal", function() {
   });
 });
 
-
-
 test( "Object", function() {
 
   var popped = Popcorn( "#video" ),
@@ -417,13 +425,13 @@ test( "Object", function() {
   });
 });
 
-module("Popcorn Static");
+module( "Popcorn Static" );
 
-test("Popcorn.[addTrackEvent | removeTrackEvent].ref()", function() {
+test( "Popcorn.[addTrackEvent | removeTrackEvent].ref()", function() {
 
-  expect(2);
+  expect( 2 );
 
-  var popped = Popcorn("#video");
+  var popped = Popcorn( "#video" );
 
   // Calling exec() will create tracks and added them to the
   // trackreference internally
@@ -440,31 +448,25 @@ test("Popcorn.[addTrackEvent | removeTrackEvent].ref()", function() {
   equal( Popcorn.sizeOf( popped.data.trackRefs ), 0, "There are 0 trackRefs in popped.data.trackRefs" );
 });
 
+module( "Popcorn Prototype Methods" );
 
-
-module("Popcorn Prototype Methods");
-
-
-
-test("roundTime", function() {
+test( "roundTime", function() {
 
   QUnit.reset();
 
-  var popped = Popcorn("#video");
+  var popped = Popcorn( "#video" );
 
   popped.play().pause().currentTime( 0.98 );
 
   equals( 1, popped.roundTime(), ".roundTime() returns 1 when currentTime is 0.98s" );
-
-
 });
 
 
-test("exec", function() {
+test( "exec", function() {
 
   QUnit.reset();
 
-  var popped = Popcorn("#video"),
+  var popped = Popcorn( "#video" ),
       expects = 2,
       count = 0,
       hasLooped = false,
@@ -493,12 +495,11 @@ test("exec", function() {
 
     if ( !hasLooped ) {
 
-      popped.currentTime(3).play();
+      popped.currentTime( 3 ).play();
 
       hasLooped = true;
     }
-  }).currentTime(3).play();
-
+  }).currentTime( 3 ).play();
 });
 
 test( "cue (alias of exec)", function() {
@@ -508,10 +509,10 @@ test( "cue (alias of exec)", function() {
   deepEqual( Popcorn.p.cue, Popcorn.p.exec, "Popcorn.p.cue equals Popcorn.p.exec" );
 });
 
-test("mute", function() {
+test( "mute", function() {
 
-  var video = Popcorn("#video"),
-      audio = Popcorn("#audio"),
+  var video = Popcorn( "#video" ),
+      audio = Popcorn( "#audio" ),
       expects = 4,
       count = 0;
 
@@ -525,47 +526,42 @@ test("mute", function() {
 
   stop();
 
-
-  video.listen("muted", function() {
+  video.listen( "muted", function() {
 
     equal( this.media.muted, true, "Video `muted` attribute is true when muted" );
     plus();
 
     this.unmute();
 
-  }).listen("unmuted", function() {
+  }).listen( "unmuted", function() {
 
     equal( this.media.muted, false, "Video `muted` attribute is false when unmuted" );
     plus();
-
   });
 
-  audio.listen("muted", function() {
+  audio.listen( "muted", function() {
 
     equal( this.media.muted, true, "Audio `muted` attribute is true when muted" );
     plus();
 
     this.unmute();
 
-  }).listen("unmuted", function() {
+  }).listen( "unmuted", function() {
 
     equal( this.media.muted, false, "Audio `muted` attribute is false when unmuted" );
     plus();
-
   });
 
-
   video.mute();
   audio.mute();
-
 });
 
 test( "play(n)/pause(n) as shorthand to currentTime(n).play()/pause()", function() {
 
   var $pop = Popcorn( "#video" ),
-    expects = 2,
-    count = 0,
-    fired = 0;
+      expects = 2,
+      count = 0,
+      fired = 0;
 
   expect( expects );
 
@@ -584,12 +580,12 @@ test( "play(n)/pause(n) as shorthand to currentTime(n).play()/pause()", function
 
       $pop.play( 10 ).pause();
 
-      equal( Math.round($pop.currentTime()), 10, "play(n) sets currentTime to 10" );
+      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" );
+      equal( Math.round( $pop.currentTime() ), 5, "pause(n) sets currentTime to 5" );
       plus();
 
     } else {
@@ -617,7 +613,7 @@ test( "play(n)/pause(n) custom stop()", function() {
       expects = 2,
       $pop;
 
-  document.getElementById("qunit-fixture").innerHTML = outerHTML;
+  document.getElementById( "qunit-fixture" ).innerHTML = outerHTML;
 
   $pop = Popcorn( "#video-fixture" );
 
@@ -636,7 +632,7 @@ test( "play(n)/pause(n) custom stop()", function() {
   $pop.listen( "canplayall", function() {
 
     this.exec( 4, function() {
-    
+
       this.exec( 0, function() {
 
         equal( this.currentTime(), 0, "currentTime is 0" );
@@ -649,8 +645,7 @@ test( "play(n)/pause(n) custom stop()", function() {
   });
 });
 
-
-module("Popcorn Static Methods");
+module( "Popcorn Static Methods" );
 
 test( "Popcorn.extend", function() {
 
@@ -660,14 +655,14 @@ test( "Popcorn.extend", function() {
 
   var dest = {},
       obj1 = {
-        "key11" : "value",
-        "key12" : 9001,
-        "key13" : function() { return true; }
+        "key11": "value",
+        "key12": 9001,
+        "key13": function() { return true; }
       },
       obj2 = {
-        "key21" : "String",
-        "key22" : 9002,
-        "key23" : function() { return false; }
+        "key21": "String",
+        "key22": 9002,
+        "key23": function() { return false; }
       },
       prop;
 
@@ -694,7 +689,6 @@ test( "Popcorn.extend", function() {
   equal( typeof dest[ "key13" ], "function","dest[key13] is a function" );
 
   equal( typeof dest[ "key23" ], "function","dest[key23] is a function" );
-
 });
 
 test( "Popcorn.events", function() {
@@ -710,8 +704,8 @@ test( "Popcorn.events", function() {
       len,
       okay = true;
 
-  eventTypes.forEach (function( e ) {
-    ok( Popcorn.Events[ e ], e + " Exists")
+  eventTypes.forEach ( function( e ) {
+    ok( Popcorn.Events[ e ], e + " Exists" )
   });
 
   natives = Popcorn.Events[ eventTypes[ 0 ] ] + " " + Popcorn.Events[ eventTypes[ 1 ] ] + " " + Popcorn.Events[ eventTypes[ 2 ] ];
@@ -731,25 +725,24 @@ test( "Popcorn.events", function() {
   Popcorn.forEach( eventsReturned, function( e ) {
     ok( Popcorn.events.isNative ( e ), e + " is a native event" );
   });
-
 });
 
-test("Popcorn.events.hooks", function() {
+test( "Popcorn.events.hooks", function() {
 
-  expect(1);
+  expect( 1 );
 
   ok( Popcorn.events.hooks, "Popcorn.events.hooks exists" );
 
 });
 
-test("Popcorn.events.hooks: canplayall", function() {
-  //qunit-fixture
+test( "Popcorn.events.hooks: canplayall", function() {
 
+  //qunit-fixture
   var expects = 1,
-    count = 0,
-    fired = 0;
+      count = 0,
+      fired = 0;
 
-  expect(expects);
+  expect( expects );
 
   function plus(){
     if ( ++count == expects ) {
@@ -759,13 +752,13 @@ test("Popcorn.events.hooks: canplayall", function() {
 
   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.";
+  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;
@@ -778,30 +771,30 @@ test("Popcorn.events.hooks: canplayall", function() {
     video.appendChild( source );
   });
 
-  document.getElementById("qunit-fixture").appendChild( video );
+  document.getElementById( "qunit-fixture" ).appendChild( video );
 
-  var $pop = Popcorn("#event-fixture");
+  var $pop = Popcorn( "#event-fixture" );
 
-  $pop.listen("canplayall", function( event ) {
+  $pop.listen( "canplayall", function( event ) {
     equal( ++fired, 1, "canplayall is fired only once" );
     plus();
   });
 
-  $pop.listen("canplaythrough", function( event ) {
+  $pop.listen( "canplaythrough", function( event ) {
     // this should trigger re-fires of the original event
-    this.currentTime(0);
+    this.currentTime( 0 );
   });
 });
 
-test("Popcorn.events.hooks: canplayall fires immediately if ready", function() {
-  //qunit-fixture
+test( "Popcorn.events.hooks: canplayall fires immediately if ready", function() {
 
-  var $pop = Popcorn("#video"),
-    expects = 1,
-    count = 0,
-    fired = 0;
+  //qunit-fixture
+  var $pop = Popcorn( "#video" ),
+      expects = 1,
+      count = 0,
+      fired = 0;
 
-  expect(expects);
+  expect( expects );
 
   function plus(){
     if ( ++count == expects ) {
@@ -814,7 +807,7 @@ test("Popcorn.events.hooks: canplayall fires immediately if ready", function() {
   function poll() {
     if ( $pop.media.readyState >= 2 ) {
       // this should trigger immediately
-      $pop.listen("canplayall", function( event ) {
+      $pop.listen( "canplayall", function( event ) {
         equal( ++fired, 1, "canplayall is fired immediately if readyState permits" );
         plus();
       });
@@ -834,26 +827,26 @@ test("Popcorn.events.hooks: canplayall fires immediately if ready", function() {
 </video>
 
 */
-module("Popcorn Locale");
+module( "Popcorn Locale" );
 
 test( "Popcorn.locale object", function() {
 
   var api = {
-    get: "function",
-    set: "function",
-    broadcast: "function"
-  },
-  locale = navigator.language,
-  parts = locale.split("-"),
+        get: "function",
+        set: "function",
+        broadcast: "function"
+      },
+      locale = navigator.language,
+      parts = locale.split( "-" ),
 
-  stub = {
-    iso6391: locale,
-    language: parts[ 0 ],
-    region: parts[ 1 ]
-  },
-  $pop = Popcorn("#video"),
-  expects = 18,
-  count = 0;
+      stub = {
+       iso6391: locale,
+       language: parts[ 0 ],
+       region: parts[ 1 ]
+      },
+      $pop = Popcorn( "#video" ),
+      expects = 18,
+      count = 0;
 
   expect( expects );
 
@@ -868,7 +861,7 @@ test( "Popcorn.locale object", function() {
   ok( Popcorn.locale, "Popcorn.locale exists");
   plus();
 
-  equal( typeof Popcorn.locale, "object", "Popcorn.locale is an object");
+  equal( typeof Popcorn.locale, "object", "Popcorn.locale is an object" );
   plus();
 
   Popcorn.forEach( api, function( type, method ) {
@@ -886,18 +879,17 @@ test( "Popcorn.locale object", function() {
     plus();
   });
 
-
   locale = "fr-CA";
 
   // Setup "locale:changed" event listener
   $pop.listen( "locale:changed", function() {
 
     var parts = locale.split( "-" ),
-    stub = {
-      iso6391: locale,
-      language: parts[ 0 ],
-      region: parts[ 1 ]
-    };
+        stub = {
+          iso6391: locale,
+          language: parts[ 0 ],
+          region: parts[ 1 ]
+        };
 
 
     Popcorn.forEach( Popcorn.locale.get(), function( val, prop ) {
@@ -905,46 +897,53 @@ test( "Popcorn.locale object", function() {
       plus();
     });
 
-
     if ( locale === "fr-CA" ) {
       locale = "en-CA";
 
       // Change locale, trigger "locale:changed" event
       Popcorn.locale.set( "en-CA" );
     }
-
   });
 
   // Change locale, trigger "locale:changed" event
   Popcorn.locale.set( "fr-CA" );
-
-
-
 });
 
 
-module("Popcorn Position");
-test("position", function() {
+module( "Popcorn Position" );
+test( "position", function() {
 
-  expect(25);
+  expect( 25 );
 
-  var $absolute = $(".absolute"),
-      $relative = $(".relative"),
-      $fixed = $(".fixed"),
-      $static = $(".static"),
+  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 );
+  $( "#position-tests" ).show();
 
   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 }
+    {
+      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 ) {
@@ -953,8 +952,16 @@ test("position", function() {
   });
 
   tests = [
-    { id: "relative-1", top:   0, left:  0 },
-    { id: "relative-2", top: 120, left: 20 }
+    {
+      id: "relative-1",
+      top: 0,
+      left: 0
+    },
+    {
+      id: "relative-2",
+      top: 120,
+      left: 20
+    }
   ];
 
   Popcorn.forEach( tests, function( test ) {
@@ -963,8 +970,16 @@ test("position", function() {
   });
 
   tests = [
-    { id: "fixed-1", top:  0, left:  0 },
-    { id: "fixed-2", top: 20, left: 20 }
+    {
+      id: "fixed-1",
+        top:  0,
+        left:  0
+    },
+    {
+      id: "fixed-2",
+      top: 20,
+      left: 20
+    }
   ];
 
   Popcorn.forEach( tests, function( test ) {
@@ -973,10 +988,26 @@ test("position", function() {
   });
 
   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 }
+    {
+      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 ) {
@@ -990,12 +1021,12 @@ test("position", function() {
     ok( false, e );
   }
 
-  $("#position-tests").hide();
+  $( "#position-tests" ).hide();
 });
 
-test("position called from plugin", function() {
+test( "position called from plugin", function() {
 
-  var $pop = Popcorn("#video"),
+  var $pop = Popcorn( "#video" ),
       expects = 3,
       count = 0;
 
@@ -1004,7 +1035,7 @@ test("position called from plugin", function() {
   function plus(){
     if ( ++count == expects ) {
       start();
-      Popcorn.removePlugin("positionPlugin");
+      Popcorn.removePlugin( "positionPlugin" );
       delete Popcorn.manifest.positionPlugin;
     }
   }
@@ -1014,16 +1045,16 @@ test("position called from plugin", function() {
   Popcorn.plugin( "positionPlugin" , function(){
     return {
       _setup: function( options ) {
-        ok( "position" in this, "this.position() avaliable in _setup");
+        ok( "position" in this, "this.position() avaliable in _setup" );
         plus();
       },
-      start: function(event, options){
+      start: function( event, options ){
 
-        ok( "position" in this, "this.position() avaliable in start");
+        ok( "position" in this, "this.position() avaliable in start" );
         plus();
       },
-      end: function(event, options){
-        ok( "position" in this, "this.position() avaliable in end");
+      end: function( event, options ){
+        ok( "position" in this, "this.position() avaliable in end" );
         plus();
       }
     };
@@ -1032,12 +1063,12 @@ test("position called from plugin", function() {
   $pop.positionPlugin({
     start: 0,
     end: 1
-  }).currentTime(0).play();
+  }).currentTime( 0 ).play();
 });
 
-module("Popcorn Events");
+module( "Popcorn Events" );
 
-test("Can Detect Native event types", function() {
+test( "Can Detect Native event types", function() {
 
   var tests = [ "play", "pause", "rough loade", "data seek" ],
       expects = [ true, true, false, false ];
@@ -1049,7 +1080,7 @@ test("Can Detect Native event types", function() {
   });
 });
 
-test("Determine event api interface", function() {
+test( "Determine event api interface", function() {
 
   var tests = [ "play", "pause", "click", "scroll", "rough loade", "data seek" ],
       expects = [ "Events", "Events", "MouseEvents", "UIEvents", false, false ];
@@ -1061,13 +1092,13 @@ test("Determine event api interface", function() {
   });
 });
 
-test("Stored By Type", function() {
+test( "Stored By Type", function() {
 
   QUnit.reset();
 
-  expect(6)
+  expect( 6 )
 
-  var p = Popcorn("#video"),
+  var p = Popcorn( "#video" ),
       count = 0,
       fired = 0,
       wants = 4;
@@ -1078,9 +1109,9 @@ test("Stored By Type", function() {
 
       equals( fired, wants, "Number of callbacks fired from 1 handler" );
 
-      p.unlisten("play");
+      p.unlisten( "play" );
 
-      ok( !p.data.events["play"], "play handlers removed" );
+      ok( !p.data.events[ "play" ], "play handlers removed" );
 
       start();
     }
@@ -1088,58 +1119,55 @@ test("Stored By Type", function() {
 
   stop( 10000 );
 
-
-  p.listen("play", function() {
+  p.listen( "play", function() {
     fired++;
 
-    ok(true, "Play fired " + fired);
+    ok( true, "Play fired " + fired );
     plus();
   });
 
-  p.listen("play", function() {
+  p.listen( "play", function() {
     fired++;
 
-    ok(true, "Play fired " + fired);
+    ok( true, "Play fired " + fired );
     plus();
   });
 
-  p.listen("play", function() {
+  p.listen( "play", function() {
     fired++;
 
-    ok(true, "Play fired " + fired);
+    ok( jtrue, "Play fired " + fired );
     plus();
   });
 
-  p.listen("play", function() {
+  p.listen( "play", function() {
     fired++;
 
-    ok(true, "Play fired " + fired);
+    ok( true, "Play fired " + fired );
     plus();
   });
 
-  p.trigger("play");
+  p.trigger( "play" );
 
-  if (fired < 4) {
+  if ( fired < 4 ) {
     start();
   }
 
-  p.unlisten("play");
-
+  p.unlisten( "play" );
 });
 
 
-test("Simulated", function() {
+test( "Simulated", function() {
 
   QUnit.reset();
 
-  var p = Popcorn("#video"),
+  var p = Popcorn( "#video" ),
       completed = [];
 
-
   var expects = Setup.events.length,
       count = 0;
 
-  expect(expects);
+  expect( expects );
 
   function plus(){
     if ( ++count == expects ) start();
@@ -1149,41 +1177,36 @@ test("Simulated", function() {
 
 
   Setup.events.forEach(function( name ) {
-    p.listen( name, function(event) {
+    p.listen( name, function( event ) {
 
-      if ( completed.indexOf(name) === -1 ) {
+      if ( completed.indexOf( name ) === -1 ) {
         ok( true, name + " fired" );
         plus();
 
-        completed.push(name);
+        completed.push( name );
       }
-
-
     });
   });
 
-  Setup.events.forEach(function( name ) {
+  Setup.events.forEach( function( name ) {
     p.trigger( name );
   });
-
-
 });
 
 
-test("Real", function() {
+test( "Real", function() {
 
   QUnit.reset();
 
-  var p = Popcorn("#video"),
-      completed = [];
-
-
-  var expects = 5,
+  var p = Popcorn( "#video" ),
+      completed = [],
+      expects = 5,
       count = 0;
 
-
   function plus(){
-    if ( ++count == expects ) start();
+    if ( ++count == expects ) {
+      start();
+    }
   }
 
   stop( 10000 );
@@ -1191,103 +1214,89 @@ test("Real", function() {
 
   [ "play", "pause", "volumechange", "seeking", "seeked" ].forEach(function( name ) {
 
-    p.listen( name, function(event) {
+    p.listen( name, function( event ) {
 
-      if ( completed.indexOf(name) === -1 ) {
+      if ( completed.indexOf( name ) === -1 ) {
         ok( true, name + " fired" );
         plus();
-
-        completed.push(name);
+        completed.push( name );
       }
-
-
     });
   });
 
-
-
   p.pause();
-
   p.play();
-
-  p.volume(0.9);
-
-  p.currentTime(49);
-
-
-
+  p.volume( 0.9 );
+  p.currentTime( 49 );
 });
 
-test("Custom", function() {
+test( "Custom", function() {
 
   var expects = 1,
       count = 0;
 
-  expect(expects);
+  expect( expects );
 
-  function plus(){ if ( ++count == expects ) start(); }
+  function plus(){
+    if ( ++count == expects ) {
+      start();
+    }
+  }
 
   stop( 10000 );
 
-  var p = Popcorn("#video");
+  var p = Popcorn( "#video" );
 
 
-  p.listen("eventz0rz", function( event ) {
+  p.listen( "eventz0rz", function( event ) {
 
     ok( true, "Custom event fired" );
     plus();
-
   });
 
-  p.trigger("eventz0rz");
-
-
-
+  p.trigger( "eventz0rz" );
 });
 
 
-test("UI/Mouse", function() {
+test( "UI/Mouse", function() {
 
   var expects = 1,
-      count = 0;
+      count = 0
+      p;
 
-  expect(expects);
+  expect( expects );
 
-  function plus(){ if ( ++count == expects ) start(); }
+  function plus(){
+    if ( ++count == expects ) {
+      start();
+    }
 
   stop( 10000 );
 
-  var p = Popcorn("#video");
+  p = Popcorn( "#video" );
 
-
-  p.listen("click", function( event ) {
+  p.listen( "click", function( event ) {
 
     ok( true, "click event fired" );
     plus();
-
   });
 
-  p.trigger("click");
-
-
-
+  p.trigger( "click" );
 });
 
-module("Popcorn Plugin")
-test("Manifest", function() {
+module( "Popcorn Plugin" )
+test( "Manifest", function() {
 
-
-
-  var p = Popcorn("#video"),
+  var p = Popcorn( "#video" ),
       expects = 5,
       run = 1,
-      count   = 0;
+      count = 0;
 
   function plus() {
     if ( ++count === expects ) {
       start();
       // clean up added events after tests
-      Popcorn.removePlugin("footnote");
+      Popcorn.removePlugin( "footnote" );
     }
   }
 
@@ -1299,44 +1308,51 @@ test("Manifest", function() {
         plus();
 
         if ( run === 2 ) {
-          equals( options.target, 'custom-target', "Uses custom target if one is specified" );
+          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" );
+          equals( options.target, "text-container", "Uses manifest target by default" );
           plus();
-
           run++;
         }
       },
-      start: function(event, options){
+      start: function( event, options ){
       },
-
-      end: function(event, options){
-
+      end: function( event, options ){
       }
-
     };
-
   },
   {
-    about:{
+    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'
+      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);
+  expect( expects );
 
   equal( Popcorn.sizeOf( Popcorn.manifest ), 1, "One manifest stored" );
   plus();
@@ -1348,21 +1364,18 @@ test("Manifest", function() {
   p.footnote({
     target: "custom-target"
   });
-
-
 });
 
-test("Configurable Defaults", function() {
+test( "Configurable Defaults", function() {
 
   var expects = 13,
-      count   = 0;
+      count = 0;
 
   function plus() {
     if ( ++count === expects ) {
       start();
 
-
-      ["configurable", "multiconfig", "overridden"].forEach(function( val ) {
+      [ "configurable", "multiconfig", "overridden" ].forEach( function( val ) {
         Popcorn.removePlugin( val );
         delete Popcorn.manifest[ val ];
       });
@@ -1377,7 +1390,7 @@ test("Configurable Defaults", function() {
 
         options.persistant = true;
 
-        equal( options.target, "foo", 'options.target, "foo" in configurable _setup');
+        equal( options.target, "foo", "options.target, 'foo' in configurable _setup" );
         plus();
       },
       start: function( event, options ) {
@@ -1387,15 +1400,15 @@ test("Configurable Defaults", function() {
         // target: "foo"
         // text: "bar"
         // type: "thinger"
-        equal( options.target, "foo", 'options.target, "foo" in configurable start');
+        equal( options.target, "foo", "options.target, 'foo' in configurable start" );
         plus();
-        equal( options.text, "bar", 'options.text, "bar" in configurable start');
+        equal( options.text, "bar", "options.text, 'bar' in configurable start" );
         plus();
-        equal( options.type, "thinger", 'options.type, "thinger" in configurable start');
+        equal( options.type, "thinger", "options.type, 'thinger' in configurable start" );
         plus();
       },
       end: function( event, options ) {
-        ok( true, "end fired");
+        ok( true, "end fired" );
         plus();
       }
     };
@@ -1415,11 +1428,11 @@ test("Configurable Defaults", function() {
   Popcorn.plugin( "multiconfig", function() {
     return {
       start: function( event, options ) {
-        equal( options.target, "quux", 'options.target, "quux" in multiconfig start');
+        equal( options.target, "quux", "options.target, 'quux' in multiconfig start" );
         plus();
       },
       end: function( event, options ) {
-        ok( true, "end fired");
+        ok( true, "end fired" );
         plus();
       }
     };
@@ -1428,27 +1441,26 @@ test("Configurable Defaults", function() {
   Popcorn.plugin( "overridden", function() {
     return {
       _setup: function( options ) {
-        equal( options.text, "hello!", 'options.text, overriden with "hello!" in overridden _setup');
+        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();
+        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');
+        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');
+        equal( options.target, "custom", "options.target, overriden with 'custom' in overridden start" );
         plus();
       },
       end: function( event, options ) {
-        ok( true, "end fired");
+        ok( true, "end fired" );
         plus();
       }
     };
   });
 
-  var p = Popcorn("#video", {
+  var p = Popcorn( "#video", {
             defaults: {
               overridden: {
                 target: "default"
@@ -1481,14 +1493,12 @@ test("Configurable Defaults", function() {
     // type: "thinger"
     start: 3,
     end: 4
-
   }).multiconfig({
 
     // all calls will have:
     // target: "quux"
     start: 4,
     end: 5
-
   }).overridden({
 
     // has a default set
@@ -1497,9 +1507,7 @@ test("Configurable Defaults", function() {
     end: 5,
     target: "custom",
     text: "hello!"
-
   }).currentTime( 2 ).play();
-
 });
 
 test( "Exceptions", function() {
@@ -1537,7 +1545,7 @@ test( "Exceptions", function() {
       start: 1,
       end: 2
     }).exec( 3, function() {
-      equal( Popcorn.plugin.errors.length, 1, "Popcorn.plugin.errors has one item");
+      equal( Popcorn.plugin.errors.length, 1, "Popcorn.plugin.errors has one item" );
       plus();
     }).currentTime( 0 ).play();
 
@@ -1554,18 +1562,18 @@ test( "Exceptions", function() {
   });
 });
 
-test("Start Zero Immediately", function() {
+test( "Start Zero Immediately", function() {
 
-  var $pop = Popcorn("#video"),
+  var $pop = Popcorn( "#video" ),
       expects = 1,
       count = 0;
 
-  expect(expects);
+  expect( expects );
 
   function plus() {
     if ( ++count === expects ) {
       // clean up added events after tests
-      Popcorn.removePlugin("zero");
+      Popcorn.removePlugin( "zero" );
       start();
     }
   }
@@ -1576,7 +1584,7 @@ test("Start Zero Immediately", function() {
 
   Popcorn.plugin( "zero", {
     start: function() {
-      ok( true, "$pop.zero({ start:0, end: 2 }) ran without play()");
+      ok( true, "$pop.zero({ start:0, end: 2 }) ran without play()" );
       plus();
     },
     end: function() {}
@@ -1588,19 +1596,21 @@ test("Start Zero Immediately", function() {
   });
 });
 
-test("frame function (frameAnimation)", function() {
+test( "frame function (frameAnimation)", function() {
 
-  var $pop = Popcorn("#video", { frameAnimation: true }),
+  var $pop = Popcorn( "#video", {
+        frameAnimation: true
+      }),
       fired = 0,
       expects = 1,
       count = 0;
 
-  expect(expects);
+  expect( expects );
 
   function plus() {
     if ( ++count === expects ) {
       // clean up added events after tests
-      Popcorn.removePlugin("frameFn");
+      Popcorn.removePlugin( "frameFn" );
       start();
     }
   }
@@ -1628,21 +1638,24 @@ test("frame function (frameAnimation)", function() {
   }).play();
 });
 
-test("Update Timer (timeupdate)", function() {
+test( "Update Timer (timeupdate)", function() {
 
   QUnit.reset();
 
-  var p2 = Popcorn("#video"),
+  var p2 = Popcorn( "#video" ),
       expects = 12,
-      count   = 0,
+      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, };
+      forwardStart = false,
+      forwardEnd = false,
+      backwardStar = false,
+      backwardEnd = false,
+      wrapperRunning = {
+        one: false,
+        two: false,
+      };
 
   function plus() {
     if ( ++count === expects ) {
@@ -1650,7 +1663,6 @@ test("Update Timer (timeupdate)", function() {
       Popcorn.removePlugin( "forwards" );
       Popcorn.removePlugin( "backwards" );
       Popcorn.removePlugin( "wrapper" );
-      p2.removePlugin( "exec" ); // TODO: David, remove this during test suite cleanup ^RW
       start();
     }
   }
@@ -1676,7 +1688,7 @@ test("Update Timer (timeupdate)", function() {
 
           options.endFired = true;
           forwardEnd = !forwardEnd;
-          p2.currentTime(1).play();
+          p2.currentTime( 1 ).play();
           ok( forwardEnd, "forward's end fired" );
           plus();
         }
@@ -1697,7 +1709,7 @@ test("Update Timer (timeupdate)", function() {
 
           options.startFired = true;
           backwardStart = !backwardStart;
-          p2.currentTime(0).play();
+          p2.currentTime( 0 ).play();
           ok( true, "backward's start fired" );
           plus();
         }
@@ -1792,25 +1804,29 @@ test("Update Timer (timeupdate)", function() {
     }
   });
 
-  p2.currentTime(3).play();
-
+  p2.currentTime( 3 ).play();
 });
 
-test("Update Timer (frameAnimation)", function() {
+test( "Update Timer (frameAnimation)", function() {
 
   QUnit.reset();
 
-  var p2 = Popcorn("#video", { frameAnimation: true }),
+  var p2 = Popcorn( "#video", {
+        frameAnimation: true
+      }),
       expects = 12,
-      count   = 0,
+      count = 0,
       execCount = 0,
       // These make sure events are only fired once
       // any second call will produce a failed test
-      forwardStart  = false,
-      forwardEnd    = false,
+      forwardStart = false,
+      forwardEnd = false,
       backwardStart = false,
-      backwardEnd   = false,
-      wrapperRunning = { one: false, two: false, };
+      backwardEnd = false,
+      wrapperRunning = {
+        one: false,
+        two: false,
+      };
 
   function plus() {
     if ( ++count === expects ) {
@@ -1818,7 +1834,6 @@ test("Update Timer (frameAnimation)", function() {
       Popcorn.removePlugin( "forwards" );
       Popcorn.removePlugin( "backwards" );
       Popcorn.removePlugin( "wrapper" );
-      p2.removePlugin( "exec" ); // TODO: David, remove this during test suite cleanup ^RW
       start();
     }
   }
@@ -1844,7 +1859,7 @@ test("Update Timer (frameAnimation)", function() {
 
           options.endFired = true;
           forwardEnd = !forwardEnd;
-          p2.currentTime(1).play();
+          p2.currentTime( 1 ).play();
           ok( forwardEnd, "forward's end fired" );
           plus();
         }
@@ -1865,7 +1880,7 @@ test("Update Timer (frameAnimation)", function() {
 
           options.startFired = true;
           backwardStart = !backwardStart;
-          p2.currentTime(0).play();
+          p2.currentTime( 0 ).play();
           ok( true, "backward's start fired" );
           plus();
         }
@@ -1960,16 +1975,14 @@ test("Update Timer (frameAnimation)", function() {
     }
   });
 
-  p2.currentTime(3).play();
-
+  p2.currentTime( 3 ).play();
 });
 
-
-test("timeUpdate add track event while paused", function() {
+test( "timeUpdate add track event while paused", function() {
 
   var $pop = Popcorn( "#video" ),
-    count = 0,
-    expects = 1;
+      count = 0,
+      expects = 1;
 
   expect( expects );
 
@@ -1985,7 +1998,7 @@ test("timeUpdate add track event while paused", function() {
   Popcorn.plugin( "timeUpdateTester", function() {
     return {
       start: function () {
-        ok( true, "timeupdater ran while paused");
+        ok( true, "timeupdater ran while paused" );
         plus();
       },
       end: function () {
@@ -2001,19 +2014,20 @@ test("timeUpdate add track event while paused", function() {
   });
 });
 
-test("Plugin Factory", function () {
+test( "Plugin Factory", function () {
 
   QUnit.reset();
 
-  var popped = Popcorn("#video"),
+  var popped = Popcorn( "#video" ),
       methods = "load play pause currentTime mute volume roundTime exec removePlugin",
-      expects = 34, // 15*2+2+2. executor/complicator each do 15
+      // 15*2+2+2. executor/complicator each do 15
+      expects = 34,
       count = 0;
 
   function plus() {
     if ( ++count == expects ) {
-      Popcorn.removePlugin("executor");
-      Popcorn.removePlugin("complicator");
+      Popcorn.removePlugin( "executor" );
+      Popcorn.removePlugin( "complicator" );
       start();
     }
   }
@@ -2021,7 +2035,7 @@ test("Plugin Factory", function () {
   expect( expects );
   stop( 15000 );
 
-  Popcorn.plugin("executor", function() {
+  Popcorn.plugin( "executor", function() {
 
     return {
 
@@ -2029,38 +2043,34 @@ test("Plugin Factory", 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();
         });
 
         ok( "video" in this, "executor instance has `video` property" );
         plus();
-        ok( Object.prototype.toString.call(popped.video) === "[object HTMLVideoElement]", "video property is a HTMLVideoElement" );
+        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" );
+        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" )
+        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");
+  equals( Popcorn.registry.length, 1, "One item in the registry" );
   plus();
 
   popped.executor({
@@ -2068,39 +2078,35 @@ test("Plugin Factory", function () {
     end: 2
   });
 
-  Popcorn.plugin("complicator", {
+  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) {
+      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" );
+      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" );
+      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" )
+      ok( Object.prototype.toString.call( popped.data.trackEvents ) === "[object Object]", "complicator trackEvents property is an object" )
       plus();
     },
     end: function() {
-
       //start();
-
     },
     timeupdate: function() {
     }
@@ -2108,7 +2114,7 @@ test("Plugin Factory", function () {
 
   ok( "complicator" in popped, "complicator plugin is now available to instance" );
   plus();
-  equals( Popcorn.registry.length, 2, "Two items in the registry");
+  equals( Popcorn.registry.length, 2, "Two items in the registry" );
   plus();
 
   popped.complicator({
@@ -2116,15 +2122,14 @@ test("Plugin Factory", function () {
     end: 5
   });
 
-  popped.currentTime(0).play();
-
+  popped.currentTime( 0 ).play();
 });
 
 test( "Popcorn Compose", function() {
 
   QUnit.reset();
 
-  var popped = Popcorn("#video"),
+  var popped = Popcorn( "#video" ),
       expects = 43,
       count = 0,
       effectTrackOne,
@@ -2145,9 +2150,9 @@ test( "Popcorn Compose", function() {
 
   function plus() {
     if ( ++count == expects ) {
-      Popcorn.removePlugin("testPlugin");
-      Popcorn.removePlugin("pluginOptions1");
-      Popcorn.removePlugin("pluginOptions2");
+      Popcorn.removePlugin( "testPlugin" );
+      Popcorn.removePlugin( "pluginOptions1" );
+      Popcorn.removePlugin( "pluginOptions2" );
 
       popped.destroy();
       start();
@@ -2166,7 +2171,7 @@ test( "Popcorn Compose", function() {
   ok( Popcorn.plugin.effect, "Popcorn.plugin.effect method exists" );
   plus();
 
-  Popcorn.plugin( "testPlugin", {});
+  Popcorn.plugin( "testPlugin", {} );
 
   Popcorn.compose( "testCompose1", {
     start: function() {
@@ -2246,7 +2251,7 @@ test( "Popcorn Compose", function() {
   equals( test.two.setup, 3, "three compose two setup" );
   plus();
 
-  popped.currentTime(0).pause();
+  popped.currentTime( 0 ).pause();
 
   popped.exec( 0, function() {
     equals( test.one.running, 1, "one compose running" );
@@ -2376,17 +2381,17 @@ test( "Popcorn Compose", function() {
   popped.currentTime( 0 ).play();
 });
 
-test("Plugin Breaker", function() {
+test( "Plugin Breaker", function() {
 
   QUnit.reset();
 
-  var popped = Popcorn("#video"),
+  var popped = Popcorn( "#video" ),
       expects = 6,
       count = 0;
 
   function plus() {
     if ( ++count == expects ) {
-      Popcorn.removePlugin("breaker");
+      Popcorn.removePlugin( "breaker" );
       start();
     }
   }
@@ -2395,41 +2400,36 @@ test("Plugin Breaker", function() {
   stop( 10000 );
 
   var breaker = {
-
     start: 0,
     end: 0
-
   };
 
-  Popcorn.plugin("breaker", {
+  Popcorn.plugin( "breaker", {
 
     start: function() {
 
       breaker.start++;
 
-      ok(true, "breaker started");
+      ok( true, "breaker started" );
       plus();
     },
     end: function() {
 
       breaker.end++;
 
-      ok(true, "breaker ended");
+      ok( true, "breaker ended" );
       plus();
 
-
-      equals( breaker.start, 1, "plugin start method fires only once");
+      equals( breaker.start, 1, "plugin start method fires only once" );
       plus();
-      equals( breaker.end, 1, "plugin end method fires only once");
+      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");
+  equals( Popcorn.registry.length, 1, "Three items in the registry" );
   plus();
 
   popped.breaker({
@@ -2437,22 +2437,21 @@ test("Plugin Breaker", function() {
     end: 2
   });
 
-  popped.currentTime(0).play();
-
+  popped.currentTime( 0 ).play();
 });
 
-test("Plugin Empty", function() {
+test( "Plugin Empty", function() {
 
   QUnit.reset();
 
-  var popped = Popcorn("#video"),
+  var popped = Popcorn( "#video" ),
       expects = 4,
       testObj = {},
       count = 0;
 
   function plus() {
     if ( ++count == expects ) {
-      Popcorn.removePlugin("empty");
+      Popcorn.removePlugin( "empty" );
       start();
     }
   }
@@ -2460,7 +2459,7 @@ test("Plugin Empty", function() {
   expect( expects );
   stop( 10000 );
 
-  Popcorn.plugin("empty", testObj);
+  Popcorn.plugin( "empty", testObj );
 
   popped.empty({});
 
@@ -2473,22 +2472,21 @@ test("Plugin Empty", function() {
   ok( testObj._teardown, "default _teardown function is generated" );
   plus();
 
-  popped.currentTime(0).play();
-
+  popped.currentTime( 0 ).play();
 });
 
-test("Plugin Closure", function() {
+test( "Plugin Closure", function() {
 
   QUnit.reset();
 
-  var popped = Popcorn("#video"),
+  var popped = Popcorn( "#video" ),
       methods = "load play pause currentTime mute volume roundTime exec removePlugin",
       expects = 8,
       count = 0;
 
   function plus() {
     if ( ++count == expects ) {
-      Popcorn.removePlugin("closure");
+      Popcorn.removePlugin( "closure" );
       start();
     }
   }
@@ -2496,7 +2494,7 @@ test("Plugin Closure", function() {
   expect( expects );
   stop( 10000 );
 
-  Popcorn.plugin("closure", function() {
+  Popcorn.plugin( "closure", function() {
 
     var startCount = 0;
     var endCount = 0;
@@ -2518,7 +2516,7 @@ test("Plugin Closure", function() {
         plus();
 
         // running tracks again to make sure data increments uniquly
-        popped.currentTime(5).play();
+        popped.currentTime( 5 ).play();
       }
     };
   });
@@ -2534,14 +2532,14 @@ test("Plugin Closure", function() {
     nick: "second closure track"
   });
 
-  popped.currentTime(5).play();
+  popped.currentTime( 5 ).play();
 
 });
 
-test("Remove Plugin", function() {
+test( "Remove Plugin", function() {
 
-  var p = Popcorn("#video"),
-      p2 = Popcorn("#video"),
+  var p = Popcorn( "#video" ),
+      p2 = Popcorn( "#video" ),
       rlen = Popcorn.registry.length,
       count = 0,
       expects = 23,
@@ -2556,17 +2554,17 @@ test("Remove Plugin", function() {
 
   expect( expects );
   stop( 10000 );
-  p.currentTime(0).pause();
+  p.currentTime( 0 ).pause();
 
-  equals( rlen, 0, "Popcorn.registry.length is empty");
+  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");
+  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");
+  equals( p.data.trackEvents.byEnd.length, 2, "p.data.trackEvents.byEnd is initialized and has 2 entries" );
   plus();
 
-  Popcorn.plugin("removeme", {
+  Popcorn.plugin( "removeme", {
 
     start: function() {
 
@@ -2592,14 +2590,14 @@ test("Remove Plugin", function() {
     order: "second"
   });
 
-  equals( Popcorn.registry.length, 1, "Popcorn.registry.length is 1");
+  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");
+  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");
+  equals( p.data.trackEvents.byEnd.length, 3, "p.data.trackEvents.byEnd is updated and has 3 entries" );
   plus();
 
-  p.removePlugin("removeme");
+  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.
@@ -2608,41 +2606,40 @@ test("Remove Plugin", function() {
   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");
+  equals( Popcorn.registry.length, 1, "Popcorn.registry.length has not changed" );
   plus();
 
-  ok( (typeof p2.removeme === "function"), "removeme plugin is defined to p2 instance" );
+  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");
+  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");
+  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");
+  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");
+  equals( p.data.trackEvents.byEnd.length, 2, "p.data.trackEvents.byEnd is updated and has 2 entries" );
   plus();
-  Popcorn.removePlugin("removeme");
+  Popcorn.removePlugin( "removeme" );
 
-  ok( !("removeme" in p2), "removeme plugin is no longer available to p2 instance" );
+  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" );
+  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");
+  equals( Popcorn.registry.length, 0, "Popcorn.registry.length is empty again" );
   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");
+      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");
+      equals( p2.data.trackEvents.byEnd.length, 2, "p2.data.trackEvents.byEnd is updated and has 2 entries" );
       plus();
       clearInterval( interval );
     }
-  }, 1);
+  }, 1 );
 
   Popcorn.plugin( "cleanup", {
 
@@ -2667,12 +2664,11 @@ test("Remove Plugin", function() {
   p2.removeTrackEvent( p2.getLastTrackEventId() );
 
   p2.currentTime( 2 ).play();
-
 });
 
 test( "Protected Names", function() {
 
-  var keys = [], 
+  var keys = [],
       len,
       count = 0,
       popped = Popcorn( "#video" );
@@ -2694,40 +2690,36 @@ test( "Protected Names", function() {
   }
 
   Popcorn.forEach( keys, function( name ) {
-    try {
 
+    try {
       Popcorn.plugin( name, {} );
     } catch ( e ) {
-
       ok( name, "Attempting to overwrite '" + name + "' threw an exception " );
       plus();
     };
   });
 
   stop();
-
 });
 
-test("Defaulting Empty End Values", function() {
+test( "Defaulting Empty End Values", function() {
 
-  expect (2);
+  expect( 2 );
 
-  Popcorn.plugin("testdefault", {
+  Popcorn.plugin( "testdefault", {
     _setup: function( options ) {
       equals( options.end, Number.MAX_VALUE, "The end value defaulted to maximum number value");
     },
-    start: function(event, options) {
-
+    start: function( event, options ) {
     },
-    end: function(event, options) {
-
+    end: function( event, options ) {
     }
   });
 
   var popped = Popcorn( document.createElement( "audio" ) )
   .play()
   .testdefault({
-    start: 0, // seconds
+    start: 0,
     apikey: "CHAyhB5IisvLqqzGYNYbmA",
     mediaid: "13607892"
   });
@@ -2735,7 +2727,7 @@ test("Defaulting Empty End Values", function() {
   var popped2 = Popcorn( document.createElement( "video" ) )
   .play()
   .testdefault({
-    start: 0, // seconds
+    start: 0,
     apikey: "CHAyhB5IisvLqqzGYNYbmA",
     mediaid: "13607892"
   });
@@ -2799,16 +2791,16 @@ test( "In/Out aliases", function() {
   popcorn.play();
 });
 
-module("Popcorn TrackEvents");
-test("Functions", function() {
+module( "Popcorn TrackEvents" );
+test( "Functions", function() {
 
   //  TODO: break this into sep. units per function
   expect(19);
 
-  var popped = Popcorn("#video"), ffTrackId, rwTrackId, rw2TrackId, rw3TrackId, historyRef, trackEvents;
+  var popped = Popcorn( "#video" ), ffTrackId, rwTrackId, rw2TrackId, rw3TrackId, historyRef, trackEvents;
 
 
-  Popcorn.plugin("ff", function() {
+  Popcorn.plugin( "ff", function() {
     return {
       start: function() {},
       end: function() {}
@@ -2823,9 +2815,7 @@ test("Functions", function() {
 
   ffTrackId = popped.getLastTrackEventId();
 
-
-
-  Popcorn.plugin("rw", function() {
+  Popcorn.plugin( "rw", function() {
     return {
       start: function() {},
       end: function() {}
@@ -2842,51 +2832,44 @@ test("Functions", function() {
 
   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 ");
-
+  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 ");
+  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()" )
+  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");
-
+  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,
@@ -2895,30 +2878,26 @@ test("Functions", function() {
 
   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( 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");
+  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()" )
-
-
-
-
+  equals( trackEvents.length, 3, "3 user created trackEvents returned by popped.getTrackEvents()" );
 });
 
-test("getTrackEvent", function() {
+test( "getTrackEvent", function() {
 
   //  TODO: break this into sep. units per function
-  expect(5);
+  expect( 5 );
 
-  var popped = Popcorn("#video"),
+  var popped = Popcorn( "#video" ),
     trackIds = [], obj, oldId;
 
-  Popcorn.plugin("ff", function() {
+  Popcorn.plugin( "ff", function() {
     return {
       start: function() {},
       end: function() {}
@@ -2932,7 +2911,7 @@ test("getTrackEvent", function() {
 
   trackIds.push( popped.getLastTrackEventId() );
 
-  Popcorn.plugin("rw", function() {
+  Popcorn.plugin( "rw", function() {
     return {
       start: function() {},
       end: function() {}
@@ -2944,7 +2923,6 @@ test("getTrackEvent", function() {
     end: 2
   });
 
-
   trackIds.push( popped.getLastTrackEventId() );
 
   popped.rw({
@@ -2954,21 +2932,20 @@ test("getTrackEvent", function() {
 
   trackIds.push( popped.getLastTrackEventId() );
 
-  obj = popped.getTrackEvent( trackIds[0] );
+  obj = popped.getTrackEvent( trackIds[ 0 ] );
 
   equals( typeof obj  === "object", true, "getTrackEvent() returned an object" );
 
-  trackIds.forEach (function( id ) {
+  trackIds.forEach ( function( id ) {
     var trackEvent = popped.getTrackEvent( id );
-    equals( id, trackEvent._id, "returned the correct TrackEvent");
+    equals( id, trackEvent._id, "returned the correct TrackEvent" );
   });
 
-  oldId = trackIds[trackIds.length - 1];
+  oldId = trackIds[ trackIds.length - 1 ];
 
   popped.removeTrackEvent( oldId );
 
   equals( popped.getTrackEvent( oldId ), undefined,  "returned undefined when id is not found" );
-
 });
 
 
@@ -2993,7 +2970,7 @@ test( "Index Integrity (timeUpdate)", function() {
     hasrun = false,
     lastrun = false;
 
-  Popcorn.plugin("ff", function() {
+  Popcorn.plugin( "ff", function() {
     return {
       start: function() {
       },
@@ -3005,10 +2982,10 @@ test( "Index Integrity (timeUpdate)", function() {
 
   stop( 10000 );
 
-  equal( $pop.data.trackEvents.endIndex, 1, "$pop.data.trackEvents.endIndex is 1");
+  equal( $pop.data.trackEvents.endIndex, 1, "$pop.data.trackEvents.endIndex is 1" );
   plus();
 
-  equal( $pop.data.trackEvents.startIndex, 1, "$pop.data.trackEvents.startIndex is 1");
+  equal( $pop.data.trackEvents.startIndex, 1, "$pop.data.trackEvents.startIndex is 1" );
   plus();
 
   $pop.listen( "canplayall", function() {
@@ -3023,18 +3000,18 @@ test( "Index Integrity (timeUpdate)", 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");
+      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");
+      equal( $pop.data.trackEvents.endIndex, 2, "$pop.data.trackEvents.endIndex is 2 - after play, before removeTrackEvent" );
       plus();
 
-      $pop.removeTrackEvent("removeable-track-event");
+      $pop.removeTrackEvent( "removeable-track-event" );
 
       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");
+      equals( $pop.data.trackEvents.endIndex, 1, "$pop.data.trackEvents.endIndex is 1 - after removeTrackEvent" );
       plus();
 
     }).currentTime( 40 ).play();
@@ -3043,7 +3020,9 @@ test( "Index Integrity (timeUpdate)", function() {
 
 test( "Index Integrity (frameAnimation)", function() {
 
-  var $pop = Popcorn( "#video", { frameAnimation: true }),
+  var $pop = Popcorn( "#video", {
+         frameAnimation: true
+       }),
       count = 0,
       expects = 8;
 
@@ -3062,7 +3041,7 @@ test( "Index Integrity (frameAnimation)", function() {
     hasrun = false,
     lastrun = false;
 
-  Popcorn.plugin("ff", function() {
+  Popcorn.plugin( "ff", function() {
     return {
       start: function() {
       },
@@ -3071,13 +3050,12 @@ test( "Index Integrity (frameAnimation)", function() {
     };
   });
 
-
   stop( 10000 );
 
-  equal( $pop.data.trackEvents.endIndex, 1, "$pop.data.trackEvents.endIndex is 1");
+  equal( $pop.data.trackEvents.endIndex, 1, "$pop.data.trackEvents.endIndex is 1" );
   plus();
 
-  equal( $pop.data.trackEvents.startIndex, 1, "$pop.data.trackEvents.startIndex is 1");
+  equal( $pop.data.trackEvents.startIndex, 1, "$pop.data.trackEvents.startIndex is 1" );
   plus();
 
   $pop.listen( "canplayall", function() {
@@ -3092,16 +3070,16 @@ test( "Index Integrity (frameAnimation)", 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");
+      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");
+      equal( $pop.data.trackEvents.endIndex, 2, "$pop.data.trackEvents.endIndex is 2 - after play, before removeTrackEvent" );
       plus();
 
-      $pop.removeTrackEvent("removeable-track-event");
+      $pop.removeTrackEvent( "removeable-track-event" );
 
       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");
+      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();
@@ -3118,7 +3096,7 @@ test( "Popcorn.disable/enable/toggle (timeupdate)", function() {
 
   expect( expects );
 
-  $pop.currentTime(39).play();
+  $pop.currentTime( 39 ).play();
 
   function plus() {
     if ( ++count === expects ) {
@@ -3127,17 +3105,17 @@ test( "Popcorn.disable/enable/toggle (timeupdate)", function() {
     }
   }
 
-  Popcorn.plugin("toggler", function() {
+  Popcorn.plugin( "toggler", function() {
     return {
       start: function() {
-        var div = document.createElement("div");
+        var div = document.createElement( "div" );
         div.id = "toggler-test";
         div.innerHTML = "foo";
 
-        document.body.appendChild(div);
+        document.body.appendChild( div );
       },
       end: function() {
-        document.getElementById("toggler-test").parentNode.removeChild(document.getElementById("toggler-test"));
+        document.getElementById( "toggler-test" ).parentNode.removeChild( document.getElementById( "toggler-test" ) );
       }
     };
   });
@@ -3146,10 +3124,8 @@ test( "Popcorn.disable/enable/toggle (timeupdate)", function() {
 
     //  make sure toggler never happened
     // look for: "toggler-test"
-
-    ok( !document.getElementById("toggler-test"), "No toggler container, disabled toggler plugin correctly never ran" );
+    ok( !document.getElementById( "toggler-test" ), "No toggler container, disabled toggler plugin correctly never ran" );
     plus();
-
   });
 
   $pop.toggler({
@@ -3162,19 +3138,19 @@ test( "Popcorn.disable/enable/toggle (timeupdate)", function() {
   // Test per-instance function call
   $pop.disable( "toggler" );
 
-  ok( $pop.data.disabled.indexOf("toggler") > -1, "disable() plugin: toggler is disabled" );
+  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" );
+  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" );
+  ok( $pop.data.disabled.indexOf( "toggler" ) > -1, "toggle() plugin: toggler is disabled" );
   plus();
 
   stop( 10000 );
@@ -3182,18 +3158,16 @@ test( "Popcorn.disable/enable/toggle (timeupdate)", function() {
   $pop.currentTime( 39 ).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");
+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() {
+test( "Text Response", function() {
 
   var expects = 2,
       count = 0;
@@ -3204,25 +3178,24 @@ test("Text Response", function() {
     }
   }
 
-  expect(expects);
+  expect( expects );
 
   stop()
 
   Popcorn.xhr({
-    url: 'data/test.txt',
+    url: "data/test.txt",
     success: function( data ) {
 
-      ok(data, "xhr returns 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'");
+      equals( data.text, "This is a text test", "test.txt returns the string 'This is a text test'" );
       plus();
-
     }
   });
 });
 
-test("dataType: Text Response", function() {
+test( "dataType: Text Response", function() {
 
   var expects = 2,
       count = 0;
@@ -3233,27 +3206,26 @@ test("dataType: Text Response", function() {
     }
   }
 
-  expect(expects);
+  expect( expects );
 
   stop()
 
   Popcorn.xhr({
-    url: 'data/test.txt',
+    url: "data/test.txt",
     dataType: "text",
     success: function( data ) {
 
-      ok(data, "xhr returns 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'");
+      equals( data, "This is a text test", "dataType: 'text', test.txt returns the string 'This is a text test'" );
       plus();
-
     }
   });
 });
 
 
-test("JSON Response", function() {
+test( "JSON Response", function() {
 
   var expects = 2,
       count = 0;
@@ -3264,30 +3236,31 @@ test("JSON Response", function() {
     }
   }
 
-  expect(expects);
+  expect( expects );
 
   stop()
 
-
-  var testObj = { "data": {"lang": "en", "length": 25} };
+  var testObj = {
+        "data": {
+          "lang": "en",
+          "length": 25
+        }
+      };
 
   Popcorn.xhr({
-    url: 'data/test.js',
+    url: "data/test.js",
     success: function( data ) {
 
-      ok(data, "xhr returns data");
+      ok( data, "xhr returns data" );
       plus();
 
-
-      ok( QUnit.equiv(data.json, testObj) , "data.json returns an object of data");
+      ok( QUnit.equiv(data.json, testObj) , "data.json returns an object of data" );
       plus();
-
     }
   });
-
 });
 
-test("dataType: JSON Response", function() {
+test( "dataType: JSON Response", function() {
 
   var expects = 2,
       count = 0;
@@ -3298,34 +3271,34 @@ test("dataType: JSON Response", function() {
     }
   }
 
-  expect(expects);
+  expect( expects );
 
   stop()
 
-
-  var testObj = { "data": {"lang": "en", "length": 25} };
+  var testObj = {
+        "data": {
+          "lang": "en",
+          "length": 25
+        }
+      };
 
   Popcorn.xhr({
-    url: 'data/test.js',
+    url: "data/test.js",
     dataType: "json",
     success: function( data ) {
 
-      ok(data, "xhr returns data");
+      ok( data, "xhr returns data" );
       plus();
 
-
-      ok( QUnit.equiv(data, testObj) , "dataType: 'json',  data returns an object of data");
+      ok( QUnit.equiv( data, testObj ) , "dataType: 'json',  data returns an object of data" );
       plus();
-
     }
   });
-
 });
 
-
 if ( !/file/.test( location.protocol ) ) {
 
-  test("JSONP Response", function() {
+  test( "JSONP Response", function() {
 
     var expects = 8,
         count = 0;
@@ -3336,92 +3309,80 @@ if ( !/file/.test( location.protocol ) ) {
       }
     }
 
-    expect(expects);
-
-    stop(10000);
+    expect( expects );
 
+    stop( 10000 );
 
-    var testObj = { "data": {"lang": "en", "length": 25} };
+    var testObj = {
+          "data": {
+             "lang": "en",
+             "length": 25
+          }
+        };
 
     Popcorn.xhr({
 
-      url: 'data/jsonp.php?callback=jsonp',
-      dataType: 'jsonp',
+      url: "data/jsonp.php?callback=jsonp",
+      dataType: "jsonp",
       success: function( data ) {
 
-        ok(data, "getJSONP returns data");
+        ok( data, "getJSONP returns data" );
         plus();
 
-
-        ok( QUnit.equiv(data, testObj) , "Popcorn.xhr({}) data.json returns an object of data");
+        ok( QUnit.equiv(data, testObj) , "Popcorn.xhr({}) data.json returns an object of data" );
         plus();
-
       }
     });
 
     Popcorn.xhr.getJSONP(
-      'data/jsonp.php?callback=jsonp',
 
+      "data/jsonp.php?callback=jsonp",
       function( data ) {
 
-        ok(data, "getJSONP returns data");
+        ok( data, "getJSONP returns data" );
         plus();
-
-
-
-        ok( QUnit.equiv(data, testObj) , "Popcorn.xhr.getJSONP data.json returns an object of data");
+        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",
 
+      "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");
+        ok( data, "getJSONP returns flickr data" );
         plus();
-
-        equal( typeof data, "object", "getJSONP returns flickr data");
+        equal( typeof data, "object", "getJSONP returns flickr data" );
         plus();
-
-
       }
     );
 
     Popcorn.getJSONP(
-      'data/jsonp.php?callback=jsonp',
 
+      "data/jsonp.php?callback=jsonp",
       function( data ) {
 
-        ok(data, "getJSONP returns data");
+        ok( data, "getJSONP returns data" );
         plus();
-
-
-
-        ok( QUnit.equiv(data, testObj) , "Popcorn.xhr.getJSONP data.json returns an object of data");
+        ok( QUnit.equiv(data, testObj) , "Popcorn.xhr.getJSONP data.json returns an object of data" );
         plus();
-
       }
     );
   });
 
 } else {
-  test("JSONP Response", function() {
-
-    expect(1);
+  test( "JSONP Response", function() {
 
+    expect( 1 );
 
-    stop(10000);
-    ok(false, "jsonp requests require a webserver with php");
+    stop( 10000 );
+    ok( false, "jsonp requests require a webserver with php" );
     start();
   });
 }
 
-test("Popcorn.getScript()", function() {
+test( "Popcorn.getScript()", function() {
 
   var expects = 8,
       count = 0;
@@ -3429,15 +3390,14 @@ test("Popcorn.getScript()", function() {
   function plus() {
     if ( ++count === expects ) {
       start();
-      delete window["testFunction"];
+      delete window[ "testFunction" ];
     }
   }
 
-  expect(expects);
+  expect( expects );
 
   stop();
 
-
   Popcorn.xhr({
 
     url: "data/remoteA.js",
@@ -3446,44 +3406,32 @@ test("Popcorn.getScript()", function() {
 
     success: function() {
 
-      ok( true, "getScript A returned");
+      ok( true, "getScript A returned" );
       plus();
-
-
-
-      ok( Popcorn.AlphaLib, "Popcorn.xhr.getScript remoteA.js loaded: `Popcorn.AlphaLib` is available");
+      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");
+      ok( true, "getScript B returned" );
       plus();
-
-
-      ok( Popcorn.BetaLib , "Popcorn.getScript remoteB.js loaded: `Popcorn.BetaLib` is available ");
+      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");
+      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();
 

From dcbb09f1b46ae847d512029fae5a56eb6ea8d27a Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Thu, 6 Oct 2011 15:55:32 -0400
Subject: [PATCH 09/78] Fixed styling in core unit tests and unit tests html
 file

---
 test/popcorn.unit.js | 161 ++++++++++++++++++++-----------------------
 1 file changed, 76 insertions(+), 85 deletions(-)

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index d1c17dc01..94cf07e86 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -17,7 +17,7 @@ test( "Core", function() {
   try {
     ok( Popcorn, "Popcorn exists" );
     plus();
-  } catch (e) {};
+  } catch ( e ) {};
 
   try {
     ok( typeof Popcorn === "function", "Popcorn is a function" );
@@ -26,7 +26,7 @@ test( "Core", function() {
 
   try {
     Popcorn( function() {
-      ok (1, "Popcorn calls its function argument" );
+      ok( 1, "Popcorn calls its function argument" );
       plus();
     });
   } catch ( e ) {};
@@ -74,7 +74,7 @@ test( "Popcorn.* Static Methods", function() {
     equals( typeof Popcorn[ val ], "function" , "Popcorn." + val + "() is a provided static function" );
   });
 
-  substatics.forEach(function(val, idx) {
+  substatics.forEach( function( val, idx ) {
 
     equals( typeof Popcorn[ val ].ref, "function" , "Popcorn." + val + ".ref() is a private use static function" );
   });
@@ -110,7 +110,7 @@ test( "Popcorn.forEach", function() {
     count++;
   });
 
-  equal( count, Popcorn.sizeOf(object), Popcorn.sizeOf(object) + " properties in object" );
+  equal( count, Popcorn.sizeOf( object ), Popcorn.sizeOf( object ) + " properties in object" );
 });
 
 test( "Popcorn.version", function() {
@@ -257,7 +257,7 @@ test( "Popcorn.util.toSeconds" , function() {
 
 test("guid", function() {
 
-  expect(6);
+  expect( 6 );
 
   var count = 3,
       guids = [],
@@ -273,7 +273,7 @@ test("guid", function() {
       ok( temp, "Popcorn.guid() returns value" );
     }
 
-    guids.push(temp);
+    guids.push( temp );
   }
 
   guids = [];
@@ -288,9 +288,8 @@ test("guid", function() {
       ok( temp, "Popcorn.guid( 'pre' ) returns value" );
     }
 
-    guids.push(temp);
+    guids.push( temp );
   }
-
 });
 test( "isArray", function() {
 
@@ -326,7 +325,6 @@ test( "isArray", function() {
   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 );
@@ -2795,7 +2793,7 @@ module( "Popcorn TrackEvents" );
 test( "Functions", function() {
 
   //  TODO: break this into sep. units per function
-  expect(19);
+  expect( 19 );
 
   var popped = Popcorn( "#video" ), ffTrackId, rwTrackId, rw2TrackId, rw3TrackId, historyRef, trackEvents;
 
@@ -3432,10 +3430,10 @@ test( "Popcorn.getScript()", 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");
+      ok( ( "has" in window ) , "Popcorn.getScript https://github.com/rwldrn/has.js/raw/master/has.js loaded: `has` is available" );
       plus();
 
-      delete window["has"];
+      delete window[ "has" ];
     }
   );
 
@@ -3455,7 +3453,7 @@ test( "Popcorn.getScript()", function() {
 });
 
 
-test("XML Response", function() {
+test( "XML Response", function() {
 
   var expects = 2,
       count = 0;
@@ -3466,31 +3464,29 @@ test("XML Response", function() {
     }
   }
 
-  expect(expects);
+  expect( expects );
 
   stop()
 
 
   Popcorn.xhr({
-    url: 'data/test.xml',
+    url: "data/test.xml",
     success: function( data ) {
 
-      ok(data, "xhr returns 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");
+      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");
+      equals( data.xml.toString(), xml.toString(), "data.xml returns a document of xml" );
       plus();
-
     }
   });
-
 });
 
-test("dataType: XML Response", function() {
+test( "dataType: XML Response", function() {
 
   var expects = 2,
       count = 0;
@@ -3501,29 +3497,24 @@ test("dataType: XML Response", function() {
     }
   }
 
-  expect(expects);
-
+  expect( expects );
   stop()
 
-
   Popcorn.xhr({
-    url: 'data/test.xml',
+    url: "data/test.xml",
     dataType: "xml",
     success: function( data ) {
 
-      ok(data, "xhr returns 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");
-
+      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");
+      equals( data.toString(), xml.toString(), "dataType: 'xml', data.xml returns a document of xml" );
       plus();
-
     }
   });
-
 });
 
 module( "Popcorn Player" );
@@ -3550,17 +3541,20 @@ test( "Base player functionality", function() {
 
   //QUnit.reset();
 
-  var p2 = Popcorn.baseplayer( '#video' ),
+  var p2 = Popcorn.baseplayer( "#video" ),
       expects = 12,
-      count   = 0,
+      count = 0,
       execCount = 0,
       // These make sure events are only fired once
       // any second call will produce a failed test
-      forwardStart  = false,
-      forwardEnd    = false,
+      forwardStart = false,
+      forwardEnd = false,
       backwardStart = false,
-      backwardEnd   = false,
-      wrapperRunning = { one: false, two: false, };
+      backwardEnd = false,
+      wrapperRunning = {
+        one: false,
+        two: false
+      };
 
   function plus() {
     if ( ++count === expects ) {
@@ -3594,7 +3588,7 @@ test( "Base player functionality", function() {
 
           options.endFired = true;
           forwardEnd = !forwardEnd;
-          p2.currentTime(1).play();
+          p2.currentTime( 1 ).play();
           ok( forwardEnd, "forward's end fired" );
           plus();
         }
@@ -3615,7 +3609,7 @@ test( "Base player functionality", function() {
 
           options.startFired = true;
           backwardStart = !backwardStart;
-          p2.currentTime(0).play();
+          p2.currentTime( 0 ).play();
           ok( true, "backward's start fired" );
           plus();
         }
@@ -3710,16 +3704,16 @@ test( "Base player functionality", function() {
     }
   });
 
-  p2.currentTime(3).play();
+  p2.currentTime( 3 ).play();
 });
 
-module("Popcorn Parser");
+module( "Popcorn Parser" );
 
-test("Parsing Functions", function() {
+test( "Parsing Functions", function() {
 
   var expects = 3,
       count = 0,
-      popperly = Popcorn("#video");
+      popperly = Popcorn( "#video" );
 
   function plus() {
     if ( ++count === expects ) {
@@ -3727,26 +3721,25 @@ test("Parsing Functions", function() {
     }
   }
 
-  expect(expects);
+  expect( expects );
 
   stop( 10000 );
 
-  ok(typeof Popcorn.parser === "function", "Popcorn.parser is a function");
+  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");
+  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");
+  ok( typeof popperly.parseJSON().parseJSON("data/test.js").parseJSON === "function" , "parseJSON function is chainable" );
   plus();
-
 });
 
-test("Parsing Integrity", function() {
+test( "Parsing Integrity", function() {
 
   var expects = 6,
       count = 0,
@@ -3761,46 +3754,44 @@ test("Parsing Integrity", function() {
     }
   }
 
-  expect(expects);
+  expect( expects );
 
   stop( 10000 );
 
   Popcorn.parser( "parseJSON2", function( data ){
-    ok( typeof data.json === "object", "data.json exists");
+    ok( typeof data.json === "object", "data.json exists" );
     plus();
     return data.json;
   });
 
   Popcorn.parser( "parseJSON3" , "json", function( data ){
-    ok( typeof data === "object", "data exists");
+    ok( typeof data === "object", "data exists" );
     plus();
     return data;
   });
 
-  Popcorn.plugin("parserTest", {
+  Popcorn.plugin( "parserTest", {
 
     start: function() {
-      ok(true, "parserTest started");
+      ok( true, "parserTest started" );
       plus();
     },
     end: function() {
-      ok(true, "parserTest ended");
+      ok( true, "parserTest ended" );
       plus();
     }
   });
 
-  poppercore.parseJSON2("data/parserData.json", function() {
+  poppercore.parseJSON2( "data/parserData.json", function() {
 
-    poppercore.parseJSON3("data/parserData.json", function() {
-      poppercore.currentTime(5).play();
+    poppercore.parseJSON3( "data/parserData.json", function() {
+      poppercore.currentTime( 5 ).play();
     });
-
   });
-
 });
 
 
-test("Parsing Handler - References unavailable plugin", function() {
+test( "Parsing Handler - References unavailable plugin", function() {
 
   var expects = 1,
       count = 0,
@@ -3817,7 +3808,7 @@ test("Parsing Handler - References unavailable plugin", function() {
     }
   }
 
-  expect(expects);
+  expect( expects );
 
   stop();
 
@@ -3826,20 +3817,18 @@ test("Parsing Handler - References unavailable plugin", function() {
     return data.json;
   });
 
-  poppercore.parseJson("data/parseMissing.json");
+  poppercore.parseJson( "data/parseMissing.json" );
 
   // interval used to wait for data to be parsed
   interval = setInterval( function() {
-    poppercore.currentTime(5).play().currentTime(6);
+    poppercore.currentTime( 5 ).play().currentTime( 6 );
 
     ok( true, "Ignored call to missing plugin " );
     plus();
-
-  }, 2000);
-
+  }, 2000 );
 });
 
-module("Audio");
+module( "Audio" );
 test( "Basic Audio Support (timeupdate)", function() {
 
   var popped = Popcorn( "#audio" ),
@@ -3911,8 +3900,12 @@ test( "Basic Audio Support (timeupdate)", function() {
 
 test( "Basic Audio Support (frameAnimation)", function() {
 
-  var popped = Popcorn( "#audio", { frameAnimation: true }),
-      popObj = Popcorn( document.getElementById( "audio" ), { frameAnimation: true }),
+  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;
@@ -3978,7 +3971,7 @@ test( "Basic Audio Support (frameAnimation)", function() {
   });
 });
 
-test("Parser Support", function() {
+test( "Parser Support", function() {
 
   var expects = 3,
       count = 0,
@@ -3994,18 +3987,17 @@ test("Parser Support", function() {
     }
   }
 
-  expect(expects);
-  stop(5000);
-
+  expect( expects );
+  stop( 5000 );
 
-  Popcorn.plugin("testAudioParser", {
+  Popcorn.plugin( "testAudioParser", {
 
     start: function() {
-      ok(true, "testAudioParser started: " + Math.round(this.currentTime()) );
+      ok( true, "testAudioParser started: " + Math.round( this.currentTime() ) );
       plus();
     },
     end: function() {
-      ok(true, "testAudioParser ended: " + Math.round(this.currentTime()) );
+      ok( true, "testAudioParser ended: " + Math.round( this.currentTime() ) );
       plus();
     }
   });
@@ -4016,20 +4008,19 @@ test("Parser Support", function() {
     return data.json;
   });
 
-  audiocorn.parseAudio("data/parserAudio.json", function() {
-
-    audiocorn.currentTime(4).play();
+  audiocorn.parseAudio( "data/parserAudio.json", function() {
 
+    audiocorn.currentTime( 4 ).play();
   });
 });
 
-module("Popcorn Test Runner End");
-test("Last Check", 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");
+    $( "iframe[data-src]" ).attr( "src", function() {
+      return $( this ).data( "src" );
     });
-    ok( true, "iframe tests run");
+    ok( true, "iframe tests run" );
   })( jQuery );
 });

From 7cdfafb1cd8b5fd3139a26e03333dc94ee6f8bb6 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Fri, 7 Oct 2011 13:54:54 -0400
Subject: [PATCH 10/78] fixes, as per review

---
 players/vimeo/popcorn.vimeo.html    | 34 +++++------
 players/vimeo/popcorn.vimeo.js      | 33 +++++++----
 players/vimeo/popcorn.vimeo.unit.js | 87 +++++++++++++++--------------
 3 files changed, 82 insertions(+), 72 deletions(-)

diff --git a/players/vimeo/popcorn.vimeo.html b/players/vimeo/popcorn.vimeo.html
index 63f0a9089..d646378ab 100644
--- a/players/vimeo/popcorn.vimeo.html
+++ b/players/vimeo/popcorn.vimeo.html
@@ -99,22 +99,22 @@
                     .footnote({
                       start: 5, // seconds
                       end: 40, // seconds
-                      text: 'The video is "RiP: A Remix Manifesto", by Brett Gaylor',
-                      target: 'footnotediv'
+                      text: "The video popcorn being popped.",
+                      target: "footnotediv"
                     })
                     .flickr({
                       start: 20, // seconds
                       end: 40, // seconds
-                      tags: 'georgia',
-                      numberofimages: '8',
-                      target: 'flickrdiv'
+                      tags: "georgia",
+                      numberofimages: "8",
+                      target: "flickrdiv"
                     })
                     .twitter({
                       start: 20, // seconds
                       end: 45, // seconds
-                      title: 'Oil Spill',
-                      src: '#oilspill',
-                      target: 'twitterdiv'
+                      title: "Oil Spill",
+                      src: "#oilspill",
+                      target: "twitterdiv"
                     })
                     .attribution({
                       start: 5, // seconds
@@ -124,21 +124,21 @@
                       copyrightholder:"The Computer Chronicles",
                       license:"CC-BY-NC-ND",
                       licenseurl: "http://creativecommons.org/licenses/by-nc-nd/2.0/",
-                      target: 'attribdiv'
+                      target: "attribdiv"
                     })
                     .subtitle({
                       start: 5, // seconds
                       end: 15, // seconds
-                      text: 'This is overlaid on top of the video. You can hightlight it!',
-                      display: 'inline',
+                      text: "This is overlaid on top of the video. You can hightlight it!",
+                      display: "inline",
                       language: "en"
                     })
                     .webpage({
                       id: "webpages-a",
                       start: 0, // seconds
                       end: 15, // seconds
-                      src: 'http://webmademovies.org/',
-                      target: 'webpagediv'
+                      src: "http://webmademovies.org/",
+                      target: "webpagediv"
                     })
                     .googlefeed({
                         start: 0, // seconds
@@ -151,9 +151,9 @@
                     .image({
                       start: 5, // seconds
                       end: 15, // seconds
-                      href: 'http://www.drumbeat.org/',
-                      src: 'https://www.drumbeat.org/media//images/drumbeat-logo-splash.png',
-                      target: 'imagediv'
+                      href: "http://www.drumbeat.org/",
+                      src: "https://www.drumbeat.org/media//images/drumbeat-logo-splash.png",
+                      target: "imagediv"
                     });
                     player.listen( "load", function() {
                       //console.log( "asdfasdf" );
@@ -198,7 +198,7 @@ <h3>Description</h3>
             </p>
             <h4>Expected Events</h4>
             <ul>
-              <li>From 5 to 40 seconds, the footnote 'The video is "RiP: A Remix Manifesto", by Brett Gaylor' will appear below 'Footnote Area'.</li>
+              <li>From 5 to 40 seconds, the footnote 'The video is popcorn being Popped' will appear below 'Footnote Area'.</li>
               <li>From 20 to 40 seconds, the a flickr stream of 8 images  tagged 'georgia' will appear below 'Flickr Area'.</li>
               <li>From 20 to 45 seconds, tweets tagged #oilspill will appear below 'Twitter Area'.</li>
               <li>From 5 to 60 seconds, the Creative Commons license will appear below 'Attributions Area'.</li>
diff --git a/players/vimeo/popcorn.vimeo.js b/players/vimeo/popcorn.vimeo.js
index 5f73eb6f8..5f418651a 100644
--- a/players/vimeo/popcorn.vimeo.js
+++ b/players/vimeo/popcorn.vimeo.js
@@ -95,10 +95,10 @@
 
           var volumeUpdate = function() {
 
-            m = isMuted();
+            var muted = isMuted(),
             vol = vimeoObject.api_getVolume();
-            if ( lastMuted !== m ) {
-              lastMuted = m;
+            if ( lastMuted !== muted ) {
+              lastMuted = muted;
               media.dispatchEvent( "volumechange" );
             }
 
@@ -110,10 +110,6 @@
             setTimeout( volumeUpdate, 250 );
           };
 
-          var mute = function() {
-
-          };
-
           media.play = function() {
             media.paused = false;
             media.dispatchEvent( "play" );
@@ -136,38 +132,50 @@
           Popcorn.player.defineProperty( media, "currentTime", {
 
             set: function( val ) {
+
               if ( !val ) {
                 return currentTime;
               }
+
               currentTime = seekTime = +val;
               seeking = true;
+
               media.dispatchEvent( "seeked" );
               media.dispatchEvent( "timeupdate" );
               vimeoObject.api_seekTo( currentTime );
+
               return currentTime;
             },
+
             get: function() {
+
               return currentTime;
             }
           });
 
           Popcorn.player.defineProperty( media, "muted", {
+
             set: function( val ) {
+
               if ( isMuted() !== val ) {
+
                 if ( val ) {
                   toggleMuteVolume = vimeoObject.api_getVolume();
                   vimeoObject.api_setVolume( 0 );
                 } else {
+
                   vimeoObject.api_setVolume( toggleMuteVolume );
                 }
               }
             },
             get: function() {
+
               return isMuted();
             }
           });
 
           Popcorn.player.defineProperty( media, "volume", {
+
             set: function( val ) {
 
               if ( !val || typeof val !== "number" || ( val < 0 && val > 1 ) ) {
@@ -183,6 +191,7 @@
               return vimeoObject.api_getVolume();
             },
             get: function() {
+
               return vimeoObject.api_getVolume();
             }
           });
@@ -194,12 +203,14 @@
           volumeUpdate();
 
           media.dispatchEvent( "loadeddata" );
-        }
+        };
 
         function extractId( videoUrl ) {
+
           if ( !videoUrl ) {
             return;
           }
+
           var rPlayerUri = /^http:\/\/player\.vimeo\.com\/video\/[\d]+/i,
               rWebUrl = /vimeo\.com\/[\d]+/;
 
@@ -208,6 +219,7 @@
         }
 
         if ( !( src = extractId( src ) ) ) {
+
           throw "Invalid Video Id";
         }
 
@@ -229,16 +241,13 @@
                             media.offsetWidth + "", media.offsetHeight + "", "9.0.0", "expressInstall.swf",
                             flashvars, params, attributes );
 
-        vimeoContainer.addEventListener( "load", function() {
-          console.log("asdfasdf");
-        });
-
       };
 
       if ( !window.swfobject ) {
 
         Popcorn.getScript( "http://ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js", vimeoInit );
       } else {
+
         vimeoInit();
       }
     }
diff --git a/players/vimeo/popcorn.vimeo.unit.js b/players/vimeo/popcorn.vimeo.unit.js
index 194012337..3466cfb48 100644
--- a/players/vimeo/popcorn.vimeo.unit.js
+++ b/players/vimeo/popcorn.vimeo.unit.js
@@ -1,10 +1,10 @@
-test("Update Timer", function () {
+test( "Update Timer", function() {
 
   QUnit.reset();
 
   var p2 = Popcorn.vimeo( "#player_1", "http://player.vimeo.com/video/6960892" ),
       expects = 12,
-      count   = 0,
+      count = 0,
       execCount = 0,
       // These make sure events are only fired once
       // any second call will produce a failed test
@@ -29,9 +29,9 @@ test("Update Timer", function () {
   // These tests come close to 10 seconds on chrome, increasing to 15
   stop();
 
-  Popcorn.plugin( "forwards", function () {
+  Popcorn.plugin( "forwards", function() {
     return {
-      start: function ( event, options ) {
+      start: function( event, options ) {
 
         if ( !options.startFired ) {
 
@@ -41,13 +41,13 @@ test("Update Timer", function () {
           plus();
         }
       },
-      end: function ( event, options ) {
+      end: function( event, options ) {
 
         if ( !options.endFired ) {
 
           options.endFired = true;
           forwardEnd = !forwardEnd;
-          p2.currentTime(1).play();
+          p2.currentTime( 1 ).play();
           ok( forwardEnd, "forward's end fired" );
           plus();
         }
@@ -60,9 +60,9 @@ test("Update Timer", function () {
     end: 4
   });
 
-  Popcorn.plugin( "backwards", function () {
+  Popcorn.plugin( "backwards", function() {
     return {
-      start: function ( event, options ) {
+      start: function( event, options ) {
 
         if ( !options.startFired ) {
 
@@ -72,7 +72,7 @@ test("Update Timer", function () {
           plus();
         }
       },
-      end: function ( event, options ) {
+      end: function( event, options ) {
 
         if ( !options.endFired ) {
 
@@ -92,11 +92,11 @@ test("Update Timer", 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;
     }
@@ -167,23 +167,25 @@ test("Update Timer", function () {
     p2.play();
   });
 
-  p2.currentTime(3);
+  p2.currentTime( 3 );
 
 });
 
-test("Plugin Factory", function () {
+test( "Plugin Factory", function() {
 
   QUnit.reset();
 
   var popped = Popcorn.vimeo( "#player_1", "http://player.vimeo.com/video/6960892" ),
       methods = "load play pause currentTime mute volume roundTime exec removePlugin",
-      expects = 34, // 15*2+2+2. executor/complicator each do 15
+
+      // 15*2+2+2. executor/complicator each do 15
+      expects = 34,
       count = 0;
 
   function plus() {
     if ( ++count == expects ) {
-      Popcorn.removePlugin("executor");
-      Popcorn.removePlugin("complicator");
+      Popcorn.removePlugin( "executor" );
+      Popcorn.removePlugin( "complicator" );
       popped.pause();
       start();
     }
@@ -192,16 +194,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();
@@ -209,20 +211,20 @@ test("Plugin Factory", function () {
 
         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" );
+        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" );
+        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" )
+        ok( Object.prototype.toString.call( popped.data.trackEvents ) === "[object Object]", "executor trackEvents property is an object" )
         plus();
       },
-      end: function () {
+      end: function() {
 
       }
     };
@@ -239,15 +241,15 @@ test("Plugin Factory", function () {
     end: 2
   });
 
-  Popcorn.plugin("complicator", {
+  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();
@@ -255,25 +257,24 @@ test("Plugin Factory", function () {
 
       ok( "media" in this, "complicator instance has `media` property" );
       plus();
-      ok( Object.prototype.toString.call(popped.media) === "[object Object]", "video property is a HTMLVideoElement" );
+      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" );
+      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" )
+      ok( Object.prototype.toString.call( popped.data.trackEvents ) === "[object Object]", "complicator trackEvents property is an object" )
       plus();
     },
-    end: function () {
-
-      //start();
+    end: function() {
 
     },
-    timeupdate: function () {
+    timeupdate: function() {
+
     }
   });
 
@@ -287,12 +288,12 @@ test("Plugin Factory", function () {
     end: 5
   });
 
-  popped.currentTime(0).play();
+  popped.currentTime( 0 ).play();
 
 });
 
 test( "Popcorn vimeo Plugin Url and Duration Tests", function() {
-  function plus(){
+  function plus() {
     if ( ++count == expects ) {
       popcorn.pause();
       start();
@@ -329,13 +330,13 @@ test( "Popcorn vimeo Plugin Url Regex Test", function() {
   QUnit.reset();
 
   var urlTests = [
-    { name: 'standard',
-      url: 'http://player.vimeo.com/video/6960892',
-      expected: 'http://player.vimeo.com/video/6960892',
+    { name: "standard",
+      url: "http://player.vimeo.com/video/6960892",
+      expected: "http://player.vimeo.com/video/6960892",
     },
-    { name: 'short url',
-      url: 'http://vimeo.com/6960892',
-      expected: 'http://vimeo.com/6960892',
+    { name: "short url",
+      url: "http://vimeo.com/6960892",
+      expected: "http://vimeo.com/6960892",
     }
   ];
 
@@ -348,11 +349,11 @@ test( "Popcorn vimeo Plugin Url Regex Test", function() {
   Popcorn.forEach( urlTests, function( values, key ) {
 
     var urlTest = urlTests[ key ],
-        popcorn = Popcorn.vimeo( '#player_2', urlTest.url );
+        popcorn = Popcorn.vimeo( "#player_2", urlTest.url );
 
     popcorn.listen( "loadeddata", function() {
 
-      equals( popcorn.media.src, urlTest.expected, 'Video id is correct for ' + urlTest.name + ': ' + urlTest.url );
+      equals( popcorn.media.src, urlTest.expected, "Video id is correct for " + urlTest.name + ": " + urlTest.url );
       popcorn.pause();
 
       count++;

From 6a3820e18b15391e89f659f84d8c80dec9d77ab6 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Wed, 12 Oct 2011 10:03:22 -0400
Subject: [PATCH 11/78] Fixed some styling concerns from review

---
 test/popcorn.unit.js | 264 +++++++++++++++++++++----------------------
 1 file changed, 127 insertions(+), 137 deletions(-)

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 94cf07e86..4e1db9595 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -53,7 +53,7 @@ test( "noConflict", function() {
   Popcorn = $$;
 });
 
-test( "isSupported", function () {
+test( "isSupported", function() {
 
   expect( 2 );
 
@@ -69,14 +69,14 @@ test( "Popcorn.* Static Methods", function() {
 
   expect( statics.length + substatics.length );
 
-  statics.forEach( function( val, idx ) {
+  statics.forEach(function( val, idx ) {
 
-    equals( typeof Popcorn[ val ], "function" , "Popcorn." + val + "() is a provided static function" );
+    equal( typeof Popcorn[ val ], "function" , "Popcorn." + val + "() is a provided static function" );
   });
 
-  substatics.forEach( function( val, idx ) {
+  substatics.forEach(function( val, idx ) {
 
-    equals( typeof Popcorn[ val ].ref, "function" , "Popcorn." + val + ".ref() is a private use static function" );
+    equal( typeof Popcorn[ val ].ref, "function" , "Popcorn." + val + ".ref() is a private use static function" );
   });
 });
 
@@ -242,7 +242,7 @@ test( "Popcorn.util.toSeconds" , function() {
     );
 
     areEquivalent = equivalentTimes( storedStartTime, currentPeriod.correctStartTime );
-    equals( areEquivalent, true, message );
+    equal( areEquivalent, true, message );
 
     message = logMessage(
       endTimeStr,
@@ -251,11 +251,11 @@ test( "Popcorn.util.toSeconds" , function() {
     );
 
     areEquivalent = equivalentTimes( storedEndTime, currentPeriod.correctEndTime ) ;
-    equals( areEquivalent, true, message );
+    equal( areEquivalent, true, message );
   }
 });
 
-test("guid", function() {
+test( "guid", function() {
 
   expect( 6 );
 
@@ -307,7 +307,7 @@ test( "isArray", function() {
 
   all = [ [], [ 1 ], new Array, Array( 0 ), "abc".match( /(a)/g ), slow, slowSmall ];
 
-  all.forEach( function( a ) {
+  all.forEach(function( a ) {
     ok( Popcorn.isArray( a ), "Popcorn.isArray(" + JSON.stringify( a ) + ")" );
   });
 
@@ -337,7 +337,7 @@ test( "Protected from removal", function() {
 
   expect( Popcorn.protect.natives.length * 2 );
 
-  Popcorn.protect.natives.forEach( function( name ) {
+  Popcorn.protect.natives.forEach(function( name ) {
 
     try {
       Popcorn.plugin( name );
@@ -456,7 +456,7 @@ test( "roundTime", function() {
 
   popped.play().pause().currentTime( 0.98 );
 
-  equals( 1, popped.roundTime(), ".roundTime() returns 1 when currentTime is 0.98s" );
+  equal( 1, popped.roundTime(), ".roundTime() returns 1 when currentTime is 0.98s" );
 });
 
 
@@ -475,9 +475,9 @@ test( "exec", function() {
   function plus(){
     if ( ++count == expects ) {
 
-      setTimeout( function() {
+      setTimeout(function() {
 
-        equals( loop, expects, "exec callback repeat check, only called twice" );
+        equal( loop, expects, "exec callback repeat check, only called twice" );
         Popcorn.removePlugin( popped, "exec" );
         start();
 
@@ -702,7 +702,7 @@ test( "Popcorn.events", function() {
       len,
       okay = true;
 
-  eventTypes.forEach ( function( e ) {
+  eventTypes.forEach (function( e ) {
     ok( Popcorn.Events[ e ], e + " Exists" )
   });
 
@@ -717,8 +717,8 @@ test( "Popcorn.events", function() {
 
   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" );
+  equal( typeof Popcorn.Events.Natives, "string", "Popcorn.Events.Natives is a string" );
+  equal( typeof Popcorn.events, "object", "Popcorn.events is an object" );
 
   Popcorn.forEach( eventsReturned, function( e ) {
     ok( Popcorn.events.isNative ( e ), e + " is a native event" );
@@ -869,7 +869,7 @@ test( "Popcorn.locale object", function() {
     plus();
   });
 
-  deepEqual( Popcorn.locale.get(), stub, "Popcorn.locale.get() === navigator.language (" +  JSON.stringify(stub) +  ") whenever possible" );
+  deepEqual( Popcorn.locale.get(), stub, "Popcorn.locale.get() === navigator.language (" +  JSON.stringify( stub ) +  ") whenever possible" );
   plus();
 
   Popcorn.forEach( Popcorn.locale.get(), function( val, prop ) {
@@ -945,8 +945,8 @@ test( "position", function() {
   ];
 
   Popcorn.forEach( tests, function( test ) {
-    equals( Popcorn( "#vid-" + test.id ).position().top,  test.top,  "Popcorn('#vid-" + test.id + "').position().top" );
-    equals( Popcorn( "#vid-" + test.id ).position().left, test.left, "Popcorn('#vid-" + test.id + "').position().left" );
+    equal( Popcorn( "#vid-" + test.id ).position().top,  test.top,  "Popcorn( '#vid-" + test.id + "' ).position().top" );
+    equal( Popcorn( "#vid-" + test.id ).position().left, test.left, "Popcorn( '#vid-" + test.id + "' ).position().left" );
   });
 
   tests = [
@@ -963,8 +963,8 @@ test( "position", function() {
   ];
 
   Popcorn.forEach( tests, function( test ) {
-    equals( Popcorn( "#vid-" + test.id ).position().top,  test.top,  "Popcorn('#vid-" + test.id + "').position().top" );
-    equals( Popcorn( "#vid-" + test.id ).position().left, test.left, "Popcorn('#vid-" + test.id + "').position().left" );
+    equal( Popcorn( "#vid-" + test.id ).position().top,  test.top,  "Popcorn( '#vid-" + test.id + "' ).position().top" );
+    equal( Popcorn( "#vid-" + test.id ).position().left, test.left, "Popcorn( '#vid-" + test.id + "' ).position().left" );
   });
 
   tests = [
@@ -981,8 +981,8 @@ test( "position", function() {
   ];
 
   Popcorn.forEach( tests, function( test ) {
-    equals( Popcorn( "#vid-" + test.id ).position().top,  test.top,  "Popcorn('#vid-" + test.id + "').position().top" );
-    equals( Popcorn( "#vid-" + test.id ).position().left, test.left, "Popcorn('#vid-" + test.id + "').position().left" );
+    equal( Popcorn( "#vid-" + test.id ).position().top,  test.top,  "Popcorn('#vid-" + test.id + "').position().top" );
+    equal( Popcorn( "#vid-" + test.id ).position().left, test.left, "Popcorn('#vid-" + test.id + "').position().left" );
   });
 
   tests = [
@@ -1009,8 +1009,8 @@ test( "position", function() {
   ];
 
   Popcorn.forEach( tests, function( test ) {
-    equals( Popcorn( "#vid-" + test.id ).position().top,  test.top,  "Popcorn('#vid-" + test.id + "').position().top" );
-    equals( Popcorn( "#vid-" + test.id ).position().left, test.left, "Popcorn('#vid-" + test.id + "').position().left" );
+    equal( Popcorn( "#vid-" + test.id ).position().top,  test.top,  "Popcorn( '#vid-" + test.id + "' ).position().top" );
+    equal( Popcorn( "#vid-" + test.id ).position().left, test.left, "Popcorn( '#vid-" + test.id + "' ).position().left" );
   });
 
   try {
@@ -1105,7 +1105,7 @@ test( "Stored By Type", function() {
 
     if ( ++count === 4 ) {
 
-      equals( fired, wants, "Number of callbacks fired from 1 handler" );
+      equal( fired, wants, "Number of callbacks fired from 1 handler" );
 
       p.unlisten( "play" );
 
@@ -1173,7 +1173,6 @@ test( "Simulated", function() {
 
   stop( 10000 );
 
-
   Setup.events.forEach(function( name ) {
     p.listen( name, function( event ) {
 
@@ -1209,7 +1208,6 @@ test( "Real", function() {
 
   stop( 10000 );
 
-
   [ "play", "pause", "volumechange", "seeking", "seeked" ].forEach(function( name ) {
 
     p.listen( name, function( event ) {
@@ -1299,19 +1297,19 @@ test( "Manifest", function() {
   }
 
   stop( 10000 );
-  Popcorn.plugin( "footnote" , function(){
+  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" );
+          equal( 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" );
+          equal( options.target, "text-container", "Uses manifest target by default" );
           plus();
           run++;
         }
@@ -1373,7 +1371,7 @@ test( "Configurable Defaults", function() {
     if ( ++count === expects ) {
       start();
 
-      [ "configurable", "multiconfig", "overridden" ].forEach( function( val ) {
+      [ "configurable", "multiconfig", "overridden" ].forEach(function( val ) {
         Popcorn.removePlugin( val );
         delete Popcorn.manifest[ val ];
       });
@@ -1589,7 +1587,7 @@ test( "Start Zero Immediately", function() {
   });
 
   $pop.zero({
-    start:0,
+    start: 0,
     end: 2
   });
 });
@@ -2041,7 +2039,7 @@ test( "Plugin Factory", 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();
         });
@@ -2068,7 +2066,7 @@ test( "Plugin Factory", function () {
 
   ok( "executor" in popped, "executor plugin is now available to instance" );
   plus();
-  equals( Popcorn.registry.length, 1, "One item in the registry" );
+  equal( Popcorn.registry.length, 1, "One item in the registry" );
   plus();
 
   popped.executor({
@@ -2083,7 +2081,7 @@ test( "Plugin Factory", 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, "complicator instance has method: " + k );
         plus();
       });
@@ -2112,7 +2110,7 @@ test( "Plugin Factory", function () {
 
   ok( "complicator" in popped, "complicator plugin is now available to instance" );
   plus();
-  equals( Popcorn.registry.length, 2, "Two items in the registry" );
+  equal( Popcorn.registry.length, 2, "Two items in the registry" );
   plus();
 
   popped.complicator({
@@ -2240,57 +2238,57 @@ test( "Popcorn Compose", function() {
 
   effectTrackThree = popped.getLastTrackEventId();
 
-  equals( test.one.running, 0, "no compose one running" );
+  equal( test.one.running, 0, "no compose one running" );
   plus();
-  equals( test.one.setup, 5, "five compose one setup" );
+  equal( test.one.setup, 5, "five compose one setup" );
   plus();
-  equals( test.two.running, 0, "no compose two running" );
+  equal( test.two.running, 0, "no compose two running" );
   plus();
-  equals( test.two.setup, 3, "three compose two setup" );
+  equal( 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" );
+    equal( test.one.running, 1, "one compose running" );
    plus();
-   equals( test.two.running, 1, "one effect running" );
+   equal( test.two.running, 1, "one effect running" );
    plus();
   })
   .exec( 1, function() {
-    equals( test.one.running, 0, "no compose running" );
+    equal( test.one.running, 0, "no compose running" );
     plus();
-    equals( test.two.running, 0, "no effect running" );
+    equal( test.two.running, 0, "no effect running" );
     plus();
   })
   .exec( 2, function() {
-    equals( test.one.running, 1, "one compose running" );
+    equal( test.one.running, 1, "one compose running" );
     plus();
-    equals( test.two.running, 0, "no effect running" );
+    equal( test.two.running, 0, "no effect running" );
     plus();
   })
   .exec( 3, function() {
-    equals( test.one.running, 2, "two compose one running" );
+    equal( test.one.running, 2, "two compose one running" );
     plus();
-    equals( test.two.running, 1, "one compose two running" );
+    equal( test.two.running, 1, "one compose two running" );
     plus();
   })
   .exec( 4, function() {
-    equals( test.one.running, 0, "no compose one running" );
+    equal( test.one.running, 0, "no compose one running" );
     plus();
-    equals( test.two.running, 0, "no compose two running" );
+    equal( test.two.running, 0, "no compose two running" );
     plus();
   })
   .exec( 5, function() {
-    equals( test.one.running, 1, "one effect running" );
+    equal( test.one.running, 1, "one effect running" );
     plus();
-    equals( test.two.running, 0, "no compose running" );
+    equal( test.two.running, 0, "no compose running" );
     plus();
   })
   .exec( 6, function() {
-    equals( test.one.running, 1, "one effect one running" );
+    equal( test.one.running, 1, "one effect one running" );
     plus();
-    equals( test.two.running, 1, "one effect two running" );
+    equal( test.two.running, 1, "one effect two running" );
     plus();
   })
   .exec( 7, function() {
@@ -2299,9 +2297,9 @@ test( "Popcorn Compose", function() {
     popped.removeTrackEvent( effectTrackThree );
     popped.removeTrackEvent( composeOptionsOne );
     popped.removeTrackEvent( composeOptionsTwo );
-    equals( test.one.setup, 2, "three compose one teardowns called. 5 - 3 = 2" );
+    equal( 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" );
+    equal( test.two.setup, 0, "three compose two teardowns called. 3 - 3 = 0" );
     plus();
   });
 
@@ -2418,16 +2416,16 @@ test( "Plugin Breaker", function() {
       ok( true, "breaker ended" );
       plus();
 
-      equals( breaker.start, 1, "plugin start method fires only once" );
+      equal( breaker.start, 1, "plugin start method fires only once" );
       plus();
-      equals( breaker.end, 1, "plugin end method fires only once" );
+      equal( 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" );
+  equal( Popcorn.registry.length, 1, "Three items in the registry" );
   plus();
 
   popped.breaker({
@@ -2505,12 +2503,12 @@ test( "Plugin Closure", function() {
       },
       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" );
+        equal( 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" );
+        equal( endCount++, options.endCount++, options.nick + " has correct end counts" );
         plus();
 
         // running tracks again to make sure data increments uniquly
@@ -2554,12 +2552,12 @@ test( "Remove Plugin", function() {
   stop( 10000 );
   p.currentTime( 0 ).pause();
 
-  equals( rlen, 0, "Popcorn.registry.length is empty" );
+  equal( 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" );
+  equal( 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" );
+  equal( p.data.trackEvents.byEnd.length, 2, "p.data.trackEvents.byEnd is initialized and has 2 entries" );
   plus();
 
   Popcorn.plugin( "removeme", {
@@ -2588,11 +2586,11 @@ test( "Remove Plugin", function() {
     order: "second"
   });
 
-  equals( Popcorn.registry.length, 1, "Popcorn.registry.length is 1" );
+  equal( 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" );
+  equal( 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" );
+  equal( p.data.trackEvents.byEnd.length, 3, "p.data.trackEvents.byEnd is updated and has 3 entries" );
   plus();
 
   p.removePlugin( "removeme" );
@@ -2604,20 +2602,20 @@ test( "Remove Plugin", function() {
   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" );
+  equal( 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" );
+  equal( 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" );
+  equal( 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" );
+  equal( 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" );
+  equal( p.data.trackEvents.byEnd.length, 2, "p.data.trackEvents.byEnd is updated and has 2 entries" );
   plus();
   Popcorn.removePlugin( "removeme" );
 
@@ -2625,15 +2623,15 @@ test( "Remove Plugin", function() {
   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" );
+  equal( Popcorn.registry.length, 0, "Popcorn.registry.length is empty again" );
   plus();
 
-  interval = setInterval( function() {
+  interval = setInterval(function() {
     if( p2.currentTime() > 3 ) {
 
-      equals( p2.data.trackEvents.byStart.length, 2, "p2.data.trackEvents.byStart is updated and has 2 entries" );
+      equal( 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" );
+      equal( p2.data.trackEvents.byEnd.length, 2, "p2.data.trackEvents.byEnd is updated and has 2 entries" );
       plus();
       clearInterval( interval );
     }
@@ -2706,7 +2704,7 @@ test( "Defaulting Empty End Values", function() {
 
   Popcorn.plugin( "testdefault", {
     _setup: function( options ) {
-      equals( options.end, Number.MAX_VALUE, "The end value defaulted to maximum number value");
+      equal( options.end, Number.MAX_VALUE, "The end value defaulted to maximum number value");
     },
     start: function( event, options ) {
     },
@@ -2773,16 +2771,16 @@ test( "In/Out aliases", function() {
   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" );
+  equal( counter, 0, "Counter is at 0, neither in or out have been called" );
   plus();
 
   popcorn.exec( 2, function() {
-    equals( counter, 1, "Counter is at 1, in has been called" );
+    equal( counter, 1, "Counter is at 1, in has been called" );
     plus();
   });
 
   popcorn.exec( 4, function() {
-    equals( counter, 2, "Counter is at 2, out has been called" );
+    equal( counter, 2, "Counter is at 2, out has been called" );
     plus();
   });
 
@@ -2825,30 +2823,29 @@ test( "Functions", function() {
     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 " );
+  equal( historyRef.length, 2, "2 TrackEvents in history index" );
+  equal( popped.data.trackEvents.byStart.length, 4, "4 TrackEvents in popped.data.trackEvents.byStart " );
+  equal( 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()" )
+  equal( 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 " );
+  equal( popped.data.history.length, 1, "1 TrackEvent in history index - after popped.removeTrackEvent( rwTrackId ); " );
+  equal( popped.data.trackEvents.byStart.length, 3, "3 TrackEvents in popped.data.trackEvents.byStart " );
+  equal( 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()" );
+  equal( trackEvents.length, 1, "1 user created trackEvents returned by popped.getTrackEvents()" );
 
   popped.rw({
     start: 1,
@@ -2857,16 +2854,16 @@ test( "Functions", function() {
 
   rw2TrackId = popped.getLastTrackEventId();
 
-  equals( popped.data.history.length, 2, "2 TrackEvents in history index - after new track added ");
+  equal( 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" );
+  equal( popped.data.trackEvents.byStart.length, 4, "4 TrackEvents in popped.data.trackEvents.byStart  - after new track added" );
+  equal( 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()" )
+  equal( trackEvents.length, 2, "2 user created trackEvents returned by popped.getTrackEvents()" )
 
   popped.rw({
     id: "my-track-id",
@@ -2876,15 +2873,15 @@ test( "Functions", function() {
 
   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" );
+  equal( popped.data.history.length, 3, "3 TrackEvents in history index - after new track added " );
+  equal( popped.data.trackEvents.byStart.length, 5, "5 TrackEvents in popped.data.trackEvents.byStart  - after new track added" );
+  equal( 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" );
+  equal( rw3TrackId, "my-track-id", "TrackEvent has user defined id" );
 
   trackEvents = popped.getTrackEvents();
 
-  equals( trackEvents.length, 3, "3 user created trackEvents returned by popped.getTrackEvents()" );
+  equal( trackEvents.length, 3, "3 user created trackEvents returned by popped.getTrackEvents()" );
 });
 
 test( "getTrackEvent", function() {
@@ -2932,22 +2929,21 @@ test( "getTrackEvent", function() {
 
   obj = popped.getTrackEvent( trackIds[ 0 ] );
 
-  equals( typeof obj  === "object", true, "getTrackEvent() returned an object" );
+  equal( 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" );
+    equal( 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" );
+  equal( popped.getTrackEvent( oldId ), undefined,  "returned undefined when id is not found" );
 });
 
-
-test( "Index Integrity (timeUpdate)", function() {
+test( "Index Integrity ( timeUpdate )", function() {
 
   var $pop = Popcorn( "#video" );
       count = 0,
@@ -2977,7 +2973,6 @@ test( "Index Integrity (timeUpdate)", function() {
     };
   });
 
-
   stop( 10000 );
 
   equal( $pop.data.trackEvents.endIndex, 1, "$pop.data.trackEvents.endIndex is 1" );
@@ -3005,11 +3000,11 @@ test( "Index Integrity (timeUpdate)", function() {
 
       $pop.removeTrackEvent( "removeable-track-event" );
 
-      equals( $pop.data.trackEvents.byStart.length, 3, "$pop.data.trackEvents.byStart.length is 3 - after removeTrackEvent" );
+      equal( $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");
+      equal( $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" );
+      equal( $pop.data.trackEvents.endIndex, 1, "$pop.data.trackEvents.endIndex is 1 - after removeTrackEvent" );
       plus();
 
     }).currentTime( 40 ).play();
@@ -3075,11 +3070,11 @@ test( "Index Integrity (frameAnimation)", function() {
 
       $pop.removeTrackEvent( "removeable-track-event" );
 
-      equals( $pop.data.trackEvents.byStart.length, 3, "$pop.data.trackEvents.byStart.length is 3 - after removeTrackEvent" );
+      equal( $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" );
+      equal( $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");
+      equal( $pop.data.trackEvents.endIndex, 1, "$pop.data.trackEvents.endIndex is 1 - after removeTrackEvent");
       plus();
 
     }).currentTime( 40 ).play();
@@ -3161,8 +3156,8 @@ 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" );
+  equal( typeof Popcorn.xhr, "function" , "Popcorn.xhr is a provided static function" );
+  equal( typeof Popcorn.xhr.httpData, "function" , "Popcorn.xhr.httpData is a provided static function" );
 });
 
 test( "Text Response", function() {
@@ -3187,7 +3182,7 @@ test( "Text Response", function() {
       ok( data, "xhr returns data" );
       plus();
 
-      equals( data.text, "This is a text test", "test.txt returns the string 'This is a text test'" );
+      equal( data.text, "This is a text test", "test.txt returns the string 'This is a text test'" );
       plus();
     }
   });
@@ -3216,13 +3211,12 @@ test( "dataType: Text Response", function() {
       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'" );
+      equal( 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,
@@ -3344,9 +3338,8 @@ if ( !/file/.test( location.protocol ) ) {
       }
     );
 
-    Popcorn.xhr.getJSONP(
+    Popcorn.xhr.getJSONP( "http://api.flickr.com/services/feeds/photos_public.gne?id=35034346917@N01&lang=en-us&format=json&jsoncallback=flickr",
 
-      "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" );
@@ -3363,7 +3356,7 @@ if ( !/file/.test( location.protocol ) ) {
 
         ok( data, "getJSONP returns data" );
         plus();
-        ok( QUnit.equiv(data, testObj) , "Popcorn.xhr.getJSONP data.json returns an object of data" );
+        ok( QUnit.equiv( data, testObj ) , "Popcorn.xhr.getJSONP data.json returns an object of data" );
         plus();
       }
     );
@@ -3437,7 +3430,6 @@ test( "Popcorn.getScript()", function() {
     }
   );
 
-
   var cb = function( id ) {
     if ( window.testFunction ) {
       ok( true, "testFunction called by plugin id#: " + id );
@@ -3452,7 +3444,6 @@ test( "Popcorn.getScript()", function() {
   Popcorn.getScript( "data/testfunction.js", function() { cb( 2 ); } );
 });
 
-
 test( "XML Response", function() {
 
   var expects = 2,
@@ -3468,7 +3459,6 @@ test( "XML Response", function() {
 
   stop()
 
-
   Popcorn.xhr({
     url: "data/test.xml",
     success: function( data ) {
@@ -3480,7 +3470,7 @@ test( "XML Response", function() {
       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" );
+      equal( data.xml.toString(), xml.toString(), "data.xml returns a document of xml" );
       plus();
     }
   });
@@ -3511,7 +3501,7 @@ test( "dataType: XML Response", function() {
       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" );
+      equal( data.toString(), xml.toString(), "dataType: 'xml', data.xml returns a document of xml" );
       plus();
     }
   });
@@ -3570,9 +3560,9 @@ test( "Base player functionality", 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 ) {
 
@@ -3582,7 +3572,7 @@ test( "Base player functionality", function() {
           plus();
         }
       },
-      end: function ( event, options ) {
+      end: function( event, options ) {
 
         if ( !options.endFired ) {
 
@@ -3601,9 +3591,9 @@ test( "Base player functionality", function() {
     end: 4
   });
 
-  Popcorn.plugin( "backwards", function () {
+  Popcorn.plugin( "backwards", function() {
     return {
-      start: function ( event, options ) {
+      start: function( event, options ) {
 
         if ( !options.startFired ) {
 
@@ -3614,7 +3604,7 @@ test( "Base player functionality", function() {
           plus();
         }
       },
-      end: function ( event, options ) {
+      end: function( event, options ) {
 
         if ( !options.endFired ) {
 
@@ -3634,11 +3624,11 @@ test( "Base player functionality", 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;
     }
@@ -3735,7 +3725,7 @@ test( "Parsing Functions", function() {
   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" );
+  ok( typeof popperly.parseJSON().parseJSON( "data/test.js" ).parseJSON === "function" , "parseJSON function is chainable" );
   plus();
 });
 
@@ -3867,7 +3857,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();
@@ -3891,7 +3881,7 @@ 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();
@@ -3940,7 +3930,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();
@@ -3964,7 +3954,7 @@ 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();

From 656d5922ddd556d949cd00fb97585a8df8e6e514 Mon Sep 17 00:00:00 2001
From: stevenaw <sweerdenburg@gmail.com>
Date: Wed, 12 Oct 2011 20:39:58 -0400
Subject: [PATCH 12/78] [#750] Fix whitespace, quotes issues

---
 parsers/parserVTT/popcorn.parserVTT.js | 52 +++++++++++++-------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/parsers/parserVTT/popcorn.parserVTT.js b/parsers/parserVTT/popcorn.parserVTT.js
index e7acf2567..6d5e5f52d 100644
--- a/parsers/parserVTT/popcorn.parserVTT.js
+++ b/parsers/parserVTT/popcorn.parserVTT.js
@@ -16,15 +16,15 @@
     00:32.500 --> 00:00:33.500 A:start S:50% D:vertical L:98%
     <v Neil DeGrass Tyson><i>Laughs</i>
    */  
-  Popcorn.parser( 'parseVTT', function( data ) {
+  Popcorn.parser( "parseVTT", function( data ) {
   
     // declare needed variables
     var retObj = {
-          title: '',
-          remote: '',
-          data: []
+          title: "",
+          remote: "",
+          data: [  ]
         },
-        subs = [],        
+        subs = [  ],        
         i = 0,
         len = 0,
         lines,
@@ -38,27 +38,27 @@
     len = lines.length;
     
     // Check for BOF token
-    if ( len === 0 || lines[0] !== 'WEBVTT' ) {
+    if ( len === 0 || lines[ 0 ] !== "WEBVTT" ) {
       return retObj;
     }
     
     i++;
     
     while ( i < len ) {
-      text = [];
+      text = [  ];
       
       try {
         i = skipWhitespace( lines, len, i );
-        sub = parseCueHeader( lines[i++] );
+        sub = parseCueHeader( lines[ i++ ] );
         
         // Build single line of text from multi-line subtitle in file
-        while ( i < len && lines[i] ) {
-          text.push( lines[i++] );
+        while ( i < len && lines[ i ] ) {
+          text.push( lines[ i++ ] );
         }
         
         // Join lines together to one and build subtitle text
-        sub.text = text.join( '<br />' );        
-        subs.push( createTrack( 'subtitle', sub ) );
+        sub.text = text.join( "<br />" );        
+        subs.push( createTrack( "subtitle", sub ) );
       } catch ( e ) {
         i = skipNonWhitespace( lines, len, i );
       }
@@ -71,26 +71,26 @@
   // [HH:]MM:SS.mmm string to SS.mmm float
   // Throws exception if invalid
   function toSeconds ( t_in ) {
-    var t = t_in.split( ':' ),
+    var t = t_in.split( ":" ),
         l = t_in.length,
         time;
     
     // Invalid time string provided
     if ( l !== 12 && l !== 9 ) {
-      throw 'Bad cue';
+      throw "Bad cue";
     }
     
     l = t.length - 1;
     
     try {        
-      time = parseInt( t[l-1], 10 ) * 60 + parseFloat( t[l], 10 );
+      time = parseInt( t[ l-1 ], 10 ) * 60 + parseFloat( t[ l ], 10 );
       
       // Hours were given
       if ( l === 2 ) {
-        time += parseInt( t[0], 10 ) * 3600;
+        time += parseInt( t[ 0 ], 10 ) * 3600;
       }
     } catch ( e ) {
-      throw 'Bad cue';
+      throw "Bad cue";
     }
     
     return time;
@@ -98,7 +98,7 @@
   
   function createTrack( name, attributes ) {
     var track = {};
-    track[name] = attributes;
+    track[ name ] = attributes;
     return track;
   }
   
@@ -109,25 +109,25 @@
         rToken = /-->/,
         rWhitespace = /[\t ]+/;
       
-    if ( !line || line.indexOf( '-->' ) === -1 ) {
-      throw 'Bad cue';
+    if ( !line || line.indexOf( "-->" ) === -1 ) {
+      throw "Bad cue";
     }
   
-    lineSegments = line.replace( rToken, ' --> ' ).split( rWhitespace );
+    lineSegments = line.replace( rToken, " --> " ).split( rWhitespace );
     
     if ( lineSegments.length < 2 ) {
-      throw 'Bad cue';
+      throw "Bad cue";
     }
     
     sub.id = line;
-    sub.start = toSeconds( lineSegments[0] );
-    sub.end = toSeconds( lineSegments[2] );
+    sub.start = toSeconds( lineSegments[ 0 ] );
+    sub.end = toSeconds( lineSegments[ 2 ] );
     
     return sub;
   }
   
   function skipWhitespace ( lines, len, i ) {
-    while ( i < len && !lines[i] ) {
+    while ( i < len && !lines[ i ] ) {
       i++;
     }
     
@@ -135,7 +135,7 @@
   }
   
   function skipNonWhitespace ( lines, len, i ) {
-    while ( i < len && lines[i] ) {
+    while ( i < len && lines[ i ] ) {
       i++;
     }
     

From 66f717a091c8d295ad1bbe6ebccd578196ebdd11 Mon Sep 17 00:00:00 2001
From: stevenaw <sweerdenburg@gmail.com>
Date: Wed, 12 Oct 2011 20:49:17 -0400
Subject: [PATCH 13/78] [#751] Fix whitespace issues

---
 parsers/parserSSA/popcorn.parserSSA.js | 30 +++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/parsers/parserSSA/popcorn.parserSSA.js b/parsers/parserSSA/popcorn.parserSSA.js
index 993752b9b..5dea065ec 100644
--- a/parsers/parserSSA/popcorn.parserSSA.js
+++ b/parsers/parserSSA/popcorn.parserSSA.js
@@ -33,10 +33,10 @@
     var retObj = {
           title: "",
           remote: "",
-          data: []
+          data: [  ]
         },
         rNewLineFile = /(?:\r\n|\r|\n)/gm,
-        subs = [],
+        subs = [  ],
         lines,
         headers,
         i = 0,
@@ -48,15 +48,15 @@
     len = lines.length;
     
     // Ignore non-textual info
-    while ( i < len && lines[i] !== "[Events]" ) {
+    while ( i < len && lines[ i ] !== "[Events]" ) {
       i++;
     }
     
-    headers = parseFieldHeaders( lines[++i] );
+    headers = parseFieldHeaders( lines[ ++i ] );
     
-    while ( ++i < len && lines[i] && lines[i][0] !== "[" ) {
+    while ( ++i < len && lines[ i ] && lines[ i ][ 0 ] !== "[" ) {
       try {
-        subs.push( createTrack( "subtitle", parseSub( lines[i], headers ) ) );
+        subs.push( createTrack( "subtitle", parseSub( lines[ i ], headers ) ) );
       } catch ( e ) {}
     }
     
@@ -72,8 +72,8 @@
         sub;
         
     sub = {
-      start: toSeconds( fields[headers.start] ),
-      end: toSeconds( fields[headers.end] )
+      start: toSeconds( fields[ headers.start ] ),
+      end: toSeconds( fields[ headers.end ] )
     };
     
     // Invalid time, skip
@@ -97,17 +97,17 @@
       return -1;
     }
     
-    return parseInt( t[0], 10 )*3600 + parseInt( t[1], 10 )*60 + parseFloat( t[2], 10 );
+    return parseInt( t[ 0 ], 10 )*3600 + parseInt( t[ 1 ], 10 )*60 + parseFloat( t[ 2 ], 10 );
   }
   
   function getTextFromFields( fields, startIdx ) {
     var fieldLen = fields.length,
-        text = [],
+        text = [  ],
         i = startIdx;
     
     // There may be commas in the text which were split, append back together into one line      
     for( ; i < fieldLen; i++ ) {
-      text.push( fields[i] );
+      text.push( fields[ i ] );
     }
     
     return text.join( "," );
@@ -115,7 +115,7 @@
   
   function createTrack( name, attributes ) {
     var track = {};
-    track[name] = attributes;
+    track[ name ] = attributes;
     return track;
   }
   
@@ -128,11 +128,11 @@
      
      //Find where in Dialogue string the start, end and text info is
     for ( i = 0, len = fields.length; i < len; i++ ) {
-      if ( fields[i] === "Start" ) {
+      if ( fields[ i ] === "Start" ) {
         result.start = i;
-      } else if ( fields[i] === "End" ) {
+      } else if ( fields[ i ] === "End" ) {
         result.end = i;
-      } else if ( fields[i] === "Text" ) {
+      } else if ( fields[ i ] === "Text" ) {
         result.text = i;
       }
     }

From 4c3580a3026ea7948b957000a0c5fd836f7e7aef Mon Sep 17 00:00:00 2001
From: Matthew Schranz <schranz.m@gmail.com>
Date: Thu, 13 Oct 2011 12:05:18 -0400
Subject: [PATCH 14/78] [#740]Comments Plugin Added. Fixed Unit tests so they
 would complete faster.

---
 plugins/facebook/popcorn.facebook.html      | 12 ++---
 plugins/facebook/popcorn.facebook.unit.html |  1 +
 plugins/facebook/popcorn.facebook.unit.js   | 54 +++++++++++++--------
 3 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/plugins/facebook/popcorn.facebook.html b/plugins/facebook/popcorn.facebook.html
index 656390d59..5c540fcac 100755
--- a/plugins/facebook/popcorn.facebook.html
+++ b/plugins/facebook/popcorn.facebook.html
@@ -10,7 +10,6 @@
       var p = Popcorn( "#video" )
       .volume( 0 )
       .play()
-      /*
       .facebook({
         type: "live-stream",
         target: "activitydiv",
@@ -39,7 +38,7 @@
         header: "false",
         target: "likeboxdiv",
         start: 6,
-        end: 15
+        end: 15 
       })
       .facebook({
         site: "http://popcornjs.org/",
@@ -57,14 +56,14 @@
         start: 10,
         end: 15
       })
-      */
       .facebook({
-        href: "popcornjs.org",
+        href: "example.com",
         type: "COMMENTS",
         target: "commentdiv",
         start: 5,
         end: 50,
-        width: 400
+        width: 400,
+        num_posts: 5
       });
     }, false);
 
@@ -95,8 +94,6 @@ <h1 id="qunit-header">Popcorn Facebook Plug-in Demo</h1>
     </video>
   </div>
   <div>
-    <div id="commentdiv"></div>
-    <br />
     <div id="likediv"></div>
     <br />
     <div id="likeboxdiv"></div>
@@ -104,6 +101,7 @@ <h1 id="qunit-header">Popcorn Facebook Plug-in Demo</h1>
   <div style="position:absolute;left:400px;top:150px">
     <div id="facepilediv"></div>
     <div id="activitydiv"></div>
+    <div id="commentdiv"></div>
   </div>
 </body>
 </html>
diff --git a/plugins/facebook/popcorn.facebook.unit.html b/plugins/facebook/popcorn.facebook.unit.html
index ccefc5e68..f29ec0fe4 100755
--- a/plugins/facebook/popcorn.facebook.unit.html
+++ b/plugins/facebook/popcorn.facebook.unit.html
@@ -21,6 +21,7 @@ <h2 id="qunit-userAgent"></h2>
   <div id="qunit-fixture">  </div>
 
   <div style="position:absolute;left:300px;">
+    <div id="commentdiv"></div>
     <div id="facepilediv"></div>
     <div id="activitydiv"></div>
   </div>
diff --git a/plugins/facebook/popcorn.facebook.unit.js b/plugins/facebook/popcorn.facebook.unit.js
index 64780ff21..335054af4 100755
--- a/plugins/facebook/popcorn.facebook.unit.js
+++ b/plugins/facebook/popcorn.facebook.unit.js
@@ -3,7 +3,7 @@ test( "Popcorn Facebook Plugin", function () {
   Popcorn.plugin.debug = true;
 
   var popped = Popcorn( "#video" ),
-      expects = 12,
+      expects = 15,
       count = 0,
       interval,
       interval2,
@@ -28,15 +28,15 @@ test( "Popcorn Facebook Plugin", function () {
     site: "http://popcornjs.org/",
     type: "ACTIVITY",
     target: "activitydiv",
-    start: 3,
-    end: 11
+    start: 1,
+    end: 6
   })
   .facebook({
     href: "https://www.facebook.com/boardwalkempire",
     type: "FACEPILE",
     target: "facepilediv",
-    start: 4,
-    end: 11,
+    start: 1,
+    end: 6,
     width: 300
   })
   .facebook({
@@ -44,13 +44,13 @@ test( "Popcorn Facebook Plugin", function () {
     target: "likediv",
     layout: "box_count",
     start: 2,
-    end: 11
+    end: 6
   })
   .facebook({
     type: "send",
     target: "likediv",
     start: 1,
-    end: 11
+    end: 6
   })
   .facebook({
     href: "http://www.facebook.com/senecacollege",
@@ -59,7 +59,15 @@ test( "Popcorn Facebook Plugin", function () {
     header: "false",
     target: "likeboxdiv",
     start: 2,
-    end: 13
+    end: 6
+  })
+  .facebook({
+    href: "example.com",
+    type: "COMMENTS",
+    target: "commentdiv",
+    start: 1,
+    end: 6,
+    num_posts: 5
   })
   .volume( 0 )
   .play();
@@ -71,9 +79,11 @@ test( "Popcorn Facebook Plugin", function () {
   plus();
   ok( document.getElementById( "facepilediv" ), "facepilediv exists on the page" );
   plus();
-  ok ( document.getElementById( "likediv" ), "activitydiv exists on the page" );
+  ok ( document.getElementById( "likediv" ), "likediv exists on the page" );
+  plus();
+  ok( document.getElementById( "likeboxdiv" ), "likeboxdiv exists on the page" );
   plus();
-  ok( document.getElementById( "likeboxdiv" ), "facepilediv exists on the page" );
+  ok( document.getElementById( "commentdiv" ), "commentdiv 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
@@ -97,21 +107,23 @@ test( "Popcorn Facebook Plugin", function () {
     // 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)" );
+    // Checks if facepilediv is empty at specific time
+    ok( document.getElementById( "facepilediv" ).innerHTML, "Facepilediv is not empty at 0:04 (expected)" );
     plus();
-  });
-
-  // Checks if _teardown function is run properly on like-box
-  popped.exec( 12, function() {
+    // Checks if likediv is empty at specific time
+    ok( document.getElementById( "likediv" ).innerHTML, "likediv is not empty at 0:04 (expected)" );
+    plus();
+    // Checks if commentdiv is empty at specific time
+    ok( document.getElementById( "commentdiv" ).innerHTML, "commentdiv is not empty at 0:04 (expected)" );
+    plus();
+    
+    // Checks if Comments Plugin was successfully destroyed with _teardown
     popped.pause().removeTrackEvent( setupId );
-    ok( !document.getElementById( "likeboxdiv" ).innerHTML, "likebox facebook social plugin was properly destroyed" );
+    ok( !document.getElementById( "commentdiv" ).innerHTML, "comments facebook social plugin was properly destroyed" );
     plus();
+    
+    popped.play();
   });
-
 });
 
 

From b2f1652ead73a687b2c6ce4f49c87f79d9118525 Mon Sep 17 00:00:00 2001
From: Matthew Schranz <schranz.m@gmail.com>
Date: Thu, 13 Oct 2011 12:24:55 -0400
Subject: [PATCH 15/78] [#740]Fixed Whitespace

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

diff --git a/plugins/facebook/popcorn.facebook.js b/plugins/facebook/popcorn.facebook.js
index 5eb3e513e..9b256b4e1 100755
--- a/plugins/facebook/popcorn.facebook.js
+++ b/plugins/facebook/popcorn.facebook.js
@@ -168,7 +168,7 @@
     },
 
     _setup: function( options ) {
-      
+
       var target = document.getElementById( options.target ),
           _type = options.type;
 
@@ -227,17 +227,15 @@
         " num_posts"
       ).split(" ");
 
+      // For Each that loops through all of our attributes adding them to the divs properties
       Popcorn.forEach( fbAttrs, function( attr ) {
         // Test for null/undef. Allows 0, false & ""
         if ( options[ attr ] != null ) {
           options._facebookdiv.setAttribute( attr, options[ attr ] );
         }
       });
-      
-      if ( _type === "comments" ) {
-        target.style.overflow = "auto";
-      }
-      
+
+      // Checks if the plugins target container exists
       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 335054af4..1a407ce2f 100755
--- a/plugins/facebook/popcorn.facebook.unit.js
+++ b/plugins/facebook/popcorn.facebook.unit.js
@@ -116,12 +116,12 @@ test( "Popcorn Facebook Plugin", function () {
     // Checks if commentdiv is empty at specific time
     ok( document.getElementById( "commentdiv" ).innerHTML, "commentdiv is not empty at 0:04 (expected)" );
     plus();
-    
+
     // Checks if Comments Plugin was successfully destroyed with _teardown
     popped.pause().removeTrackEvent( setupId );
     ok( !document.getElementById( "commentdiv" ).innerHTML, "comments facebook social plugin was properly destroyed" );
     plus();
-    
+
     popped.play();
   });
 });

From e0934a70be32e324123e93dae5c197c028d4f6ba Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Mon, 17 Oct 2011 04:38:56 -0400
Subject: [PATCH 16/78] Fixed error with a few missing characters causing
 errors

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

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 4e1db9595..b5610da39 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -1134,7 +1134,7 @@ test( "Stored By Type", function() {
   p.listen( "play", function() {
     fired++;
 
-    ok( jtrue, "Play fired " + fired );
+    ok( true, "Play fired " + fired );
     plus();
   });
 
@@ -1257,7 +1257,7 @@ test( "Custom", function() {
 test( "UI/Mouse", function() {
 
   var expects = 1,
-      count = 0
+      count = 0,
       p;
 
   expect( expects );
@@ -1266,6 +1266,7 @@ test( "UI/Mouse", function() {
     if ( ++count == expects ) {
       start();
     }
+  }
 
   stop( 10000 );
 
@@ -1280,7 +1281,7 @@ test( "UI/Mouse", function() {
   p.trigger( "click" );
 });
 
-module( "Popcorn Plugin" )
+module( "Popcorn Plugin" );
 test( "Manifest", function() {
 
   var p = Popcorn( "#video" ),
@@ -1646,7 +1647,7 @@ test( "Update Timer (timeupdate)", function() {
       // any second call will produce a failed test
       forwardStart = false,
       forwardEnd = false,
-      backwardStar = false,
+      backwardStart = false,
       backwardEnd = false,
       wrapperRunning = {
         one: false,

From 3df47e2fbafce0923e9ccf58d112b27af27fc470 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Mon, 17 Oct 2011 10:55:53 -0400
Subject: [PATCH 17/78] fixes as per review

---
 players/vimeo/popcorn.vimeo.html | 467 +++++++++++++++----------------
 1 file changed, 230 insertions(+), 237 deletions(-)

diff --git a/players/vimeo/popcorn.vimeo.html b/players/vimeo/popcorn.vimeo.html
index d646378ab..b92feac62 100644
--- a/players/vimeo/popcorn.vimeo.html
+++ b/players/vimeo/popcorn.vimeo.html
@@ -1,240 +1,233 @@
 <!DOCTYPE html>
 <html>
-    <head>
-        <title>Popcorn Vimeo Player Example</title>
-        <style>
-            iframe{
-                display:block;
-                border:0;
-            }
-            body > div {
-                width: 100%;
-                float: left;
-                overflow: hidden;
-            }
-            div div {
-                margin-bottom:20px;
-            }
-
-            .api_output {
-                float:right;
-                padding-left: 20px;
-            }
-        </style>
-
-        <script src="../../popcorn.js"></script>
-        <script type="text/javascript" src="popcorn.vimeo.js"></script>
-        <script src="../../plugins/footnote/popcorn.footnote.js"></script>
-        <script src="../../plugins/flickr/popcorn.flickr.js"></script>
-        <script src="../../plugins/attribution/popcorn.attribution.js"></script>
-        <script src="../../plugins/webpage/popcorn.webpage.js"></script>
-         <script src="../../plugins/googlefeed/popcorn.googlefeed.js"></script>
-        <script src="../../plugins/image/popcorn.image.js"></script>
-        <script src="../../plugins/subtitle/popcorn.subtitle.js"></script>
-        <script src="../../plugins/twitter/popcorn.twitter.js"></script>
-
-        <script type="text/javascript">
-            // Called as onload function
-            // Set up interface controls
-            VimeoEmbedLoaded = function( player ) {
-                var loop = 0,
-                    volume = 1;
-
-                // Hook up custom controls
-                // Single play/pause buttons
-                document.getElementById( "btnPlay" ).addEventListener( "click", function(e) {
-                  player.play();
-                }, false);
-
-                document.getElementById( "btnPause" ).addEventListener( "click", function(e) {
-                    player.pause();
-                }, false);
-
-                //Seek
-                document.getElementById( "btnSeek" ).addEventListener( "click", function() {
-                  player.currentTime( 30 );
-                }, false);
-
-                // Volume
-                document.getElementById( "btnVolume" ).addEventListener( "click", function() {
-                  volume = volume === 100 ? 50 : 100;
-                  player.volume( volume );
-                }, false);
-
-                // Mute
-                document.getElementById( "btnMute" ).addEventListener( "click", function() {
-                  player.mute( !player.media.muted );
-                }, false);
-
-                // Hook into player events
-                // Timeupdate, as the video plays
-                player.listen( "timeupdate", function() {
-                  document.getElementById( "player_time" ).innerHTML = player.currentTime();
-                });
-
-                // When the volume changes
-                player.listen( "volumechange", function() {
-                  document.getElementById( "player_vol" ).innerHTML = player.volume();
-                });
-
-                // When the video duration changes
-                player.listen( "durationchange", function() {
-                  document.getElementById( "player_duration" ).innerHTML = player.duration();
-                });
-
-                // When the meddia ready state changes
-                player.listen( "readystatechange", function() {
-                  document.getElementById( "player_state" ).innerHTML = player.readyState();
-                });
-
-                // Output some initial UI values so we caan see what the player is doing
-                document.getElementById( "player_time" ).innerHTML = player.currentTime();
-                document.getElementById( "player_vol" ).innerHTML = player.volume();
-                document.getElementById( "player_duration" ).innerHTML = player.duration();
-            };
-
-            //On document ready
-            document.addEventListener( "DOMContentLoaded", function() {
-              var player = Popcorn.vimeo( "player_1", "http://player.vimeo.com/video/6960892" )
-                    .footnote({
-                      start: 5, // seconds
-                      end: 40, // seconds
-                      text: "The video popcorn being popped.",
-                      target: "footnotediv"
-                    })
-                    .flickr({
-                      start: 20, // seconds
-                      end: 40, // seconds
-                      tags: "georgia",
-                      numberofimages: "8",
-                      target: "flickrdiv"
-                    })
-                    .twitter({
-                      start: 20, // seconds
-                      end: 45, // seconds
-                      title: "Oil Spill",
-                      src: "#oilspill",
-                      target: "twitterdiv"
-                    })
-                    .attribution({
-                      start: 5, // seconds
-                      end: 60, // seconds
-                      nameofwork: "Internet",
-                      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"
-                    })
-                    .subtitle({
-                      start: 5, // seconds
-                      end: 15, // seconds
-                      text: "This is overlaid on top of the video. You can hightlight it!",
-                      display: "inline",
-                      language: "en"
-                    })
-                    .webpage({
-                      id: "webpages-a",
-                      start: 0, // seconds
-                      end: 15, // seconds
-                      src: "http://webmademovies.org/",
-                      target: "webpagediv"
-                    })
-                    .googlefeed({
-                        start: 0, // seconds
-                        end: 15, // seconds
-                        target: "feeddiv",
-                        url: "http://zenit.senecac.on.ca/~chris.tyler/planet/rss20.xml",
-                        title: "Planet Feed",
-                        orientation: "Vertical"
-                    })
-                    .image({
-                      start: 5, // seconds
-                      end: 15, // seconds
-                      href: "http://www.drumbeat.org/",
-                      src: "https://www.drumbeat.org/media//images/drumbeat-logo-splash.png",
-                      target: "imagediv"
-                    });
-                    player.listen( "load", function() {
-                      //console.log( "asdfasdf" );
-                      VimeoEmbedLoaded( player );
-                    })
-                   .listen( "loadstart", function() {
-                      document.getElementById( "player_load" ).innerHTML = "Started";
-                    })
-                    .listen( "canplaythrough", function() {
-                      document.getElementById( "player_load" ).innerHTML = "Finished";
-                    })
-                    //.volume(0)
-                    .play();
-            }, false);
-        </script>
-    </head>
-    <body>
-          <div>
-            <div id="player_1" style="width: 400px; height: 400px;"></div><br />
-            <button class="simple" id="btnPlay">Play</button>
-            <button class="simple" id="btnPause">Pause</button>
-            <button class="seek" id="btnSeek">Seek to 30</button>
-            <button class="volume" id="btnVolume">Toggle Volume</button>
-            <button class="volume" id="btnMute">Mute</button>
-            <div>
-              Current Time (s): <span id="player_time"></span>
-              <br />Video Duration (s): <span id="player_duration"></span>
-              <br />Volume (0-100): <span id="player_vol"></span>
-              <br />Load Status: <span id="player_load">Not Started</span>
-            </div>
-          </div>
-           <div style="float:right;">
-            <h3>Description</h3>
-            <p>
-              This demo will showcase how a Vimeo flash video can be integrated into Popcorn. This  is done by making the flash video masquerade as HTML 5 video.<br />
-              Due to the Flash security model, this demo must be  run from a web server<br />
-            <hr >
-              Vimeo does not support their player to be chromeless (hidden controls), but custsom controls have been developed and tied into their player.<br />
-              Clicking play/pause or seeking in either the video or via custsom controls will cause the other to update.<br />
-              Clicking on the embed option in the Vimeo player while the video is playing will cause the video to pause and custom controls to update.<br />
-              The vimeo video can be specified in the HTML source by giving the vimeo web site url (http://vimeo.com/VIDEOID) to either the Popcorn.vimeo or as the iframe src attribute.<br/>
-            </p>
-            <h4>Expected Events</h4>
-            <ul>
-              <li>From 5 to 40 seconds, the footnote 'The video is popcorn being Popped' will appear below 'Footnote Area'.</li>
-              <li>From 20 to 40 seconds, the a flickr stream of 8 images  tagged 'georgia' will appear below 'Flickr Area'.</li>
-              <li>From 20 to 45 seconds, tweets tagged #oilspill will appear below 'Twitter Area'.</li>
-              <li>From 5 to 60 seconds, the Creative Commons license will appear below 'Attributions Area'.</li>
-              <li>From 5 to 15 seconds, the Mozilla Drumbeat logo will appear below 'Image Area'.</li>
-              <li>From 5 to 15 seconds, the subtitle 'This is overlaid on top of the video. You can hightlight it!' will appear in front of the video.</li>
-              <li>From 0 to 20 seconds, blogs from 'http://zenit.senecac.on.ca/~chris.tyler/planet/rss20.xml' will appear below 'Google Feed Area'.</li>
-              <li>From 0 to 15 seconds, the site 'http://webmademovies.org/' will appear below 'Web Page Area'.</li>
-            </ul>
-            <br />
-            <br />
-            <br />
-            <div id="footnotediv" width="50%" height="50%">
-              <strong>Footnote Area</strong><br />
-            </div>
-            <div id="attribdiv" width="50%" height="50%">
-              <strong>Attributions Area</strong><br />
-            </div>
-            <div id="flickrdiv" width="50%" height="50%">
-              <strong>Flickr Area</strong><br />
-            </div>
-            <div id="twitterdiv" width="50%" height="50%">
-              <strong>Twitter Area</strong><br />
-            </div>
-            <div id="imagediv" width="50%" height="50%">
-              <strong>Image Area</strong><br />
-            </div>
-            <div id="feeddiv" width="50%" height="50%">
-              <strong>Google Feed Area</strong><br />
-            </div>
-            <div id="webpagediv" width="100px" height="50px">
-              <strong>Web Page Area</strong><br />
-            </div>
-          </div>
-
-          <br />
-          <br />
-
-    </body>
+  <head>
+    <title>Popcorn Vimeo Player Example</title>
+    <style>
+      iframe{
+        display: block;
+        border: 0;
+      }
+      body > div {
+        width: 100%;
+        float: left;
+        overflow: hidden;
+      }
+      div div {
+        margin-bottom: 20px;
+      }
+      .api_output {
+        float: right;
+        padding-left: 20px;
+      }
+    </style>
+
+    <script src="../../popcorn.js"></script>
+    <script type="text/javascript" src="popcorn.vimeo.js"></script>
+    <script src="../../plugins/footnote/popcorn.footnote.js"></script>
+    <script src="../../plugins/flickr/popcorn.flickr.js"></script>
+    <script src="../../plugins/attribution/popcorn.attribution.js"></script>
+    <script src="../../plugins/webpage/popcorn.webpage.js"></script>
+    <script src="../../plugins/googlefeed/popcorn.googlefeed.js"></script>
+    <script src="../../plugins/image/popcorn.image.js"></script>
+    <script src="../../plugins/subtitle/popcorn.subtitle.js"></script>
+    <script src="../../plugins/twitter/popcorn.twitter.js"></script>
+
+    <script type="text/javascript">
+      // Called as onload function
+      // Set up interface controls
+      VimeoEmbedLoaded = function( player ) {
+        var loop = 0,
+            volume = 1;
+
+        // Hook up custom controls
+        // Single play/pause buttons
+        document.getElementById( "btnPlay" ).addEventListener( "click", function( e ) {
+          player.play();
+        }, false);
+
+        document.getElementById( "btnPause" ).addEventListener( "click", function( e ) {
+          player.pause();
+        }, false);
+
+        //Seek
+        document.getElementById( "btnSeek" ).addEventListener( "click", function() {
+          player.currentTime( 30 );
+        }, false);
+
+        // Volume
+        document.getElementById( "btnVolume" ).addEventListener( "click", function() {
+          volume = volume === 100 ? 50 : 100;
+          player.volume( volume );
+        }, false);
+
+        // Mute
+        document.getElementById( "btnMute" ).addEventListener( "click", function() {
+          player.mute( !player.media.muted );
+        }, false);
+
+        // Hook into player events
+        // Timeupdate, as the video plays
+        player.listen( "timeupdate", function() {
+          document.getElementById( "player_time" ).innerHTML = player.currentTime();
+        });
+
+        // When the volume changes
+        player.listen( "volumechange", function() {
+          document.getElementById( "player_vol" ).innerHTML = player.volume();
+        });
+
+        // When the video duration changes
+        player.listen( "durationchange", function() {
+          document.getElementById( "player_duration" ).innerHTML = player.duration();
+        });
+
+        // When the meddia ready state changes
+        player.listen( "readystatechange", function() {
+          document.getElementById( "player_state" ).innerHTML = player.readyState();
+        });
+
+        // Output some initial UI values so we caan see what the player is doing
+        document.getElementById( "player_time" ).innerHTML = player.currentTime();
+        document.getElementById( "player_vol" ).innerHTML = player.volume();
+        document.getElementById( "player_duration" ).innerHTML = player.duration();
+      };
+
+      //On document ready
+      document.addEventListener( "DOMContentLoaded", function() {
+        var player = Popcorn.vimeo( "player_1", "http://player.vimeo.com/video/6960892" )
+        .footnote({
+          start: 5,
+          end: 40,
+          text: "The video popcorn being popped.",
+          target: "footnotediv"
+        })
+        .flickr({
+          start: 20,
+          end: 40,
+          tags: "georgia",
+          numberofimages: "8",
+          target: "flickrdiv"
+        })
+        .twitter({
+          start: 20,
+          end: 45,
+          title: "Oil Spill",
+          src: "#oilspill",
+          target: "twitterdiv"
+        })
+        .attribution({
+          start: 5,
+          end: 60,
+          nameofwork: "Internet",
+          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"
+        })
+        .subtitle({
+          start: 5,
+          end: 15,
+          text: "This is overlaid on top of the video. You can hightlight it!",
+          display: "inline",
+          language: "en"
+        })
+        .webpage({
+          id: "webpages-a",
+          start: 0,
+          end: 15,
+          src: "http://webmademovies.org/",
+          target: "webpagediv"
+        })
+        .googlefeed({
+          start: 0,
+          end: 15,
+          target: "feeddiv",
+          url: "http://zenit.senecac.on.ca/~chris.tyler/planet/rss20.xml",
+          title: "Planet Feed",
+          orientation: "Vertical"
+        })
+        .image({
+          start: 5,
+          end: 15,
+          href: "http://www.drumbeat.org/",
+          src: "https://www.drumbeat.org/media//images/drumbeat-logo-splash.png",
+          target: "imagediv"
+        });
+        player.listen( "load", function() {
+          VimeoEmbedLoaded( player );
+        })
+       .listen( "loadstart", function() {
+          document.getElementById( "player_load" ).innerHTML = "Started";
+        })
+        .listen( "canplaythrough", function() {
+          document.getElementById( "player_load" ).innerHTML = "Finished";
+        })
+        .play();
+      }, false);
+    </script>
+  </head>
+  <body>
+      <div>
+        <div id="player_1" style="width: 400px; height: 400px;"></div><br />
+        <button class="simple" id="btnPlay">Play</button>
+        <button class="simple" id="btnPause">Pause</button>
+        <button class="seek" id="btnSeek">Seek to 30</button>
+        <button class="volume" id="btnVolume">Toggle Volume</button>
+        <button class="volume" id="btnMute">Mute</button>
+        <div>
+          Current Time (s): <span id="player_time"></span>
+          <br />Video Duration (s): <span id="player_duration"></span>
+          <br />Volume (0-100): <span id="player_vol"></span>
+          <br />Load Status: <span id="player_load">Not Started</span>
+        </div>
+      </div>
+      <div style="float:right;">
+      <h3>Description</h3>
+      <p>
+        This demo will showcase how a Vimeo flash video can be integrated into Popcorn. This  is done by making the flash video masquerade as HTML 5 video.<br />
+        Due to the Flash security model, this demo must be  run from a web server<br />
+      <hr >
+        Vimeo does not support their player to be chromeless (hidden controls), but custsom controls have been developed and tied into their player.<br />
+        Clicking play/pause or seeking in either the video or via custsom controls will cause the other to update.<br />
+        Clicking on the embed option in the Vimeo player while the video is playing will cause the video to pause and custom controls to update.<br />
+        The vimeo video can be specified in the HTML source by giving the vimeo web site url (http://vimeo.com/VIDEOID) to either the Popcorn.vimeo or as the iframe src attribute.<br/>
+      </p>
+      <h4>Expected Events</h4>
+      <ul>
+        <li>From 5 to 40 seconds, the footnote 'The video is popcorn being Popped' will appear below 'Footnote Area'.</li>
+        <li>From 20 to 40 seconds, the a flickr stream of 8 images  tagged 'georgia' will appear below 'Flickr Area'.</li>
+        <li>From 20 to 45 seconds, tweets tagged #oilspill will appear below 'Twitter Area'.</li>
+        <li>From 5 to 60 seconds, the Creative Commons license will appear below 'Attributions Area'.</li>
+        <li>From 5 to 15 seconds, the Mozilla Drumbeat logo will appear below 'Image Area'.</li>
+        <li>From 5 to 15 seconds, the subtitle 'This is overlaid on top of the video. You can hightlight it!' will appear in front of the video.</li>
+        <li>From 0 to 20 seconds, blogs from 'http://zenit.senecac.on.ca/~chris.tyler/planet/rss20.xml' will appear below 'Google Feed Area'.</li>
+        <li>From 0 to 15 seconds, the site 'http://webmademovies.org/' will appear below 'Web Page Area'.</li>
+      </ul>
+      <br />
+      <br />
+      <br />
+      <div id="footnotediv" width="50%" height="50%">
+        <strong>Footnote Area</strong><br />
+      </div>
+      <div id="attribdiv" width="50%" height="50%">
+        <strong>Attributions Area</strong><br />
+      </div>
+      <div id="flickrdiv" width="50%" height="50%">
+        <strong>Flickr Area</strong><br />
+      </div>
+      <div id="twitterdiv" width="50%" height="50%">
+        <strong>Twitter Area</strong><br />
+      </div>
+      <div id="imagediv" width="50%" height="50%">
+        <strong>Image Area</strong><br />
+      </div>
+      <div id="feeddiv" width="50%" height="50%">
+        <strong>Google Feed Area</strong><br />
+      </div>
+      <div id="webpagediv" width="100px" height="50px">
+        <strong>Web Page Area</strong><br />
+      </div>
+    </div>
+  </body>
 </html>

From 06cb016b15ccbe87085541f5ada6785a101eaf60 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Mon, 17 Oct 2011 11:48:14 -0400
Subject: [PATCH 18/78] fix brain fart on line 181

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

diff --git a/players/vimeo/popcorn.vimeo.js b/players/vimeo/popcorn.vimeo.js
index 5f418651a..79ec595f8 100644
--- a/players/vimeo/popcorn.vimeo.js
+++ b/players/vimeo/popcorn.vimeo.js
@@ -178,7 +178,7 @@
 
             set: function( val ) {
 
-              if ( !val || typeof val !== "number" || ( val < 0 && val > 1 ) ) {
+              if ( !val || typeof val !== "number" || ( val < 0 || val > 1 ) ) {
                 return vimeoObject.api_getVolume();
               }
 

From e4da4dfcd5880a04b97accfa6d95cf765fab5a09 Mon Sep 17 00:00:00 2001
From: stevenaw <sweerdenburg@gmail.com>
Date: Mon, 17 Oct 2011 19:55:28 -0400
Subject: [PATCH 19/78] [#751] Style fixes

---
 parsers/parserSSA/popcorn.parserSSA.html      | 24 ++++-----
 parsers/parserSSA/popcorn.parserSSA.js        | 52 +++++++++----------
 parsers/parserSSA/popcorn.parserSSA.unit.html | 28 +++++-----
 parsers/parserSSA/popcorn.parserSSA.unit.js   | 21 ++++----
 4 files changed, 62 insertions(+), 63 deletions(-)

diff --git a/parsers/parserSSA/popcorn.parserSSA.html b/parsers/parserSSA/popcorn.parserSSA.html
index 98fa15ab8..aedb6cb05 100644
--- a/parsers/parserSSA/popcorn.parserSSA.html
+++ b/parsers/parserSSA/popcorn.parserSSA.html
@@ -2,15 +2,15 @@
 <html>
 <head>
   <title>Popcorn 0.3 SSA parser Plug-in Demo</title>
-  
+
   <script src="../../popcorn.js"></script>
   <script src="../../test/jquery.js"></script>
   <script src="../../plugins/subtitle/popcorn.subtitle.js"></script>
   <script src="popcorn.parserSSA.js"></script>
 
   <script>
-    document.addEventListener( 'DOMContentLoaded', function () {
-      var p = Popcorn( '#video' )
+    document.addEventListener( "DOMContentLoaded", function () {
+      var p = Popcorn( "#video" )
       .volume( 0 )
       .play();
     }, false);
@@ -22,23 +22,23 @@ <h1 id="qunit-header">Popcorn 0.3 SSA parser Plug-in Demo</h1>
   <br />From 9.71 to 13.39 seconds, "Very good, Lieutenant." is shown
   <br />From 15.04 to 18.04 seconds, "It's a trap!" is shown</p>
   <div>
-    <video id='video'
+    <video id="video"
       controls
-      width= '250px'
+      width= "250px"
       data-timeline-sources="data/data.ssa"
-      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>
   <h4>Subtitle Source<h4>
   <iframe id="srcDisplay" src="data/data.ssa"></iframe>
diff --git a/parsers/parserSSA/popcorn.parserSSA.js b/parsers/parserSSA/popcorn.parserSSA.js
index 5dea065ec..09cadc85c 100644
--- a/parsers/parserSSA/popcorn.parserSSA.js
+++ b/parsers/parserSSA/popcorn.parserSSA.js
@@ -1,8 +1,8 @@
 // PARSER: 0.3 SSA/ASS
 
-(function (Popcorn) {
+(function ( Popcorn ) {
   /**
-   * SSA/ASS popcorn parser plug-in 
+   * SSA/ASS popcorn parser plug-in
    * Parses subtitle files in the identical SSA and ASS formats.
    * Style information is ignored, and may be found in these
    * formats: (\N    \n    {\pos(400,570)}     {\kf89})
@@ -10,9 +10,9 @@
    * and [Fonts] sections, only [Events] is processed.
    * Data parameter is given by Popcorn, will need a text.
    * Text is the file contents to be parsed
-   * 
+   *
    * @param {Object} data
-   * 
+   *
    * Example:
      [Script Info]
       Title: Testing subtitles for the SSA Format
@@ -26,7 +26,7 @@
       Dialogue: 0,0:00:15.04,0:00:18.04,Default,,0000,0000,0000,,It's \Na \ntrap!
    *
    */
-   
+
   // Register for SSA extensions
   Popcorn.parser( "parseSSA", function( data ) {
     // declare needed variables
@@ -41,91 +41,91 @@
         headers,
         i = 0,
         len;
-  
+
     // Here is where the magic happens
     // Split on line breaks
     lines = data.text.split( rNewLineFile );
     len = lines.length;
-    
+
     // Ignore non-textual info
     while ( i < len && lines[ i ] !== "[Events]" ) {
       i++;
     }
-    
+
     headers = parseFieldHeaders( lines[ ++i ] );
-    
+
     while ( ++i < len && lines[ i ] && lines[ i ][ 0 ] !== "[" ) {
       try {
         subs.push( createTrack( "subtitle", parseSub( lines[ i ], headers ) ) );
       } catch ( e ) {}
     }
-    
+
     retObj.data = subs;
     return retObj;
   });
-  
+
   function parseSub( line, headers ) {
     // Trim beginning 'Dialogue: ' and split on delim
     var fields = line.substr( 10 ).split( "," ),
         rAdvancedStyles = /\{(\\[\w]+\(?([\w\d]+,?)+\)?)+\}/gi,
         rNewLineSSA = /\\N/gi,
         sub;
-        
+
     sub = {
       start: toSeconds( fields[ headers.start ] ),
       end: toSeconds( fields[ headers.end ] )
     };
-    
+
     // Invalid time, skip
     if ( sub.start === -1 || sub.end === -1 ) {
       throw "Invalid time";
     }
-    
+
     // Eliminate advanced styles and convert forced line breaks
     sub.text = getTextFromFields( fields, headers.text ).replace( rAdvancedStyles, "" ).replace( rNewLineSSA, "<br />" );
-    
+
     return sub;
   }
-  
+
   // h:mm:ss.cc (centisec) string to SS.mmm
   // Returns -1 if invalid
   function toSeconds( t_in ) {
     var t = t_in.split( ":" );
-    
+
     // Not all there
     if ( t_in.length !== 10 || t.length < 3 ) {
       return -1;
     }
-    
-    return parseInt( t[ 0 ], 10 )*3600 + parseInt( t[ 1 ], 10 )*60 + parseFloat( t[ 2 ], 10 );
+
+    return parseInt( t[ 0 ], 10 )*3600 + parseInt( t[ 1 ], 10 ) * 60 + parseFloat( t[ 2 ], 10 );
   }
-  
+
   function getTextFromFields( fields, startIdx ) {
     var fieldLen = fields.length,
         text = [  ],
         i = startIdx;
-    
+
     // There may be commas in the text which were split, append back together into one line      
     for( ; i < fieldLen; i++ ) {
       text.push( fields[ i ] );
     }
-    
+
     return text.join( "," );
   }
-  
+
   function createTrack( name, attributes ) {
     var track = {};
     track[ name ] = attributes;
     return track;
   }
-  
+
   function parseFieldHeaders( line ) {
     // Trim 'Format: ' off front, split on delim
     var fields = line.substr( 8 ).split( ", " ),
         result = {},
         len,
         i;
-     
+
      //Find where in Dialogue string the start, end and text info is
     for ( i = 0, len = fields.length; i < len; i++ ) {
       if ( fields[ i ] === "Start" ) {
@@ -136,7 +136,7 @@
         result.text = i;
       }
     }
-    
+
     return result;
   }
 })( Popcorn );
diff --git a/parsers/parserSSA/popcorn.parserSSA.unit.html b/parsers/parserSSA/popcorn.parserSSA.unit.html
index bb5511661..f04845bb7 100644
--- a/parsers/parserSSA/popcorn.parserSSA.unit.html
+++ b/parsers/parserSSA/popcorn.parserSSA.unit.html
@@ -4,11 +4,11 @@
   <title>Popcorn 0.3 SSA parser 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="../../plugins/subtitle/popcorn.subtitle.js"></script>
@@ -22,25 +22,25 @@ <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"'> 
-      
-    <source id='webm'
+      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>
 </body>
 </html>
diff --git a/parsers/parserSSA/popcorn.parserSSA.unit.js b/parsers/parserSSA/popcorn.parserSSA.unit.js
index 37eb03014..82ca47781 100644
--- a/parsers/parserSSA/popcorn.parserSSA.unit.js
+++ b/parsers/parserSSA/popcorn.parserSSA.unit.js
@@ -1,5 +1,5 @@
 test( "Popcorn 0.3 SSA/ASS Parser Plugin", function () {
-  
+
   var count = 0,
       numSubs = 0,
       sub,
@@ -21,25 +21,25 @@ test( "Popcorn 0.3 SSA/ASS Parser Plugin", function () {
           end: 18.04
         }
       ],
-      expects = subs.length*3 + 1;
-      
+      expects = subs.length * 3 + 1;
+
   function plus() {
     if ( ++count === expects ) {
       start();
     }
   }
-  
+
   poppercorn.parseSSA( "data/data.ssa" );
-  
+
   expect( expects );
   stop( 5000 );
-  
+
   // Allow load time
   setTimeout(function () {
-    Popcorn.forEach( poppercorn.getTrackEvents(), function(evt) {
+    Popcorn.forEach( poppercorn.getTrackEvents(), function( evt ) {
       if( evt._natives.type === "subtitle" ) {
-        sub = subs[numSubs++];
-        
+        sub = subs[ numSubs++ ];
+
         equals( evt.start, sub.start, "Correctly parsed start of " + evt.start );
         plus();
         equals( evt.text, sub.text, "Correctly parsed text of " + evt.start );
@@ -48,10 +48,9 @@ test( "Popcorn 0.3 SSA/ASS Parser Plugin", function () {
         plus();
       }
     });
-    
+
     equals( subs.length, numSubs, "Parsed all subtitles" );
     plus();
 
   }, 500);
-  
 });

From f9e02e9bae81b5561242a3d63335290fe7335b8f Mon Sep 17 00:00:00 2001
From: stevenaw <sweerdenburg@gmail.com>
Date: Tue, 18 Oct 2011 21:10:32 -0400
Subject: [PATCH 20/78] [#751] Fix lint

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

diff --git a/parsers/parserVTT/popcorn.parserVTT.js b/parsers/parserVTT/popcorn.parserVTT.js
index 6d5e5f52d..6fdf5cae2 100644
--- a/parsers/parserVTT/popcorn.parserVTT.js
+++ b/parsers/parserVTT/popcorn.parserVTT.js
@@ -94,7 +94,7 @@
     }
     
     return time;
-  };
+  }
   
   function createTrack( name, attributes ) {
     var track = {};

From 169a9d765f950514252a834ea7b8c0d53baf4e8d Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Thu, 20 Oct 2011 11:32:35 -0400
Subject: [PATCH 21/78] #t781 proper html5 to youtube sound conversion

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

diff --git a/players/youtube/popcorn.youtube.js b/players/youtube/popcorn.youtube.js
index 3af9f2ef6..3a38918d3 100755
--- a/players/youtube/popcorn.youtube.js
+++ b/players/youtube/popcorn.youtube.js
@@ -18,7 +18,7 @@ Popcorn.player( "youtube", {
         // state code for volume changed polling
         volumeChanged = false,
         lastMuted = false,
-        lastVolume = 0;
+        lastVolume = 100;
 
     container.id = media.id + Popcorn.guid();
 
@@ -159,18 +159,18 @@ Popcorn.player( "youtube", {
         Popcorn.player.defineProperty( media, "volume", {
           set: function( val ) {
 
-            if ( youtubeObject.getVolume() !== val ) {
+            if ( youtubeObject.getVolume() / 100 !== val ) {
 
-              youtubeObject.setVolume( val );
+              youtubeObject.setVolume( val * 100 );
               lastVolume = youtubeObject.getVolume();
               media.dispatchEvent( "volumechange" );
             }
 
-            return youtubeObject.getVolume();
+            return youtubeObject.getVolume() / 100;
           },
           get: function() {
 
-            return youtubeObject.getVolume();
+            return youtubeObject.getVolume() / 100;
           }
         });
 

From 595b111b5f6350664b6364891bc2dff592ec3338 Mon Sep 17 00:00:00 2001
From: Matthew Schranz <schranz.m@gmail.com>
Date: Thu, 20 Oct 2011 11:45:22 -0400
Subject: [PATCH 22/78] [#740] Finished 2 small style errors

---
 plugins/facebook/popcorn.facebook.html | 2 +-
 plugins/facebook/popcorn.facebook.js   | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/facebook/popcorn.facebook.html b/plugins/facebook/popcorn.facebook.html
index 5c540fcac..25a8434ea 100755
--- a/plugins/facebook/popcorn.facebook.html
+++ b/plugins/facebook/popcorn.facebook.html
@@ -38,7 +38,7 @@
         header: "false",
         target: "likeboxdiv",
         start: 6,
-        end: 15 
+        end: 15
       })
       .facebook({
         site: "http://popcornjs.org/",
diff --git a/plugins/facebook/popcorn.facebook.js b/plugins/facebook/popcorn.facebook.js
index 9b256b4e1..f4a15a83d 100755
--- a/plugins/facebook/popcorn.facebook.js
+++ b/plugins/facebook/popcorn.facebook.js
@@ -194,7 +194,6 @@
         };
       }
 
-
       // Lowercase to make value consistent no matter what user inputs
       _type = _type.toLowerCase();
 
@@ -207,7 +206,6 @@
         throw new Error( "Facebook plugin type was invalid." );
       }
 
-
       options._container = document.createElement( "div" );
       options._container.id = "facebookdiv-" + Popcorn.guid();
       options._facebookdiv = document.createElement( "fb:" + _type );

From 501fbbdf7f885b4eeee2ffcef43e4ccd7585da48 Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Thu, 20 Oct 2011 12:13:27 -0400
Subject: [PATCH 23/78] #t782 default youtube player size

---
 players/youtube/popcorn.youtube.html |  2 +-
 players/youtube/popcorn.youtube.js   | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/players/youtube/popcorn.youtube.html b/players/youtube/popcorn.youtube.html
index 9700f77da..91678f399 100644
--- a/players/youtube/popcorn.youtube.html
+++ b/players/youtube/popcorn.youtube.html
@@ -141,7 +141,7 @@
   <body>
     <div>
       <div>
-        <div id="video" style="width: 360px; height: 300px;" ></div><br />
+        <div id="video" style="width: 0px; height: 0px;" ></div><br />
         <button class="simple" id="btn-play-pause">Play</button>
         <button class="seek" id="btn-seek">Seek to 30</button>
         <button class="volume" id="btn-volume">Toggle Volume</button>
diff --git a/players/youtube/popcorn.youtube.js b/players/youtube/popcorn.youtube.js
index 3af9f2ef6..d243d6f68 100755
--- a/players/youtube/popcorn.youtube.js
+++ b/players/youtube/popcorn.youtube.js
@@ -29,7 +29,9 @@ Popcorn.player( "youtube", {
       var flashvars,
           params,
           attributes,
-          src;
+          src,
+          width,
+          height;
 
       // expose a callback to this scope, that is called from the global callback youtube calls
       onYouTubePlayerReady[ container.id ] = function() {
@@ -203,8 +205,12 @@ Popcorn.player( "youtube", {
 
       src = /^.*[\/=](.{11})/.exec( media.src )[ 1 ];
 
+      // setting youtube player's height and width, default to 560 x 315
+      width = media.style.width ? ""+media.offsetWidth : "560";
+      height = media.style.height ? ""+media.offsetHeight : "315";
+
       swfobject.embedSWF( "http://www.youtube.com/e/" + src + "?enablejsapi=1&playerapiid=" + container.id + "&version=3",
-                          container.id, media.offsetWidth, media.offsetHeight, "8", null,
+                          container.id, width, height, "8", null,
                           flashvars, params, attributes );
     };
 

From e6be45f2a7a5f9a3e5c532911e8a6da833185165 Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Thu, 20 Oct 2011 12:14:41 -0400
Subject: [PATCH 24/78] #t782 removed testing code left behind

---
 players/youtube/popcorn.youtube.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/players/youtube/popcorn.youtube.html b/players/youtube/popcorn.youtube.html
index 91678f399..9700f77da 100644
--- a/players/youtube/popcorn.youtube.html
+++ b/players/youtube/popcorn.youtube.html
@@ -141,7 +141,7 @@
   <body>
     <div>
       <div>
-        <div id="video" style="width: 0px; height: 0px;" ></div><br />
+        <div id="video" style="width: 360px; height: 300px;" ></div><br />
         <button class="simple" id="btn-play-pause">Play</button>
         <button class="seek" id="btn-seek">Seek to 30</button>
         <button class="volume" id="btn-volume">Toggle Volume</button>

From d51c1fcf1426d44da39495c254f4f88bb84b51bf Mon Sep 17 00:00:00 2001
From: stevenaw <sweerdenburg@gmail.com>
Date: Thu, 20 Oct 2011 20:40:32 -0400
Subject: [PATCH 25/78] [#t751] Styling

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

diff --git a/parsers/parserSSA/popcorn.parserSSA.js b/parsers/parserSSA/popcorn.parserSSA.js
index 09cadc85c..1c2088251 100644
--- a/parsers/parserSSA/popcorn.parserSSA.js
+++ b/parsers/parserSSA/popcorn.parserSSA.js
@@ -97,7 +97,7 @@
       return -1;
     }
 
-    return parseInt( t[ 0 ], 10 )*3600 + parseInt( t[ 1 ], 10 ) * 60 + parseFloat( t[ 2 ], 10 );
+    return parseInt( t[ 0 ], 10 ) * 3600 + parseInt( t[ 1 ], 10 ) * 60 + parseFloat( t[ 2 ], 10 );
   }
 
   function getTextFromFields( fields, startIdx ) {
@@ -105,7 +105,7 @@
         text = [  ],
         i = startIdx;
 
-    // There may be commas in the text which were split, append back together into one line      
+    // There may be commas in the text which were split, append back together into one line
     for( ; i < fieldLen; i++ ) {
       text.push( fields[ i ] );
     }

From 5a888f6feb7d9680b9bfebd8d83d3f042912251b Mon Sep 17 00:00:00 2001
From: stevenaw <sweerdenburg@gmail.com>
Date: Thu, 20 Oct 2011 21:57:40 -0400
Subject: [PATCH 26/78] [#t543] Popcorn tries parse XML on xhr, Opera now reads
 ns'd id attribute on subtitle

---
 parsers/parserTTML/popcorn.parserTTML.js |  2 +-
 popcorn.js                               | 26 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/parsers/parserTTML/popcorn.parserTTML.js b/parsers/parserTTML/popcorn.parserTTML.js
index 97a83142a..048ce433f 100644
--- a/parsers/parserTTML/popcorn.parserTTML.js
+++ b/parsers/parserTTML/popcorn.parserTTML.js
@@ -102,7 +102,7 @@
       
       // Trim left and right whitespace from text and change non-explicit line breaks to spaces
       sub.text = node.textContent.replace(/^[\s]+|[\s]+$/gm, "").replace(/(?:\r\n|\r|\n)/gm, "<br />");
-      sub.id = node.getAttribute( "xml:id" );
+      sub.id = node.getAttribute( "xml:id" ) || node.getAttribute( "id" );
       sub.start = toSeconds ( node.getAttribute( "begin" ), timeOffset );
       sub.end = toSeconds( node.getAttribute( "end" ), timeOffset );
       sub.target = region;
diff --git a/popcorn.js b/popcorn.js
index f685b662f..9e1fc3f9c 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1799,6 +1799,27 @@
 
     var data, json = null;
 
+    function textToXML ( text ) {
+      try {
+        if ( window.DOMParser ) {
+
+          var parser = new DOMParser();
+          return parser.parseFromString( text, "text/xml" );
+
+        } else {
+
+          var xml = new ActiveXObject( "Microsoft.XMLDOM" );
+
+          xml.async = false;
+          xml.loadXML( text );
+
+          return xml;
+        }
+      } catch ( e ) {
+        // return null on error
+      }
+    }
+
     settings.ajax.onreadystatechange = function() {
 
       if ( settings.ajax.readyState === 4 ) {
@@ -1815,6 +1836,11 @@
           json: json
         };
 
+        if ( !data.xml || !data.xml.documentElement ) {
+          // Check for null documentElement as well so IE will cooperate
+          data.xml = textToXML( settings.ajax.responseText );
+        }
+
         //  If a dataType was specified, return that type of data
         if ( settings.dataType ) {
           data = data[ settings.dataType ];

From 710eae9ae717563539b91080ca13ee503af055ce Mon Sep 17 00:00:00 2001
From: stevenaw <sweerdenburg@gmail.com>
Date: Thu, 20 Oct 2011 23:46:46 -0400
Subject: [PATCH 27/78] [#543] Unit tests, minor fix in parse error handling

---
 popcorn.js           | 15 ++++++++--
 test/data/test.ttml  | 11 ++++++++
 test/popcorn.unit.js | 66 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 89 insertions(+), 3 deletions(-)
 create mode 100644 test/data/test.ttml

diff --git a/popcorn.js b/popcorn.js
index 9e1fc3f9c..a4f0e2d90 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1801,14 +1801,23 @@
 
     function textToXML ( text ) {
       try {
+        var xml = null;
+        
         if ( window.DOMParser ) {
 
           var parser = new DOMParser();
-          return parser.parseFromString( text, "text/xml" );
+          xml = parser.parseFromString( text, "text/xml" );
+          
+          var found = xml.getElementsByTagName( "parsererror" );
 
+          if ( !found || !found.length || !found[ 0 ].childNodes.length ) {
+            return xml;
+          }
+
+          return null;
         } else {
 
-          var xml = new ActiveXObject( "Microsoft.XMLDOM" );
+          xml = new ActiveXObject( "Microsoft.XMLDOM" );
 
           xml.async = false;
           xml.loadXML( text );
@@ -1816,7 +1825,7 @@
           return xml;
         }
       } catch ( e ) {
-        // return null on error
+        // suppress
       }
     }
 
diff --git a/test/data/test.ttml b/test/data/test.ttml
new file mode 100644
index 000000000..10f6b3347
--- /dev/null
+++ b/test/data/test.ttml
@@ -0,0 +1,11 @@
+<?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>
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index b5610da39..5714359bc 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -3218,6 +3218,71 @@ test( "dataType: Text Response", function() {
   });
 });
 
+test( "XML Conversion", function() {
+
+  var expects,
+      count = 0,
+      i,
+      len,
+      validXML = [ "data/test.xml", "data/test.ttml" ],
+      invalidXML = [ "data/test.txt", "data/remoteA.js" ];
+
+  function plus() {
+    if ( ++count === expects ) {
+      start();
+    }
+  }
+
+  expects = validXML.length * 2 + invalidXML.length * 3;
+
+  expect( expects );
+
+  stop();
+
+  function testValidXML( fileName ) {
+    Popcorn.xhr({
+      url: fileName,
+      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" );
+
+        equal( data.xml.toString(), xml.toString(), "data.xml returns a document of xml for " + fileName );
+        plus();
+      }
+    });
+  }
+
+  function testInvalidXML( fileName ) {
+    Popcorn.xhr({
+      url: fileName,
+      success: function( data ) {
+
+        ok( data, "xhr returns data" );
+        plus();
+
+        ok( !data.xml, "data.xml is null for non-xml file: " + fileName );
+        plus();
+
+        ok( data.text, "data.text is still not null" );
+        plus();
+      }
+    });
+  }
+
+  for ( i = 0, len = validXML.length; i < len; i++ ) {
+    testValidXML( validXML[ i ] );
+  }
+
+  for ( i = 0, len = invalidXML.length; i < len; i++ ) {
+    testInvalidXML( invalidXML[ i ] );
+  }
+});
+
+
 test( "JSON Response", function() {
 
   var expects = 2,
@@ -3477,6 +3542,7 @@ test( "XML Response", function() {
   });
 });
 
+
 test( "dataType: XML Response", function() {
 
   var expects = 2,

From a82a329a0cad711a9e347605a220426a33e5225b Mon Sep 17 00:00:00 2001
From: stevenaw <sweerdenburg@gmail.com>
Date: Sat, 22 Oct 2011 02:46:53 -0400
Subject: [PATCH 28/78] [#543] Remove ActiveX references, IE9+ has DOMParser

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

diff --git a/popcorn.js b/popcorn.js
index a4f0e2d90..ce708eacb 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1799,29 +1799,14 @@
 
     var data, json = null;
 
+    // Returns null on error
     function textToXML ( text ) {
       try {
-        var xml = null;
-        
-        if ( window.DOMParser ) {
-
-          var parser = new DOMParser();
-          xml = parser.parseFromString( text, "text/xml" );
-          
-          var found = xml.getElementsByTagName( "parsererror" );
-
-          if ( !found || !found.length || !found[ 0 ].childNodes.length ) {
-            return xml;
-          }
-
-          return null;
-        } else {
-
-          xml = new ActiveXObject( "Microsoft.XMLDOM" );
-
-          xml.async = false;
-          xml.loadXML( text );
+        var parser = new DOMParser();
+        var xml = parser.parseFromString( text, "text/xml" );
+        var foundErrors = xml.getElementsByTagName( "parsererror" );
 
+        if ( !foundErrors || !foundErrors.length || !foundErrors[ 0 ].childNodes.length ) {
           return xml;
         }
       } catch ( e ) {

From 3452997045606dc774be01bca0c3630d7af72168 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Mon, 24 Oct 2011 10:47:00 -0400
Subject: [PATCH 29/78] fixes as per review [#728]

---
 players/vimeo/popcorn.vimeo.html |  4 ++--
 players/vimeo/popcorn.vimeo.js   | 18 ++++++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/players/vimeo/popcorn.vimeo.html b/players/vimeo/popcorn.vimeo.html
index b92feac62..78a797af8 100644
--- a/players/vimeo/popcorn.vimeo.html
+++ b/players/vimeo/popcorn.vimeo.html
@@ -56,7 +56,7 @@
 
         // Volume
         document.getElementById( "btnVolume" ).addEventListener( "click", function() {
-          volume = volume === 100 ? 50 : 100;
+          volume = volume === 1 ? 0.5 : 1;
           player.volume( volume );
         }, false);
 
@@ -178,7 +178,7 @@
         <div>
           Current Time (s): <span id="player_time"></span>
           <br />Video Duration (s): <span id="player_duration"></span>
-          <br />Volume (0-100): <span id="player_vol"></span>
+          <br />Volume (0-1): <span id="player_vol"></span>
           <br />Load Status: <span id="player_load">Not Started</span>
         </div>
       </div>
diff --git a/players/vimeo/popcorn.vimeo.js b/players/vimeo/popcorn.vimeo.js
index 79ec595f8..134d88d75 100644
--- a/players/vimeo/popcorn.vimeo.js
+++ b/players/vimeo/popcorn.vimeo.js
@@ -20,12 +20,18 @@
           seeking = false,
           volumeChanged = false,
           lastMuted = false,
-          lastVolume = 0;
+          lastVolume = 0,
+          height,
+          width;
 
       vimeoContainer.id = media.id + Popcorn.guid();
 
       media.appendChild( vimeoContainer );
 
+      // setting vimeo player's height and width, default to 560 x 315
+      width = media.style.width ? ""+media.offsetWidth : "560";
+      height = media.style.height ? ""+media.offsetHeight : "315";
+
       var vimeoInit = function() {
 
         var flashvars,
@@ -179,20 +185,20 @@
             set: function( val ) {
 
               if ( !val || typeof val !== "number" || ( val < 0 || val > 1 ) ) {
-                return vimeoObject.api_getVolume();
+                return vimeoObject.api_getVolume() / 100;
               }
 
               if ( vimeoObject.api_getVolume() !== val ) {
-                vimeoObject.api_setVolume( val );
+                vimeoObject.api_setVolume( val * 100 );
                 lastVolume = vimeoObject.api_getVolume();
                 media.dispatchEvent( "volumechange" );
               }
 
-              return vimeoObject.api_getVolume();
+              return vimeoObject.api_getVolume() / 100;
             },
             get: function() {
 
-              return vimeoObject.api_getVolume();
+              return vimeoObject.api_getVolume() / 100;
             }
           });
 
@@ -238,7 +244,7 @@
         };
 
         swfobject.embedSWF( "http://vimeo.com/moogaloop.swf", vimeoContainer.id,
-                            media.offsetWidth + "", media.offsetHeight + "", "9.0.0", "expressInstall.swf",
+                            width, height, "9.0.0", "expressInstall.swf",
                             flashvars, params, attributes );
 
       };

From d1e4881a045f9683db376253d7814a470ff12f9c Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Mon, 24 Oct 2011 12:10:30 -0400
Subject: [PATCH 30/78] added effects to min list [#788]

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

diff --git a/Makefile b/Makefile
index b5ccd9f50..06636f1fb 100644
--- a/Makefile
+++ b/Makefile
@@ -81,6 +81,7 @@ 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 ${EFFECTS_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)

From 6eca106cd3eef163ebd90f36b21b4c9488be28b2 Mon Sep 17 00:00:00 2001
From: stevenaw <sweerdenburg@gmail.com>
Date: Mon, 24 Oct 2011 19:56:57 -0400
Subject: [PATCH 31/78] [#750] Fixing whitespace issues

---
 parsers/parserVTT/popcorn.parserVTT.html      | 102 +++++++++---------
 parsers/parserVTT/popcorn.parserVTT.js        |  70 ++++++------
 parsers/parserVTT/popcorn.parserVTT.unit.html |  16 +--
 parsers/parserVTT/popcorn.parserVTT.unit.js   |  19 ++--
 4 files changed, 103 insertions(+), 104 deletions(-)

diff --git a/parsers/parserVTT/popcorn.parserVTT.html b/parsers/parserVTT/popcorn.parserVTT.html
index 69aba6f13..65519e253 100644
--- a/parsers/parserVTT/popcorn.parserVTT.html
+++ b/parsers/parserVTT/popcorn.parserVTT.html
@@ -1,54 +1,54 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>Popcorn 0.3 WebSRT/VTT parser Plug-in Demo</title>
-  
-  <script src="../../popcorn.js"></script>
-  <script src="../../plugins/subtitle/popcorn.subtitle.js"></script>
-  <script src="popcorn.parserVTT.js"></script>
-
-  <script>
-    document.addEventListener( 'DOMContentLoaded', function () {
-      var p = Popcorn( '#video' )
-      .volume( 0 )
-      .play();
-    }, false);
-  </script>
-</head>
-<body>
-  <h1 id="qunit-header">Popcorn 0.3 WebSRT/VTT parser Plug-in Demo</h1>
-  <p>From 2.4 to 7.2 seconds, "Senator, we're making our final approach into Coruscant." is shown
-  <br />From 9.712 to 13.399 seconds, "Very good, Lieutenant." is shown
-  <br />From 15.542 to 18.542 seconds, "It's a trap!" is shown, with trap in italics</p>
-  <div>
-    <video id='video'
-      controls
-      width= '250px'
-      data-timeline-sources="data/data.vtt"
-      poster="../../test/poster.png"> 
-
-      <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"'> 
-
-      <p>Your user agent does not support the HTML5 Video element.</p> 
-
-    </video> 
-  </div>
-  
-  <h4>Subtitle Source<h4>
-  <iframe id="srcDisplay" src="data/data.VTT"></iframe>
-  
-  <style>
-    .displays {
-      width: 300px;
-      height: 300px;
-    }
-  </style>
-
-</body>
+  <head>
+    <title>Popcorn 1.0 WebSRT/VTT parser Plug-in Demo</title>
+
+    <script src="../../popcorn.js"></script>
+    <script src="../../plugins/subtitle/popcorn.subtitle.js"></script>
+    <script src="popcorn.parserVTT.js"></script>
+
+    <script>
+      document.addEventListener( "DOMContentLoaded", function () {
+        var p = Popcorn( "#video" )
+        .volume( 0 )
+        .play();
+      }, false);
+    </script>
+  </head>
+  <body>
+    <h1 id="qunit-header">Popcorn 1.0 WebSRT/VTT parser Plug-in Demo</h1>
+    <p>From 2.4 to 7.2 seconds, "Senator, we're making our final approach into Coruscant." is shown
+    <br />From 9.712 to 13.399 seconds, "Very good, Lieutenant." is shown
+    <br />From 15.542 to 18.542 seconds, "It's a trap!" is shown, with trap in italics</p>
+    <div>
+      <video id="video"
+        controls
+        width= "250px"
+        data-timeline-sources="data/data.vtt"
+        poster="../../test/poster.png">
+
+        <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"'>
+
+        <p>Your user agent does not support the HTML5 Video element.</p>
+
+      </video>
+    </div>
+
+    <h4>Subtitle Source<h4>
+    <iframe id="srcDisplay" src="data/data.VTT"></iframe>
+
+    <style>
+      .displays {
+        width: 300px;
+        height: 300px;
+      }
+    </style>
+
+  </body>
 </html>
diff --git a/parsers/parserVTT/popcorn.parserVTT.js b/parsers/parserVTT/popcorn.parserVTT.js
index 6fdf5cae2..c2d0a7f38 100644
--- a/parsers/parserVTT/popcorn.parserVTT.js
+++ b/parsers/parserVTT/popcorn.parserVTT.js
@@ -2,89 +2,89 @@
 
 (function ( Popcorn ) {
   /**
-   * WebVTT popcorn parser plug-in 
+   * WebVTT popcorn parser plug-in
    * Parses subtitle files in the WebVTT format.
    * Specification here: http://www.whatwg.org/specs/web-apps/current-work/webvtt.html
    * Styles which appear after timing information are presently ignored.
    * Inline styling tags follow HTML conventions and are left in for the browser to handle (or ignore if VTT-specific)
    * Data parameter is given by Popcorn, text property holds file contents.
    * Text is the file contents to be parsed
-   * 
+   *
    * @param {Object} data
-   * 
+   *
    * Example:
     00:32.500 --> 00:00:33.500 A:start S:50% D:vertical L:98%
     <v Neil DeGrass Tyson><i>Laughs</i>
-   */  
+   */
   Popcorn.parser( "parseVTT", function( data ) {
-  
+
     // declare needed variables
     var retObj = {
           title: "",
           remote: "",
-          data: [  ]
+          data: []
         },
-        subs = [  ],        
+        subs = [],
         i = 0,
         len = 0,
         lines,
         text,
         sub,
         rNewLine = /(?:\r\n|\r|\n)/gm;
-    
+
     // Here is where the magic happens
     // Split on line breaks
     lines = data.text.split( rNewLine );
     len = lines.length;
-    
+
     // Check for BOF token
     if ( len === 0 || lines[ 0 ] !== "WEBVTT" ) {
       return retObj;
     }
-    
+
     i++;
-    
+
     while ( i < len ) {
-      text = [  ];
-      
+      text = [];
+
       try {
         i = skipWhitespace( lines, len, i );
         sub = parseCueHeader( lines[ i++ ] );
-        
+
         // Build single line of text from multi-line subtitle in file
         while ( i < len && lines[ i ] ) {
           text.push( lines[ i++ ] );
         }
-        
+
         // Join lines together to one and build subtitle text
-        sub.text = text.join( "<br />" );        
+        sub.text = text.join( "<br />" );
         subs.push( createTrack( "subtitle", sub ) );
       } catch ( e ) {
         i = skipNonWhitespace( lines, len, i );
       }
     }
-    
+
     retObj.data = subs;
     return retObj;
   });
-    
+
   // [HH:]MM:SS.mmm string to SS.mmm float
   // Throws exception if invalid
   function toSeconds ( t_in ) {
     var t = t_in.split( ":" ),
         l = t_in.length,
         time;
-    
+
     // Invalid time string provided
     if ( l !== 12 && l !== 9 ) {
       throw "Bad cue";
     }
-    
+
     l = t.length - 1;
-    
-    try {        
+
+    try {
       time = parseInt( t[ l-1 ], 10 ) * 60 + parseFloat( t[ l ], 10 );
-      
+
       // Hours were given
       if ( l === 2 ) {
         time += parseInt( t[ 0 ], 10 ) * 3600;
@@ -92,53 +92,53 @@
     } catch ( e ) {
       throw "Bad cue";
     }
-    
+
     return time;
   }
-  
+
   function createTrack( name, attributes ) {
     var track = {};
     track[ name ] = attributes;
     return track;
   }
-  
+
   function parseCueHeader ( line ) {
     var lineSegments,
         args,
         sub = {},
         rToken = /-->/,
         rWhitespace = /[\t ]+/;
-      
+
     if ( !line || line.indexOf( "-->" ) === -1 ) {
       throw "Bad cue";
     }
-  
+
     lineSegments = line.replace( rToken, " --> " ).split( rWhitespace );
-    
+
     if ( lineSegments.length < 2 ) {
       throw "Bad cue";
     }
-    
+
     sub.id = line;
     sub.start = toSeconds( lineSegments[ 0 ] );
     sub.end = toSeconds( lineSegments[ 2 ] );
-    
+
     return sub;
   }
-  
+
   function skipWhitespace ( lines, len, i ) {
     while ( i < len && !lines[ i ] ) {
       i++;
     }
-    
+
     return i;
   }
-  
+
   function skipNonWhitespace ( lines, len, i ) {
     while ( i < len && lines[ i ] ) {
       i++;
     }
-    
+
     return i;
   }
 })( Popcorn );
diff --git a/parsers/parserVTT/popcorn.parserVTT.unit.html b/parsers/parserVTT/popcorn.parserVTT.unit.html
index 945e97193..60e62ede3 100644
--- a/parsers/parserVTT/popcorn.parserVTT.unit.html
+++ b/parsers/parserVTT/popcorn.parserVTT.unit.html
@@ -16,27 +16,27 @@
   <script src="popcorn.parserVTT.unit.js"></script>
 </head>
 <body>
-  <h1 id="qunit-header">Popcorn 0.3 WebSRT/VTT parser Plug-in Test</h1>
+  <h1 id="qunit-header">Popcorn 1.0 WebSRT/VTT parser Plug-in Test</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'
+
+  <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"'>
-      
-    <source id='webm'
+
+    <source id="webm"
       src="../../test/trailer.webm"
       type='video/webm; codecs="vp8, vorbis"'>
 
diff --git a/parsers/parserVTT/popcorn.parserVTT.unit.js b/parsers/parserVTT/popcorn.parserVTT.unit.js
index f9be8e602..7215029cc 100644
--- a/parsers/parserVTT/popcorn.parserVTT.unit.js
+++ b/parsers/parserVTT/popcorn.parserVTT.unit.js
@@ -1,5 +1,5 @@
-test( "Popcorn 0.3 WebSRT/VTT Parser Plugin", function () {
-  
+test( "Popcorn 1.0 WebSRT/VTT Parser Plugin", function () {
+
   var count = 0,
       numSubs = 0,
       sub,
@@ -30,24 +30,24 @@ test( "Popcorn 0.3 WebSRT/VTT Parser Plugin", function () {
           end: 21.670
         }
       ],
-      expects = expectedSubs.length*4 + 1;
-      
+      expects = expectedSubs.length  *4 + 1;
+
   function plus() {
     if ( ++count === expects ) {
       start();
     }
   }
-  
+
   poppercorn.parseVTT( "data/unit.vtt" );
   expect( expects );
   stop( 5000 );
-  
+
   // Allow load time
   setTimeout(function () {
     Popcorn.forEach( poppercorn.getTrackEvents(), function( evt ) {
       if( evt._natives.type === "subtitle" ) {
-        sub = expectedSubs[numSubs++];
-        
+        sub = expectedSubs[ numSubs++ ];
+
         strictEqual( evt.id, sub.id, "Correctly parsed id" );
         plus();
         strictEqual( evt.text, sub.text, "Correctly parsed text of '" + evt.id + "'" );
@@ -58,10 +58,9 @@ test( "Popcorn 0.3 WebSRT/VTT Parser Plugin", function () {
         plus();
       }
     });
-    
+
     equals( expectedSubs.length, numSubs, "Parsed all subtitles" );
     plus();
 
   }, 500);
-  
 });

From a167bcae1c9120248f73cdbba1da3fe646610f28 Mon Sep 17 00:00:00 2001
From: stevenaw <sweerdenburg@gmail.com>
Date: Mon, 24 Oct 2011 20:15:38 -0400
Subject: [PATCH 32/78] [#750] Fix dumb spacing mistake

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

diff --git a/parsers/parserVTT/popcorn.parserVTT.unit.js b/parsers/parserVTT/popcorn.parserVTT.unit.js
index 7215029cc..36085b8c1 100644
--- a/parsers/parserVTT/popcorn.parserVTT.unit.js
+++ b/parsers/parserVTT/popcorn.parserVTT.unit.js
@@ -30,7 +30,7 @@ test( "Popcorn 1.0 WebSRT/VTT Parser Plugin", function () {
           end: 21.670
         }
       ],
-      expects = expectedSubs.length  *4 + 1;
+      expects = expectedSubs.length * 4 + 1;
 
   function plus() {
     if ( ++count === expects ) {

From 1cd83e55d17eaa39358d5082b9a8642a8cb3a618 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Tue, 25 Oct 2011 13:16:19 -0400
Subject: [PATCH 33/78] Removed http references in new Vimeo player to support
 different connection types

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

diff --git a/players/vimeo/popcorn.vimeo.js b/players/vimeo/popcorn.vimeo.js
index 134d88d75..e7e0e81cc 100644
--- a/players/vimeo/popcorn.vimeo.js
+++ b/players/vimeo/popcorn.vimeo.js
@@ -243,7 +243,7 @@
           wmode: "transparent"
         };
 
-        swfobject.embedSWF( "http://vimeo.com/moogaloop.swf", vimeoContainer.id,
+        swfobject.embedSWF( "//vimeo.com/moogaloop.swf", vimeoContainer.id,
                             width, height, "9.0.0", "expressInstall.swf",
                             flashvars, params, attributes );
 
@@ -251,7 +251,7 @@
 
       if ( !window.swfobject ) {
 
-        Popcorn.getScript( "http://ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js", vimeoInit );
+        Popcorn.getScript( "//ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js", vimeoInit );
       } else {
 
         vimeoInit();

From 86ca9a8d8ebd04f34fafad26182ecfbc31894213 Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Tue, 25 Oct 2011 13:58:36 -0400
Subject: [PATCH 34/78] [#776] switching to protocol-less urls in user facing
 code

---
 players/youtube/popcorn.youtube.js       |  4 ++--
 plugins/facebook/popcorn.facebook.js     |  2 +-
 plugins/gml/popcorn.gml.js               |  4 ++--
 plugins/googlefeed/popcorn.googlefeed.js |  4 ++--
 plugins/googlemap/popcorn.googlemap.js   |  2 +-
 plugins/lastfm/popcorn.lastfm.js         |  2 +-
 plugins/linkedin/popcorn.linkedin.js     |  2 +-
 plugins/openmap/popcorn.openmap.js       | 10 +++++-----
 plugins/processing/popcorn.processing.js |  2 +-
 plugins/twitter/popcorn.twitter.js       |  2 +-
 plugins/wikipedia/popcorn.wikipedia.js   |  2 +-
 11 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/players/youtube/popcorn.youtube.js b/players/youtube/popcorn.youtube.js
index 3a38918d3..52c6433b6 100755
--- a/players/youtube/popcorn.youtube.js
+++ b/players/youtube/popcorn.youtube.js
@@ -203,14 +203,14 @@ 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( "//www.youtube.com/e/" + src + "?enablejsapi=1&playerapiid=" + container.id + "&version=3",
                           container.id, media.offsetWidth, media.offsetHeight, "8", null,
                           flashvars, params, attributes );
     };
 
     if ( !window.swfobject ) {
 
-      Popcorn.getScript( "http://ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js", youtubeInit );
+      Popcorn.getScript( "//ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js", youtubeInit );
     } else {
 
       youtubeInit();
diff --git a/plugins/facebook/popcorn.facebook.js b/plugins/facebook/popcorn.facebook.js
index f4a15a83d..5942fc76f 100755
--- a/plugins/facebook/popcorn.facebook.js
+++ b/plugins/facebook/popcorn.facebook.js
@@ -182,7 +182,7 @@
       if ( !ranOnce || options.event_app_id ) {
         ranOnce = true;
         // initialize facebook JS SDK
-        Popcorn.getScript( "http://connect.facebook.net/en_US/all.js" );
+        Popcorn.getScript( "//connect.facebook.net/en_US/all.js" );
 
         global.fbAsyncInit = function() {
           FB.init({
diff --git a/plugins/gml/popcorn.gml.js b/plugins/gml/popcorn.gml.js
index 702758d76..1b78fae63 100755
--- a/plugins/gml/popcorn.gml.js
+++ b/plugins/gml/popcorn.gml.js
@@ -163,7 +163,7 @@
       target && target.appendChild( options.container );
 
       var scriptReady = function() {
-        Popcorn.getJSONP( "http://000000book.com/data/" + options.gmltag + ".json?callback=", function( data ) {
+        Popcorn.getJSONP( "//000000book.com/data/" + options.gmltag + ".json?callback=", function( data ) {
 
           options.pjsInstance = new Processing( options.container, gmlPlayer );
           options.pjsInstance.construct( self.media, data, options );
@@ -173,7 +173,7 @@
 
       if ( !window.Processing ) {
 
-        Popcorn.getScript( "http://processingjs.org/content/download/processing-js-1.3.0/processing-1.3.0.min.js", scriptReady );
+        Popcorn.getScript( "//processingjs.org/content/download/processing-js-1.3.0/processing-1.3.0.min.js", scriptReady );
       } else {
 
         scriptReady();
diff --git a/plugins/googlefeed/popcorn.googlefeed.js b/plugins/googlefeed/popcorn.googlefeed.js
index 769031c68..9effe45bc 100755
--- a/plugins/googlefeed/popcorn.googlefeed.js
+++ b/plugins/googlefeed/popcorn.googlefeed.js
@@ -11,7 +11,7 @@
         len = links.length,
         head = document.head || document.getElementsByTagName( "head" )[ 0 ],
         css = document.createElement( "link" ),
-        resource = "http://www.google.com/uds/solutions/dynamicfeed/gfdynamicfeedcontrol.";
+        resource = "//www.google.com/uds/solutions/dynamicfeed/gfdynamicfeedcontrol.";
 
     if ( !window.GFdynamicFeedControl ) {
 
@@ -40,7 +40,7 @@
 
   if ( !window.google ) {
 
-    Popcorn.getScript( "http://www.google.com/jsapi", function() {
+    Popcorn.getScript( "//www.google.com/jsapi", function() {
 
       google.load( "feeds", "1", {
 
diff --git a/plugins/googlemap/popcorn.googlemap.js b/plugins/googlemap/popcorn.googlemap.js
index 358bc6503..203dd0e71 100755
--- a/plugins/googlemap/popcorn.googlemap.js
+++ b/plugins/googlemap/popcorn.googlemap.js
@@ -25,7 +25,7 @@ var googleCallback;
     // for some reason the Google Map API adds content to the body
     if ( document.body ) {
       _mapFired = true;
-      Popcorn.getScript( "http://maps.google.com/maps/api/js?sensor=false&callback=googleCallback" );
+      Popcorn.getScript( "//maps.google.com/maps/api/js?sensor=false&callback=googleCallback" );
     } else {
       setTimeout(function () {
         loadMaps();
diff --git a/plugins/lastfm/popcorn.lastfm.js b/plugins/lastfm/popcorn.lastfm.js
index af26ebf5e..6592b6e4f 100755
--- a/plugins/lastfm/popcorn.lastfm.js
+++ b/plugins/lastfm/popcorn.lastfm.js
@@ -77,7 +77,7 @@
             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( "//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++;
 
diff --git a/plugins/linkedin/popcorn.linkedin.js b/plugins/linkedin/popcorn.linkedin.js
index c20ecd384..e21650b74 100755
--- a/plugins/linkedin/popcorn.linkedin.js
+++ b/plugins/linkedin/popcorn.linkedin.js
@@ -117,7 +117,7 @@
           target = document.getElementById( options.target ),
           script = document.createElement( "script" );
 
-      Popcorn.getScript( "http://platform.linkedin.com/in.js" );
+      Popcorn.getScript( "//platform.linkedin.com/in.js" );
 
       options._container = document.createElement( "div" );
       options._container.appendChild( script );
diff --git a/plugins/openmap/popcorn.openmap.js b/plugins/openmap/popcorn.openmap.js
index 72811cc04..caf1ddb8b 100755
--- a/plugins/openmap/popcorn.openmap.js
+++ b/plugins/openmap/popcorn.openmap.js
@@ -87,7 +87,7 @@
           location = new OpenLayers.LonLat( 0, 0 );
           // query TinyGeocoder and re-center in callback
           Popcorn.getJSONP(
-            "http://tinygeocoder.com/create-api.php?q=" + options.location + "&callback=jsonp",
+            "//tinygeocoder.com/create-api.php?q=" + options.location + "&callback=jsonp",
             function( latlng ) {
               centerlonlat = new OpenLayers.LonLat( latlng[ 1 ], latlng[ 0 ] );
               options.map.setCenter( centerlonlat );
@@ -100,7 +100,7 @@
         if ( options.type === "SATELLITE" ) {
           // add NASA WorldWind / LANDSAT map
           options.map = new OpenLayers.Map( { div: newdiv, "maxResolution": 0.28125, tileSize: new OpenLayers.Size( 512, 512 ) } );
-          var worldwind = new OpenLayers.Layer.WorldWind( "LANDSAT", "http://worldwind25.arc.nasa.gov/tile/tile.aspx", 2.25, 4, { T: "105" } );
+          var worldwind = new OpenLayers.Layer.WorldWind( "LANDSAT", "//worldwind25.arc.nasa.gov/tile/tile.aspx", 2.25, 4, { T: "105" } );
           options.map.addLayer( worldwind );
           displayProjection = new OpenLayers.Projection( "EPSG:4326" );
           projection = new OpenLayers.Projection( "EPSG:4326" );
@@ -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", "//terraserver-usa.org/ogcmap.ashx?", { layers: "DRG" } );
           options.map.addLayer( relief );
         } else {
           // add OpenStreetMap layer
@@ -139,7 +139,7 @@
 
         // insert openlayers api script once
         if ( !window.OpenLayers ) {
-          Popcorn.getScript( "http://openlayers.org/api/OpenLayers.js" );
+          Popcorn.getScript( "//openlayers.org/api/OpenLayers.js" );
         }
 
         var isReady = function() {
@@ -193,7 +193,7 @@
                   },
                   gcThenPlotMarker = function( myMarker ) {
                     Popcorn.getJSONP(
-                      "http://tinygeocoder.com/create-api.php?q=" + myMarker.location + "&callback=jsonp",
+                      "//tinygeocoder.com/create-api.php?q=" + myMarker.location + "&callback=jsonp",
                       function( latlng ) {
                         var myPoint = new OpenLayers.Geometry.Point( latlng[1], latlng[0] ).transform( displayProjection, projection ),
                             myPointStyle = OpenLayers.Util.extend( {}, layerStyle );
diff --git a/plugins/processing/popcorn.processing.js b/plugins/processing/popcorn.processing.js
index 25a3993a2..3aa1a6d64 100644
--- a/plugins/processing/popcorn.processing.js
+++ b/plugins/processing/popcorn.processing.js
@@ -74,7 +74,7 @@
       }
 
       if ( !window.Processing ) {
-        Popcorn.getScript( "http://processingjs.org/content/download/processing-js-1.3.0/processing-1.3.0.js", function() {
+        Popcorn.getScript( "//processingjs.org/content/download/processing-js-1.3.0/processing-1.3.0.js", function() {
           scriptReady( options );
         });
       } else {
diff --git a/plugins/twitter/popcorn.twitter.js b/plugins/twitter/popcorn.twitter.js
index 661448067..e378312b1 100755
--- a/plugins/twitter/popcorn.twitter.js
+++ b/plugins/twitter/popcorn.twitter.js
@@ -74,7 +74,7 @@
 
         if ( !window.TWTR && !scriptLoading ) {
           scriptLoading = true;
-          Popcorn.getScript( "http://widgets.twimg.com/j/2/widget.js" );
+          Popcorn.getScript( "//widgets.twimg.com/j/2/widget.js" );
         }
 
         var target = document.getElementById( options.target );
diff --git a/plugins/wikipedia/popcorn.wikipedia.js b/plugins/wikipedia/popcorn.wikipedia.js
index 525bbdcda..7795f83a9 100755
--- a/plugins/wikipedia/popcorn.wikipedia.js
+++ b/plugins/wikipedia/popcorn.wikipedia.js
@@ -121,7 +121,7 @@ var wikiCallback;
       };
       
       if ( options.src ) {
-        Popcorn.getScript( "http://" + options.lang + ".wikipedia.org/w/api.php?action=parse&props=text&page=" + 
+        Popcorn.getScript( "//" + options.lang + ".wikipedia.org/w/api.php?action=parse&props=text&page=" + 
           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'" );

From a03ea26238b999408a0f735f0a3f854ba4327d5b Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Tue, 25 Oct 2011 17:24:42 -0400
Subject: [PATCH 35/78] [#t775] added support for youtube player query string

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

diff --git a/players/youtube/popcorn.youtube.js b/players/youtube/popcorn.youtube.js
index 3a38918d3..af2131222 100755
--- a/players/youtube/popcorn.youtube.js
+++ b/players/youtube/popcorn.youtube.js
@@ -29,7 +29,8 @@ Popcorn.player( "youtube", {
       var flashvars,
           params,
           attributes,
-          src;
+          src,
+          query;
 
       // expose a callback to this scope, that is called from the global callback youtube calls
       onYouTubePlayerReady[ container.id ] = function() {
@@ -187,9 +188,7 @@ Popcorn.player( "youtube", {
       options.annotations = +options.annotations === 1 || +options.annotations === 3 ? options.annotations : 1;
 
       flashvars = {
-        playerapiid: container.id,
-        controls: options.controls,
-        iv_load_policy: options.annotations
+        playerapiid: container.id
       };
 
       params = {
@@ -201,9 +200,10 @@ Popcorn.player( "youtube", {
         id: container.id
       };
 
-      src = /^.*[\/=](.{11})/.exec( media.src )[ 1 ];
+      src = /^.*(?:\/|v=)(.{11})/.exec( media.src )[ 1 ];
+      query = /^.*\?(.*)$/.exec( media.src )[ 1 ];
 
-      swfobject.embedSWF( "http://www.youtube.com/e/" + src + "?enablejsapi=1&playerapiid=" + container.id + "&version=3",
+      swfobject.embedSWF( "//www.youtube.com/e/" + src + "?" + query + "&enablejsapi=1&playerapiid=" + container.id + "&version=3",
                           container.id, media.offsetWidth, media.offsetHeight, "8", null,
                           flashvars, params, attributes );
     };

From 0358736eea7025004d9b6878c9de963bd0076f94 Mon Sep 17 00:00:00 2001
From: secretrobotron <secretrobotron@gmail.com>
Date: Tue, 25 Oct 2011 20:34:08 -0400
Subject: [PATCH 36/78] Added url data type to manifests where appropriate.

---
 plugins/attribution/popcorn.attribution.js     | 6 +++---
 plugins/facebook/popcorn.facebook.js           | 4 ++--
 plugins/googlefeed/popcorn.googlefeed.js       | 2 +-
 plugins/image/popcorn.image.js                 | 4 ++--
 plugins/processing/popcorn.processing.js       | 2 +-
 plugins/tagthisperson/popcorn.tagthisperson.js | 4 ++--
 plugins/webpage/popcorn.webpage.js             | 2 +-
 plugins/wikipedia/popcorn.wikipedia.js         | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/plugins/attribution/popcorn.attribution.js b/plugins/attribution/popcorn.attribution.js
index ab56fc5b7..488938900 100755
--- a/plugins/attribution/popcorn.attribution.js
+++ b/plugins/attribution/popcorn.attribution.js
@@ -159,7 +159,7 @@
       },
       nameofworkurl: {
         elem: "input",
-        type: "text",
+        type: "url",
         label: "Url of Work"
       },
       copyrightholder: {
@@ -169,7 +169,7 @@
       },
       copyrightholderurl: {
         elem: "input",
-        type: "text",
+        type: "url",
         label: "Copyright Holder Url"
       },
       license: {
@@ -179,7 +179,7 @@
        },
       licenseurl: {
         elem: "input",
-        type: "text",
+        type: "url",
         label: "License URL"
       },
       target: "attribution-container"
diff --git a/plugins/facebook/popcorn.facebook.js b/plugins/facebook/popcorn.facebook.js
index 2ec920b54..1a5928282 100755
--- a/plugins/facebook/popcorn.facebook.js
+++ b/plugins/facebook/popcorn.facebook.js
@@ -86,12 +86,12 @@
         },
         href: {
           elem: "input",
-          type: "text",
+          type: "url",
           label: "Href"
         },
         site: {
           elem: "input",
-          type: "text",
+          type: "url",
           label:"Site"
         },
         height: {
diff --git a/plugins/googlefeed/popcorn.googlefeed.js b/plugins/googlefeed/popcorn.googlefeed.js
index 769031c68..2308d8b47 100755
--- a/plugins/googlefeed/popcorn.googlefeed.js
+++ b/plugins/googlefeed/popcorn.googlefeed.js
@@ -166,7 +166,7 @@
       target: "feed-container",
       url: {
         elem: "input",
-        type: "text",
+        type: "url",
         label: "url"
       },
       title: {
diff --git a/plugins/image/popcorn.image.js b/plugins/image/popcorn.image.js
index 9d7d220be..52146236b 100755
--- a/plugins/image/popcorn.image.js
+++ b/plugins/image/popcorn.image.js
@@ -49,13 +49,13 @@
           },
           href: {
             elem: "input",
-            type: "text",
+            type: "url",
             label: "Link URL"
           },
           target: "image-container",
           src: {
             elem: "input",
-            type: "text",
+            type: "url",
             label: "Source URL"
           },
           text: {
diff --git a/plugins/processing/popcorn.processing.js b/plugins/processing/popcorn.processing.js
index 25a3993a2..df2de0f7d 100644
--- a/plugins/processing/popcorn.processing.js
+++ b/plugins/processing/popcorn.processing.js
@@ -149,7 +149,7 @@
       },
       sketch: {
         elem: "input",
-        type: "text",
+        type: "url",
         label: "Sketch"
       },
       noPause: {
diff --git a/plugins/tagthisperson/popcorn.tagthisperson.js b/plugins/tagthisperson/popcorn.tagthisperson.js
index d517466f5..e710d47c5 100755
--- a/plugins/tagthisperson/popcorn.tagthisperson.js
+++ b/plugins/tagthisperson/popcorn.tagthisperson.js
@@ -122,12 +122,12 @@
       },
       image: {
         elem: "input",
-        type: "text",
+        type: "url",
         label: "Image Src"
       },
       href: {
         elem: "input",
-        type: "text",
+        type: "url",
         label: "URL"
       }
     }
diff --git a/plugins/webpage/popcorn.webpage.js b/plugins/webpage/popcorn.webpage.js
index 62049821f..2f409af60 100755
--- a/plugins/webpage/popcorn.webpage.js
+++ b/plugins/webpage/popcorn.webpage.js
@@ -52,7 +52,7 @@
         },
         src: {
           elem: "input",
-          type: "text",
+          type: "url",
           label: "Src"
         },
         target: "iframe-container"
diff --git a/plugins/wikipedia/popcorn.wikipedia.js b/plugins/wikipedia/popcorn.wikipedia.js
index 525bbdcda..80388f30c 100755
--- a/plugins/wikipedia/popcorn.wikipedia.js
+++ b/plugins/wikipedia/popcorn.wikipedia.js
@@ -58,7 +58,7 @@ var wikiCallback;
         },
         src: {
           elem: "input", 
-          type: "text", 
+          type: "url", 
           label: "Src"
         },
         title: {

From 98921c3d01c03293f3a9287cfa23f2f1f03b772f Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Wed, 26 Oct 2011 13:04:59 -0400
Subject: [PATCH 37/78] [#774] youtube query string working tests

---
 players/youtube/popcorn.youtube.js      |  7 +++----
 players/youtube/popcorn.youtube.unit.js | 22 +++++++++++-----------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/players/youtube/popcorn.youtube.js b/players/youtube/popcorn.youtube.js
index af2131222..e0eaf33dd 100755
--- a/players/youtube/popcorn.youtube.js
+++ b/players/youtube/popcorn.youtube.js
@@ -201,11 +201,10 @@ Popcorn.player( "youtube", {
       };
 
       src = /^.*(?:\/|v=)(.{11})/.exec( media.src )[ 1 ];
-      query = /^.*\?(.*)$/.exec( media.src )[ 1 ];
+      query = ( media.src.split( "?" )[ 1 ] || "" ).replace( /v=.{11}/, "" );
 
-      swfobject.embedSWF( "//www.youtube.com/e/" + src + "?" + query + "&enablejsapi=1&playerapiid=" + container.id + "&version=3",
-                          container.id, media.offsetWidth, media.offsetHeight, "8", null,
-                          flashvars, params, attributes );
+      swfobject.embedSWF( "http://www.youtube.com/e/" + src + "?" + query + "&enablejsapi=1&playerapiid=" + container.id + "&version=3",
+                          container.id, media.offsetWidth, media.offsetHeight, "8", null, flashvars, params, attributes );
     };
 
     if ( !window.swfobject ) {
diff --git a/players/youtube/popcorn.youtube.unit.js b/players/youtube/popcorn.youtube.unit.js
index e014c7773..2428120b7 100644
--- a/players/youtube/popcorn.youtube.unit.js
+++ b/players/youtube/popcorn.youtube.unit.js
@@ -385,25 +385,25 @@ test( "Controls and Annotations toggling", function() {
 
   var popcorn = Popcorn.youtube( "#video", "http://www.youtube.com/watch?v=9oar9glUCL0" ),
       targetDiv = document.getElementById( "video" );
-      testTarget = targetDiv.querySelector( "object" ).querySelector( "param[name=flashvars]" );
+      testTarget = targetDiv.querySelector( "object" ).data;
 
-  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 )" );
+  ok( !/controls/.test( testTarget ), "controls are defaulted to 1 ( displayed )" );
+  ok( !/iv_load_policy/.test( testTarget ), "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 } );
+  popcorn = Popcorn.youtube( "#video", "http://www.youtube.com/watch?v=9oar9glUCL0&controls=1&iv_load_policy=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 )" );
+  testTarget = targetDiv.querySelector( "object" ).data;
+  ok( /controls=1/.test( testTarget ), "controls is set to 1 ( displayed )" );
+  ok( /iv_load_policy=1/.test( testTarget ), "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 )" );
+  popcorn = Popcorn.youtube( "#video", "http://www.youtube.com/watch?v=9oar9glUCL0&controls=0&iv_load_policy=3" );
+  testTarget = targetDiv.querySelector( "object" ).data;
+  ok( /controls=0/.test( testTarget ), "controls is set to 0 ( hidden )" );
+  ok( /iv_load_policy=3/.test( testTarget ), "annotations ( iv_load_policy ) is set to 3 ( hidden )" );
 
 });
 

From 233c0a75edd01f818e50b50fe9b33dc8ca48c83c Mon Sep 17 00:00:00 2001
From: Brian Chirls <brian@chirls.com>
Date: Wed, 26 Oct 2011 15:53:21 -0400
Subject: [PATCH 38/78] timeline is updated instantly on enable/disable as well
 as addTrackEvent. fixed unit test failure on Update Timer (frameAnimation)

---
 popcorn.js | 113 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 104 insertions(+), 9 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index f685b662f..14b310753 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -8,7 +8,7 @@
 
     var methods = ( "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+/);
+          "timeUpdate refreshTimeline plugin removePlugin compose effect parser xhr getJSONP getScript" ).split(/\s+/);
 
     while( methods.length ) {
       global.Popcorn[ methods.shift() ] = function() {};
@@ -357,6 +357,8 @@
         disabled.push( plugin );
       }
 
+      Popcorn.refreshTimeline( instance );
+
       return instance;
     },
     enable: function( instance, plugin ) {
@@ -368,6 +370,8 @@
         disabled.splice( index, 1 );
       }
 
+      Popcorn.refreshTimeline( instance );
+
       return instance;
     },
     destroy: function( instance ) {
@@ -780,25 +784,59 @@
     //  Store this definition in an array sorted by times
     var byStart = obj.data.trackEvents.byStart,
         byEnd = obj.data.trackEvents.byEnd,
-        idx;
+        startIndex, endIndex;
 
-    for ( idx = byStart.length - 1; idx >= 0; idx-- ) {
+    for ( startIndex = byStart.length - 1; startIndex >= 0; startIndex-- ) {
 
-      if ( track.start >= byStart[ idx ].start ) {
-        byStart.splice( idx + 1, 0, track );
+      if ( track.start >= byStart[ startIndex ].start ) {
+        byStart.splice( startIndex + 1, 0, track );
         break;
       }
     }
 
-    for ( idx = byEnd.length - 1; idx >= 0; idx-- ) {
+    for ( endIndex = byEnd.length - 1; endIndex >= 0; endIndex-- ) {
 
-      if ( track.end > byEnd[ idx ].end ) {
-        byEnd.splice( idx + 1, 0, track );
+      if ( track.end > byEnd[ endIndex ].end ) {
+        byEnd.splice( endIndex + 1, 0, track );
         break;
       }
     }
 
-    this.timeUpdate( obj, null );
+    // Display track event immediately if it's enabled and current
+    if ( track._natives &&
+      (!!Popcorn.registryByName[ track._natives.type ] ||
+      !!obj[ track._natives.type ] ) ) {
+
+      if ( track.end > obj.media.currentTime &&
+        track.start <= obj.media.currentTime &&
+        obj.data.disabled.indexOf( track._natives.type ) === -1 ) {
+
+        track._running = true;
+        track._natives.start.call( obj, null, track );
+        
+        if ( obj.options.frameAnimation &&
+          track._natives.frame ) {
+
+          obj.data.trackEvents.animating.push( track );
+          track._natives.frame.call( obj, null, track, obj.media.currentTime );
+        }
+      }
+    }
+
+    // update startIndex and endIndex
+    if ( startIndex <= obj.data.trackEvents.startIndex &&
+      track.start <= obj.data.trackEvents.previousUpdateTime ) {
+
+      obj.data.trackEvents.startIndex++;
+    }
+
+    if ( endIndex <= obj.data.trackEvents.endIndex &&
+      track.end < obj.data.trackEvents.previousUpdateTime ) {
+
+      obj.data.trackEvents.endIndex++;
+    }
+
+    this.timeUpdate( obj, null, true );
 
     // Store references to user added trackevents in ref table
     if ( track._id ) {
@@ -1110,6 +1148,63 @@
     tracks.previousUpdateTime = currentTime;
   };
 
+  Popcorn.refreshTimeline = function ( obj ) {
+    var currentTime = obj.media.currentTime,
+      tracks = obj.data.trackEvents,
+      animating = tracks.animating,
+      start = tracks.startIndex,
+      animIndex = 0,
+      disabled = obj.data.disabled,
+      registryByName = Popcorn.registryByName,
+      byStart, natives, type;
+
+    start = Math.min( start + 1, tracks.byStart.length - 2 );
+
+    while ( start > 0 && tracks.byStart[ start ] ) {
+
+      byStart = tracks.byStart [ start ];
+      natives = byStart._natives;
+      type = natives && natives.type;
+
+      if ( !natives ||
+        ( !!registryByName[ type ] ||
+          !!obj[ type ] ) ) {
+
+        if ( byStart.start <= currentTime &&
+          byStart.end > currentTime &&
+          disabled.indexOf ( type ) === -1 ) {
+
+          if ( !byStart._running ) {
+            byStart._running = true;
+            natives.start.call( obj, null, 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 ) ) {
+
+              natives.frame.call( obj, null, byStart, currentTime );
+            }
+          }
+        } else if ( byStart._running === true ) {
+
+          byStart._running = false;
+          natives.end.call( obj, null, byStart );
+
+          if ( obj.options.frameAnimation && byStart._natives.frame ) {
+            animIndex = animating.indexOf ( byStart );
+            if (animIndex >= 0 ) {
+              animating.splice( animIndex, 1 );
+            }
+          }
+
+        }
+      }
+
+      start--;
+    }
+  };
+
   //  Map and Extend TrackEvent functions to all Popcorn instances
   Popcorn.extend( Popcorn.p, {
 

From d924a487ef7ffc9381d9e066f2ccb1031795eeee Mon Sep 17 00:00:00 2001
From: Brian Chirls <brian@chirls.com>
Date: Wed, 26 Oct 2011 18:39:40 -0400
Subject: [PATCH 39/78] Small changes per rwaldron's comments on previous
 commit 1. Mostly whitespace clean up 2. cached obj.media.currentTime in
 addTrackEvent 3. renamed refreshTimeline => refresh

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

diff --git a/popcorn.js b/popcorn.js
index 14b310753..dc153fa1b 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -8,7 +8,7 @@
 
     var methods = ( "forEach extend effects error guid sizeOf isArray nop position disable enable destroy " +
           "addTrackEvent removeTrackEvent getTrackEvents getTrackEvent getLastTrackEventId " +
-          "timeUpdate refreshTimeline plugin removePlugin compose effect parser xhr getJSONP getScript" ).split(/\s+/);
+          "timeUpdate refresh plugin removePlugin compose effect parser xhr getJSONP getScript" ).split(/\s+/);
 
     while( methods.length ) {
       global.Popcorn[ methods.shift() ] = function() {};
@@ -357,7 +357,7 @@
         disabled.push( plugin );
       }
 
-      Popcorn.refreshTimeline( instance );
+      Popcorn.refresh( instance );
 
       return instance;
     },
@@ -370,7 +370,7 @@
         disabled.splice( index, 1 );
       }
 
-      Popcorn.refreshTimeline( instance );
+      Popcorn.refresh( instance );
 
       return instance;
     },
@@ -784,7 +784,8 @@
     //  Store this definition in an array sorted by times
     var byStart = obj.data.trackEvents.byStart,
         byEnd = obj.data.trackEvents.byEnd,
-        startIndex, endIndex;
+        startIndex, endIndex,
+        currentTime;
 
     for ( startIndex = byStart.length - 1; startIndex >= 0; startIndex-- ) {
 
@@ -804,11 +805,11 @@
 
     // Display track event immediately if it's enabled and current
     if ( track._natives &&
-      (!!Popcorn.registryByName[ track._natives.type ] ||
-      !!obj[ track._natives.type ] ) ) {
+        ( !!Popcorn.registryByName[ track._natives.type ] || !!obj[ track._natives.type ] ) ) {
 
-      if ( track.end > obj.media.currentTime &&
-        track.start <= obj.media.currentTime &&
+      currentTime = obj.media.currentTime;
+      if ( track.end > currentTime &&
+        track.start <= currentTime &&
         obj.data.disabled.indexOf( track._natives.type ) === -1 ) {
 
         track._running = true;
@@ -818,7 +819,7 @@
           track._natives.frame ) {
 
           obj.data.trackEvents.animating.push( track );
-          track._natives.frame.call( obj, null, track, obj.media.currentTime );
+          track._natives.frame.call( obj, null, track, currentTime );
         }
       }
     }
@@ -1148,7 +1149,7 @@
     tracks.previousUpdateTime = currentTime;
   };
 
-  Popcorn.refreshTimeline = function ( obj ) {
+  Popcorn.refresh = function ( obj ) {
     var currentTime = obj.media.currentTime,
       tracks = obj.data.trackEvents,
       animating = tracks.animating,
@@ -1167,12 +1168,11 @@
       type = natives && natives.type;
 
       if ( !natives ||
-        ( !!registryByName[ type ] ||
-          !!obj[ type ] ) ) {
+          ( !!registryByName[ type ] || !!obj[ type ] ) ) {
 
         if ( byStart.start <= currentTime &&
           byStart.end > currentTime &&
-          disabled.indexOf ( type ) === -1 ) {
+          disabled.indexOf( type ) === -1 ) {
 
           if ( !byStart._running ) {
             byStart._running = true;
@@ -1192,8 +1192,8 @@
           natives.end.call( obj, null, byStart );
 
           if ( obj.options.frameAnimation && byStart._natives.frame ) {
-            animIndex = animating.indexOf ( byStart );
-            if (animIndex >= 0 ) {
+            animIndex = animating.indexOf( byStart );
+            if ( animIndex >= 0 ) {
               animating.splice( animIndex, 1 );
             }
           }

From 99e012d654ac53ecbc05bac59a8bc3283699696e Mon Sep 17 00:00:00 2001
From: stevenaw <sweerdenburg@gmail.com>
Date: Wed, 26 Oct 2011 23:00:00 -0400
Subject: [PATCH 40/78] [#543] Function inlining

---
 popcorn.js | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index ce708eacb..ccf95ec4c 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1797,22 +1797,8 @@
 
   Popcorn.xhr.httpData = function( settings ) {
 
-    var data, json = null;
-
-    // Returns null on error
-    function textToXML ( text ) {
-      try {
-        var parser = new DOMParser();
-        var xml = parser.parseFromString( text, "text/xml" );
-        var foundErrors = xml.getElementsByTagName( "parsererror" );
-
-        if ( !foundErrors || !foundErrors.length || !foundErrors[ 0 ].childNodes.length ) {
-          return xml;
-        }
-      } catch ( e ) {
-        // suppress
-      }
-    }
+    var data, json = null,
+        parser, xml = null;
 
     settings.ajax.onreadystatechange = function() {
 
@@ -1831,8 +1817,20 @@
         };
 
         if ( !data.xml || !data.xml.documentElement ) {
-          // Check for null documentElement as well so IE will cooperate
-          data.xml = textToXML( settings.ajax.responseText );
+          if ( data.xml ) {
+            data.xml = null;
+          }
+
+          try {
+            parser = new DOMParser();
+            xml = parser.parseFromString( settings.ajax.responseText, "text/xml" );
+
+            if ( !xml.getElementsByTagName( "parsererror" ).length ) {
+              data.xml = xml;
+            }
+          } catch ( e ) {
+            // suppress
+          }
         }
 
         //  If a dataType was specified, return that type of data

From e9ef87fab828624039c701111ac56fe1db35830c Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Fri, 28 Oct 2011 12:00:01 -0400
Subject: [PATCH 41/78] added 7 flashvar parameters available as options

---
 players/vimeo/popcorn.vimeo.js        |  9 ++++----
 players/vimeo/popcorn.vimeo.unit.html |  1 +
 players/vimeo/popcorn.vimeo.unit.js   | 33 +++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/players/vimeo/popcorn.vimeo.js b/players/vimeo/popcorn.vimeo.js
index e7e0e81cc..8ac6993fd 100644
--- a/players/vimeo/popcorn.vimeo.js
+++ b/players/vimeo/popcorn.vimeo.js
@@ -231,12 +231,13 @@
 
         flashvars = {
           clip_id: src,
-          show_portrait: 1,
-          show_byline: 1,
-          show_title: 1,
           js_api: 1,
-          js_swf_id: vimeoContainer.id
+          js_swf_id: vimeoContainer.id,
         };
+
+        //  extend options from user to flashvars. NOTE: Videos owned by Plus Vimeo users may override these options
+        Popcorn.extend( flashvars, options );
+
         params = {
           allowscriptaccess: "always",
           allowfullscreen: "true",
diff --git a/players/vimeo/popcorn.vimeo.unit.html b/players/vimeo/popcorn.vimeo.unit.html
index 8936e85a7..53c274d1e 100644
--- a/players/vimeo/popcorn.vimeo.unit.html
+++ b/players/vimeo/popcorn.vimeo.unit.html
@@ -4,6 +4,7 @@
   <title>Vimeo Player Unit Test Suite</title>
   <link rel="stylesheet" href="../../test/qunit/qunit.css" type="text/css" media="screen">
   <script src="../../test/qunit/qunit.js"></script>
+  <script src="../../test/jquery.js"></script>
   <!--
     do not move - this must be called immediately prior to
     popcorn-api-draft.js
diff --git a/players/vimeo/popcorn.vimeo.unit.js b/players/vimeo/popcorn.vimeo.unit.js
index 3466cfb48..69041f132 100644
--- a/players/vimeo/popcorn.vimeo.unit.js
+++ b/players/vimeo/popcorn.vimeo.unit.js
@@ -1,3 +1,36 @@
+test( "Options Check", function() {
+  QUnit.reset();
+  expect( 7 );
+  var varz = {
+      title: 0,
+      byline: 0,
+      portrait:0,
+      autoplay:1,
+      loop:1,
+      color: "FFAADD",
+      fullscreen: 0
+    },
+    p2 = Popcorn.vimeo( "#player_1", "http://player.vimeo.com/video/6960892", varz );
+
+  stop();
+
+  p2.listen( "loadeddata", function() {
+    var flashvars = $( 'param[name="flashvars"]' ).attr( "value" );
+
+    var splitvars = flashvars.split( "&" );
+
+    for ( var i = 0, len = splitvars.length; i < len; i++ ) {
+      var item = splitvars[ i ].split( "=" );
+      if ( varz.hasOwnProperty( item[ 0 ] ) ) {
+        equal( varz[ item[ 0 ] ], item[ 1 ], item[ 0 ] + " is the expected value" );
+      }
+    }
+
+    start();
+  });
+
+});
+
 test( "Update Timer", function() {
 
   QUnit.reset();

From a437732b118645f943873f0ef77bd3e61b5c6404 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Fri, 28 Oct 2011 13:30:37 -0400
Subject: [PATCH 42/78] triggers canplaythrough

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

diff --git a/players/vimeo/popcorn.vimeo.js b/players/vimeo/popcorn.vimeo.js
index e7e0e81cc..3b8c8211e 100644
--- a/players/vimeo/popcorn.vimeo.js
+++ b/players/vimeo/popcorn.vimeo.js
@@ -203,6 +203,7 @@
           });
 
           media.readyState = 4;
+          media.dispatchEvent( "canplaythrough" );
           media.dispatchEvent( "load" );
           media.duration = vimeoObject.api_getDuration();
           media.dispatchEvent( "durationchange" );

From 23726b261435122f4b2330611fb193b83ce92b99 Mon Sep 17 00:00:00 2001
From: Brian Chirls <brian@chirls.com>
Date: Fri, 28 Oct 2011 17:03:56 -0400
Subject: [PATCH 43/78] Moved 'refresh' into a private function so it's no
 longer exposed on the global Popcorn object

---
 popcorn.js | 118 ++++++++++++++++++++++++++---------------------------
 1 file changed, 59 insertions(+), 59 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index dc153fa1b..d5d719523 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -8,7 +8,7 @@
 
     var methods = ( "forEach extend effects error guid sizeOf isArray nop position disable enable destroy " +
           "addTrackEvent removeTrackEvent getTrackEvents getTrackEvent getLastTrackEventId " +
-          "timeUpdate refresh plugin removePlugin compose effect parser xhr getJSONP getScript" ).split(/\s+/);
+          "timeUpdate plugin removePlugin compose effect parser xhr getJSONP getScript" ).split(/\s+/);
 
     while( methods.length ) {
       global.Popcorn[ methods.shift() ] = function() {};
@@ -58,6 +58,62 @@
       };
   }()),
 
+  refresh = function ( obj ) {
+    var currentTime = obj.media.currentTime,
+      tracks = obj.data.trackEvents,
+      animating = tracks.animating,
+      start = tracks.startIndex,
+      animIndex = 0,
+      disabled = obj.data.disabled,
+      registryByName = Popcorn.registryByName,
+      byStart, natives, type;
+
+    start = Math.min( start + 1, tracks.byStart.length - 2 );
+
+    while ( start > 0 && tracks.byStart[ start ] ) {
+
+      byStart = tracks.byStart [ start ];
+      natives = byStart._natives;
+      type = natives && natives.type;
+
+      if ( !natives ||
+          ( !!registryByName[ type ] || !!obj[ type ] ) ) {
+
+        if ( byStart.start <= currentTime &&
+          byStart.end > currentTime &&
+          disabled.indexOf( type ) === -1 ) {
+
+          if ( !byStart._running ) {
+            byStart._running = true;
+            natives.start.call( obj, null, 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 ) ) {
+
+              natives.frame.call( obj, null, byStart, currentTime );
+            }
+          }
+        } else if ( byStart._running === true ) {
+
+          byStart._running = false;
+          natives.end.call( obj, null, byStart );
+
+          if ( obj.options.frameAnimation && byStart._natives.frame ) {
+            animIndex = animating.indexOf( byStart );
+            if ( animIndex >= 0 ) {
+              animating.splice( animIndex, 1 );
+            }
+          }
+
+        }
+      }
+
+      start--;
+    }
+  },
+
   //  Declare constructor
   //  Returns an instance object.
   Popcorn = function( entity, options ) {
@@ -357,7 +413,7 @@
         disabled.push( plugin );
       }
 
-      Popcorn.refresh( instance );
+      refresh( instance );
 
       return instance;
     },
@@ -370,7 +426,7 @@
         disabled.splice( index, 1 );
       }
 
-      Popcorn.refresh( instance );
+      refresh( instance );
 
       return instance;
     },
@@ -1149,62 +1205,6 @@
     tracks.previousUpdateTime = currentTime;
   };
 
-  Popcorn.refresh = function ( obj ) {
-    var currentTime = obj.media.currentTime,
-      tracks = obj.data.trackEvents,
-      animating = tracks.animating,
-      start = tracks.startIndex,
-      animIndex = 0,
-      disabled = obj.data.disabled,
-      registryByName = Popcorn.registryByName,
-      byStart, natives, type;
-
-    start = Math.min( start + 1, tracks.byStart.length - 2 );
-
-    while ( start > 0 && tracks.byStart[ start ] ) {
-
-      byStart = tracks.byStart [ start ];
-      natives = byStart._natives;
-      type = natives && natives.type;
-
-      if ( !natives ||
-          ( !!registryByName[ type ] || !!obj[ type ] ) ) {
-
-        if ( byStart.start <= currentTime &&
-          byStart.end > currentTime &&
-          disabled.indexOf( type ) === -1 ) {
-
-          if ( !byStart._running ) {
-            byStart._running = true;
-            natives.start.call( obj, null, 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 ) ) {
-
-              natives.frame.call( obj, null, byStart, currentTime );
-            }
-          }
-        } else if ( byStart._running === true ) {
-
-          byStart._running = false;
-          natives.end.call( obj, null, byStart );
-
-          if ( obj.options.frameAnimation && byStart._natives.frame ) {
-            animIndex = animating.indexOf( byStart );
-            if ( animIndex >= 0 ) {
-              animating.splice( animIndex, 1 );
-            }
-          }
-
-        }
-      }
-
-      start--;
-    }
-  };
-
   //  Map and Extend TrackEvent functions to all Popcorn instances
   Popcorn.extend( Popcorn.p, {
 

From 01281ba20ebf65566367936c94e816d57ab76c37 Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Fri, 28 Oct 2011 19:53:07 -0400
Subject: [PATCH 44/78] [#791] default empty subtitle is now empty string

---
 plugins/subtitle/popcorn.subtitle.js        |  2 +-
 plugins/subtitle/popcorn.subtitle.unit.html |  1 +
 plugins/subtitle/popcorn.subtitle.unit.js   | 29 +++++++++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/plugins/subtitle/popcorn.subtitle.js b/plugins/subtitle/popcorn.subtitle.js
index 58dbd8da8..6239c3fd6 100755
--- a/plugins/subtitle/popcorn.subtitle.js
+++ b/plugins/subtitle/popcorn.subtitle.js
@@ -107,7 +107,7 @@
         options.innerContainer = newdiv;
 
         options.showSubtitle = function() {
-          options.innerContainer.innerHTML = options.text;
+          options.innerContainer.innerHTML = options.text || "";
         };
       },
       /**
diff --git a/plugins/subtitle/popcorn.subtitle.unit.html b/plugins/subtitle/popcorn.subtitle.unit.html
index d700ce4ac..885d6a436 100755
--- a/plugins/subtitle/popcorn.subtitle.unit.html
+++ b/plugins/subtitle/popcorn.subtitle.unit.html
@@ -56,5 +56,6 @@ <h2 id="qunit-userAgent"></h2>
     <p>Your user agent does not support the HTML5 Video element.</p>
 
   </video>
+  <div id="sub-content"></div>
 </body>
 </html>
diff --git a/plugins/subtitle/popcorn.subtitle.unit.js b/plugins/subtitle/popcorn.subtitle.unit.js
index aa0c67925..f08cd0a9b 100755
--- a/plugins/subtitle/popcorn.subtitle.unit.js
+++ b/plugins/subtitle/popcorn.subtitle.unit.js
@@ -143,3 +143,32 @@ test( "Popcorn Subtitle Plugin", function() {
     plus();
   });
 });
+
+test( "subtitle data tests", function() {
+
+  var popped = Popcorn( "#video" ),
+      expects = 1,
+      count = 0,
+      container = document.getElementById( "sub-content" );
+
+  expect( expects );
+
+  function plus() {
+    if ( ++count === expects ) {
+      start();
+    }
+  }
+
+  stop( 12000 );
+
+  popped.subtitle({
+    start: 0,
+    end: 10,
+    target: "sub-content"
+  });
+
+  popped.pause( 0 );
+
+  equals( container.children[ 0 ].innerHTML, "", "subtitle with no text defaults to an empty string" );
+  plus();
+});

From d45383807f93f567ddb2b30fca9e97ba12354729 Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Fri, 28 Oct 2011 19:59:51 -0400
Subject: [PATCH 45/78] [#795] youtube now fires a canplaythrough event

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

diff --git a/players/youtube/popcorn.youtube.js b/players/youtube/popcorn.youtube.js
index 3a38918d3..9b22c359f 100755
--- a/players/youtube/popcorn.youtube.js
+++ b/players/youtube/popcorn.youtube.js
@@ -175,6 +175,7 @@ Popcorn.player( "youtube", {
         });
 
         media.readyState = 4;
+        media.dispatchEvent( "canplaythrough" );
         media.dispatchEvent( "load" );
         media.duration = youtubeObject.getDuration();
         media.dispatchEvent( "durationchange" );

From aa2b59aed99f1f7077325624deee2a08dee65d9c Mon Sep 17 00:00:00 2001
From: stevenaw <sweerdenburg@gmail.com>
Date: Sat, 29 Oct 2011 00:43:23 -0400
Subject: [PATCH 46/78] [#543] null fix

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

diff --git a/popcorn.js b/popcorn.js
index ccf95ec4c..7af56d08f 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1817,10 +1817,8 @@
         };
 
         if ( !data.xml || !data.xml.documentElement ) {
-          if ( data.xml ) {
-            data.xml = null;
-          }
-
+          data.xml = null;
+          
           try {
             parser = new DOMParser();
             xml = parser.parseFromString( settings.ajax.responseText, "text/xml" );
@@ -1829,7 +1827,7 @@
               data.xml = xml;
             }
           } catch ( e ) {
-            // suppress
+            // data.xml remains null
           }
         }
 

From 6120d9b2d0845775754133cbeded1ba67127c668 Mon Sep 17 00:00:00 2001
From: stevenaw <sweerdenburg@gmail.com>
Date: Sat, 29 Oct 2011 12:00:27 -0400
Subject: [PATCH 47/78] [t534] Better documentation

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

diff --git a/popcorn.js b/popcorn.js
index 7af56d08f..2a2ab513d 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1816,9 +1816,10 @@
           json: json
         };
 
+        // Normalize: data.xml is non-null in IE9 regardless of if response is valid xml
         if ( !data.xml || !data.xml.documentElement ) {
           data.xml = null;
-          
+
           try {
             parser = new DOMParser();
             xml = parser.parseFromString( settings.ajax.responseText, "text/xml" );

From 4ac0f95e4dd6d7af2a5a5516ac48ed3418fdd2e0 Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Sat, 29 Oct 2011 14:52:55 -0400
Subject: [PATCH 48/78] [#704] teardown calls end before calling teardown

---
 popcorn.js           | 10 +++++++++
 test/popcorn.unit.js | 52 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)

diff --git a/popcorn.js b/popcorn.js
index f685b662f..2e70778ff 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1209,6 +1209,16 @@
       natives.start = natives.start || natives[ "in" ];
       natives.end = natives.end || natives[ "out" ];
 
+      // extend teardown to also, always, call end
+      natives._teardown = combineFn (function() {
+
+        // end function signature is not the same as teardown,
+        // put null on the front of arguments for the event parameter
+        Array.prototype.unshift.call( arguments, null );
+        // only call end if event is running
+        arguments[ 1 ]._running && natives.end.apply( this, arguments );
+      }, natives._teardown );
+
       // 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 b5610da39..c964352fd 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -2378,6 +2378,58 @@ test( "Popcorn Compose", function() {
   popped.currentTime( 0 ).play();
 });
 
+test( "Teardown end tester", function() {
+
+  QUnit.reset();
+
+  var popped = Popcorn( "#video" ),
+      expects = 4,
+      count = 0;
+
+  function plus() {
+    if ( ++count === expects ) {
+      Popcorn.removePlugin( "teardownEndTester" );
+      start();
+    }
+  }
+
+  expect( expects );
+  stop( 15000 );
+
+  Popcorn.plugin( "teardownEndTester", {
+    _setup: function( options ) {
+      options.endCalled = false;
+      options.teardownCalled = false;
+    },
+    start: function( event, options ) {
+    },
+    end: function( event, options ) {
+      // passes if end is called before teardown, and only called once
+      equal( options.endCalled, false, "ensure only teardown can call this end" );
+      plus();
+      equal( options.teardownCalled, false, "ensure teardown is not yet called" );
+      plus();
+      options.endCalled = true;
+    },
+    _teardown: function( options ) {
+
+      // passes if teardown is called after end, and only called once
+      equal( options.endCalled, true, "ensure end was previously called" );
+      plus();
+      equal( options.teardownCalled, false, "ensure teardown is not yet called" );
+      plus();
+      options.teardownCalled = true;
+    }
+  });
+
+  // start and end times to deault to entire video,
+  // to ensuring end function will never be called outside of _teardown
+  popped.teardownEndTester({});
+
+  popped.currentTime( 0 ).play();
+  popped.removePlugin( "teardownEndTester" );
+});
+
 test( "Plugin Breaker", function() {
 
   QUnit.reset();

From b83210800da2ec089d8c95d1dfd1bed76c331cb3 Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Sat, 29 Oct 2011 14:56:14 -0400
Subject: [PATCH 49/78] [704] updated comment to be more accurate

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

diff --git a/popcorn.js b/popcorn.js
index 2e70778ff..9d09ce936 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1209,7 +1209,7 @@
       natives.start = natives.start || natives[ "in" ];
       natives.end = natives.end || natives[ "out" ];
 
-      // extend teardown to also, always, call end
+      // extend teardown to always call end if running
       natives._teardown = combineFn (function() {
 
         // end function signature is not the same as teardown,

From ae217ff07c439201a5ea0d3a3ae668a387b3c60a Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Sat, 29 Oct 2011 16:18:00 -0400
Subject: [PATCH 50/78] [#792] twitter has plain text search now, and tests

---
 plugins/twitter/popcorn.twitter.js      |  3 +-
 plugins/twitter/popcorn.twitter.unit.js | 61 ++++++++++++++++++++++++-
 2 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/plugins/twitter/popcorn.twitter.js b/plugins/twitter/popcorn.twitter.js
index 661448067..978621010 100755
--- a/plugins/twitter/popcorn.twitter.js
+++ b/plugins/twitter/popcorn.twitter.js
@@ -97,7 +97,6 @@
             width = options.width || 250,
             height = options.height || 200,
             profile = /^@/.test( src ),
-            hash = /^#/.test( src ),
             widgetOptions = {
               version: 2,
               // use this id to connect it to the div
@@ -138,7 +137,7 @@
 
               new TWTR.Widget( widgetOptions ).render().setUser( src ).start();
 
-            } else if ( hash ) {
+            } else {
 
               widgetOptions.type = "search";
               widgetOptions.search = src;
diff --git a/plugins/twitter/popcorn.twitter.unit.js b/plugins/twitter/popcorn.twitter.unit.js
index 2feda17fa..1cfa4b535 100755
--- a/plugins/twitter/popcorn.twitter.unit.js
+++ b/plugins/twitter/popcorn.twitter.unit.js
@@ -8,13 +8,15 @@ test( "Popcorn Twitter Plugin", function() {
 
   expect( expects );
 
+  Popcorn.plugin.debug = true;
+
   function plus() {
     if ( ++count === expects ) {
       start();
     }
   }
 
-  stop();
+  stop( 20000 );
 
   ok( "twitter" in popped, "twitter is a method of the popped instance" );
   plus();
@@ -47,6 +49,7 @@ test( "Popcorn Twitter Plugin", function() {
   });
 
   popped.exec( 2, function() {
+
     ok( /display: none;/.test( twitterdiv.innerHTML ), "Div contents are hidden again" );
     plus();
 
@@ -56,5 +59,61 @@ test( "Popcorn Twitter Plugin", function() {
   });
 
   popped.play();
+});
+
+test( "Popcorn Twitter Plugin", function() {
+
+  var popped = Popcorn( "#video" ),
+      expects = 4,
+      count = 0,
+      twitterdiv = document.getElementById( "twitterdiv" );
+
+  expect( expects );
+
+  Popcorn.plugin.debug = true;
+
+  function plus() {
+    if ( ++count === expects ) {
+      start();
+    }
+  }
+
+  stop( 20000 );
+
+  popped.twitter({
+    start: 4,
+    end: 5,
+    title: "bieber hash",
+    src: "#oilspill",
+    target: "twitterdiv"
+  });
+
+  popped.twitter({
+    start: 5,
+    end: 6,
+    title: "plain text search",
+    src: "processing.js",
+    target: "twitterdiv"
+  });
+
+  popped.exec( 4, function() {
+
+    ok( /display: inline;/.test( twitterdiv.innerHTML ), "Div contents are displayed" );
+    plus();
+    ok( /twtr-widget/.test( twitterdiv.innerHTML ), "A Twitter widget exists" );
+    plus();
+  });
+
+  popped.exec( 5, function() {
+
+    ok( /display: inline;/.test( twitterdiv.innerHTML ), "Div contents are displayed" );
+    plus();
+    ok( /twtr-widget/.test( twitterdiv.innerHTML ), "A Twitter widget exists" );
+    plus();
+
+    popped.pause();
+  });
+
+  popped.play( 4 );
 
 });

From 0b68d98e37d0f388c2326fbc6b11ba0df075e1e0 Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Sat, 29 Oct 2011 17:00:03 -0400
Subject: [PATCH 51/78] [#793] webpage plugin no longer needs http://

---
 plugins/webpage/popcorn.webpage.html    | 2 +-
 plugins/webpage/popcorn.webpage.js      | 3 +++
 plugins/webpage/popcorn.webpage.unit.js | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/webpage/popcorn.webpage.html b/plugins/webpage/popcorn.webpage.html
index cc932c8cd..f8193a3cc 100644
--- a/plugins/webpage/popcorn.webpage.html
+++ b/plugins/webpage/popcorn.webpage.html
@@ -14,7 +14,7 @@
         id: "webpages-a",
         start: 0,
         end: 5,
-        src: "http://webmademovies.org/",
+        src: "//webmademovies.org/",
         target: "webpagediv"
       })
       .webpage({
diff --git a/plugins/webpage/popcorn.webpage.js b/plugins/webpage/popcorn.webpage.js
index 2f409af60..448f66cb7 100755
--- a/plugins/webpage/popcorn.webpage.js
+++ b/plugins/webpage/popcorn.webpage.js
@@ -62,6 +62,9 @@
 
       var target = document.getElementById( options.target );
 
+      // make src an iframe acceptable string
+      options.src = options.src.replace( /^(https?:)?(\/\/)?/, "//" );
+
       // make an iframe
       options._iframe = document.createElement( "iframe" );
       options._iframe.setAttribute( "width", "100%" );
diff --git a/plugins/webpage/popcorn.webpage.unit.js b/plugins/webpage/popcorn.webpage.unit.js
index 7491bbf5c..13952971b 100755
--- a/plugins/webpage/popcorn.webpage.unit.js
+++ b/plugins/webpage/popcorn.webpage.unit.js
@@ -26,7 +26,7 @@ test( "Popcorn Webpage Plugin", function() {
     id: "webpages-a",
     start: 0,
     end: 1,
-    src: "http://webmademovies.org",
+    src: "webmademovies.org",
     target: "webpagediv"
   })
   .webpage({

From 1d8b80725dffb03680a35d91076e6b56b5095e97 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Sun, 30 Oct 2011 22:47:34 -0400
Subject: [PATCH 52/78] Created unit tests for each of the static functions
 that didn't already have them

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

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index b5610da39..1bcc63648 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -80,6 +80,110 @@ test( "Popcorn.* Static Methods", function() {
   });
 });
 
+test( "Popcorn.error", function() {
+
+  expect( 2 );
+  equal( typeof Popcorn.error, "function", "Popcorn.error() is a provided static function" );
+
+  try{
+    Popcorn.error( "This is a Popcorn error" );
+  }
+  catch( e ) {
+    equal( e.message, "This is a Popcorn error", "Popcorn.error throwing custom error messages" );
+  }
+});
+
+test( "Popcorn.sizeOf", function() {
+
+  expect( 6 );
+
+  equal( typeof Popcorn.sizeOf, "function", "Popcorn.sizeOf() is a provided static function" );
+
+  equal( Popcorn.sizeOf( [ "a", "b", "c" ] ), 3, "Popcorn.sizeOf working with arrays" );
+
+  equal( Popcorn.sizeOf( [ ] ), 0, "Popcorn.sizeOf working with empty arrays" );
+
+  equal( Popcorn.sizeOf( { a: 1, b: "test" } ), 2, "Popcorn.sizeOf working with objects" );
+
+  equal( Popcorn.sizeOf( { } ), 0, "Popcorn.sizeOf working with empty objects" );
+
+  equal( Popcorn.sizeOf(), 0, "Popcorn.sizeOf safely handling no parameter being passed in" );
+});
+
+test( "Popcorn.nop", function() {
+
+  expect( 2 );
+
+  equal( typeof Popcorn.nop, "function", "Popcorn.nop is a provided static function" );
+
+  equal( typeof Popcorn.nop(), "undefined", "Popcorn.nop returning undefined" );
+});
+
+test( "Popcorn.getTrackEvents", function() {
+
+  expect( 7 );
+
+  var popcorn = Popcorn( "#video" );
+
+  equal( typeof Popcorn.getTrackEvents, "function", "Popcorn.getTrackEvents() is a provided static function" );
+
+  equal( typeof Popcorn.getTrackEvents.ref, "function", "Popcorn.getTrackEvents.ref() is a private use  static function" );
+
+  equal( typeof Popcorn.getTrackEvents( popcorn ), "object", "Popcorn.getTrackEvents() returns an object" ); 
+
+  equal( Popcorn.getTrackEvents( popcorn ).length, 0, "Popcorn.getTrackEvents() currently has no trackEvents" ); 
+
+  popcorn.exec( 1 , function(){ } );
+
+  equal( Popcorn.getTrackEvents( popcorn ).length, 1, "Currently only one track event" );
+
+  equal( typeof Popcorn.getTrackEvents( popcorn ), "object", "Popcorn.getTrackEvents() returns an object" ); 
+  
+  Popcorn.removeTrackEvent( popcorn, Popcorn.getTrackEvents( popcorn )[ 0 ]._id );
+
+  equal( Popcorn.getTrackEvents( popcorn ).length, 0, "Popcorn.getTrackEvents() has no items after removal" );
+});
+
+test( "Popcorn.getTrackEvent", function() {
+
+  var popcorn = Popcorn( "#video" ),
+      count = 0,
+      expects = 3;
+
+  expect( expects );
+
+  function plus() {
+
+    if ( ++count === expects ) {
+      Popcorn.removePlugin( "temp" );
+      Popcorn.removeTrackEvent( popcorn, Popcorn.getTrackEvents( popcorn )[ 0 ]._id );
+    }
+  }
+
+  equal( typeof Popcorn.getTrackEvent, "function", "Popcorn.getTrackEvent() is a provided static function" );
+  plus();
+
+  equal( typeof Popcorn.getTrackEvent.ref, "function", "Popcorn.getTrackEvent.ref() is a private use  static function" );
+  plus();
+
+  Popcorn.plugin( "temp", {
+    setup: function( options ) { },
+    start: function( event, options ) { },
+    end: function( event, options ) { }
+  });
+
+  popcorn.temp({
+    id: "asdf",
+    start: 1,
+    end: 2,
+  });
+
+  equal( typeof Popcorn.getTrackEvent( popcorn, "asdf" ), "object", "Popcorn.getTrackEvent() returns an object" ); 
+  plus();
+  
+});
+
+
 test( "Popcorn.forEach", function() {
 
   expect( 3 );

From 3b9508eeec84ac9eaae1c6becd339cbc203d770b Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Sun, 30 Oct 2011 23:26:20 -0400
Subject: [PATCH 53/78] Adde functionality to remove a plugins manifest when
 removePlugin is called. Also added supporting tests

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

diff --git a/popcorn.js b/popcorn.js
index f685b662f..269cdad79 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1364,6 +1364,7 @@
         if ( Popcorn.registry[ registryIdx ].name === name ) {
           Popcorn.registry.splice( registryIdx, 1 );
           delete Popcorn.registryByName[ name ];
+          delete Popcorn.manifest[ name ];
 
           // delete the plugin
           delete obj[ name ];
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index b5610da39..78f8b8d86 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -1363,6 +1363,25 @@ test( "Manifest", function() {
   });
 });
 
+test( "Manifest removal", function() {
+
+  var popcorn = Popcorn( "#video" );
+
+  equal( Popcorn.sizeOf( Popcorn.manifest ), 0, "Before creating new plugin" );
+
+  Popcorn.plugin( "tester", {
+  
+    start: function() {},
+    end: function() {}
+  });
+
+  equal( Popcorn.sizeOf( Popcorn.manifest ), 1, "After creating new plugin" );
+
+  Popcorn.removePlugin( "tester" );
+
+  equal( Popcorn.sizeOf( Popcorn.manifest ), 0, "After deleting plugin" );
+});
+
 test( "Configurable Defaults", function() {
 
   var expects = 13,

From a0174e9e6ae4e25d549a14be09bb334b8bc6fa39 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Mon, 31 Oct 2011 11:28:23 -0400
Subject: [PATCH 54/78] added tests for triggered events

---
 players/vimeo/popcorn.vimeo.unit.js | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/players/vimeo/popcorn.vimeo.unit.js b/players/vimeo/popcorn.vimeo.unit.js
index 3466cfb48..f894c39ac 100644
--- a/players/vimeo/popcorn.vimeo.unit.js
+++ b/players/vimeo/popcorn.vimeo.unit.js
@@ -3,7 +3,7 @@ test( "Update Timer", function() {
   QUnit.reset();
 
   var p2 = Popcorn.vimeo( "#player_1", "http://player.vimeo.com/video/6960892" ),
-      expects = 12,
+      expects = 16,
       count = 0,
       execCount = 0,
       // These make sure events are only fired once
@@ -29,6 +29,30 @@ test( "Update Timer", function() {
   // These tests come close to 10 seconds on chrome, increasing to 15
   stop();
 
+  p2.listen( "canplaythrough", function() {
+    p2.unlisten( "canplaythrough" );
+    ok( true, "'canplaythrough' fired" );
+    plus();
+  });
+
+  p2.listen( "load", function() {
+    p2.unlisten( "load" );
+    ok( true, "'load' fired" );
+    plus();
+  });
+
+  p2.listen( "durationchange", function() {
+    p2.unlisten( "durationchange" );
+    ok( true, "'durationchange' fired" );
+    plus();
+  });
+
+  p2.listen( "loadeddata", function() {
+    p2.unlisten( "loadeddata" );
+    ok( true, "'loadeddata' fired" );
+    plus();
+  });
+
   Popcorn.plugin( "forwards", function() {
     return {
       start: function( event, options ) {
@@ -192,7 +216,7 @@ test( "Plugin Factory", function() {
   }
 
   expect( expects );
-  stop( 15000 );
+  stop( 20000 );
 
   Popcorn.plugin( "executor", function() {
 

From bcaf35f4150dc648bd451c73aad44d6651541bfb Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Mon, 31 Oct 2011 13:58:41 -0400
Subject: [PATCH 55/78] Fixed leaking exec calls in Index Integrity tests
 [#800]

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

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index b5610da39..986c3d7e8 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -2956,6 +2956,7 @@ test( "Index Integrity ( timeUpdate )", function() {
     if ( ++count === expects ) {
       start();
       Popcorn.removePlugin( "ff" );
+      $pop.removePlugin( "exec" );
     }
   }
 
@@ -3026,6 +3027,7 @@ test( "Index Integrity (frameAnimation)", function() {
     if ( ++count === expects ) {
       start();
       Popcorn.removePlugin( "ff" );
+      $pop.removePlugin( "exec" );
     }
   }
 

From 9e2a95346676e974f5789e7ba19d759421413496 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Mon, 31 Oct 2011 17:10:06 -0400
Subject: [PATCH 56/78] fixed never ending frame animation looping after an
 instance is destroyed [#800]

---
 popcorn.js           | 8 ++++----
 test/popcorn.unit.js | 9 ++++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index f685b662f..010589e16 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -214,10 +214,10 @@
 
               that.trigger( "timeupdate" );
 
-              requestAnimFrame( animate );
+              !that.isDestroyed && requestAnimFrame( animate );
             };
 
-            requestAnimFrame( animate );
+            !that.isDestroyed && requestAnimFrame( animate );
 
           } else {
 
@@ -384,7 +384,7 @@
       }
 
       if ( !instance.isDestroyed ) {
-        instance.media.removeEventListener( "timeupdate", instance.data.timeUpdateFunction, false );
+        instance.data.timeUpdateFunction && instance.media.removeEventListener( "timeupdate", instance.data.timeUpdateFunction, false );
         instance.isDestroyed = true;
       }
     }
@@ -2046,7 +2046,7 @@
 
   //  Protected API methods
   Popcorn.protect = {
-    natives: getItems() 
+    natives: getItems()
   };
 
   //  Exposes Popcorn to global context
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 986c3d7e8..4655c8501 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -1608,6 +1608,7 @@ test( "frame function (frameAnimation)", function() {
     if ( ++count === expects ) {
       // clean up added events after tests
       Popcorn.removePlugin( "frameFn" );
+      $pop.destroy();
       start();
     }
   }
@@ -1831,6 +1832,7 @@ test( "Update Timer (frameAnimation)", function() {
       Popcorn.removePlugin( "forwards" );
       Popcorn.removePlugin( "backwards" );
       Popcorn.removePlugin( "wrapper" );
+      p2.destroy();
       start();
     }
   }
@@ -2956,7 +2958,7 @@ test( "Index Integrity ( timeUpdate )", function() {
     if ( ++count === expects ) {
       start();
       Popcorn.removePlugin( "ff" );
-      $pop.removePlugin( "exec" );
+      $pop.destroy();
     }
   }
 
@@ -3027,7 +3029,7 @@ test( "Index Integrity (frameAnimation)", function() {
     if ( ++count === expects ) {
       start();
       Popcorn.removePlugin( "ff" );
-      $pop.removePlugin( "exec" );
+      $pop.destroy();
     }
   }
 
@@ -3908,7 +3910,8 @@ test( "Basic Audio Support (frameAnimation)", function() {
   function plus() {
 
     if ( ++count === expects ) {
-
+      popped.destroy();
+      popObj.destroy();
       start();
     }
   }

From 050ec1781e779693205cfcf6e3086304982ffbc2 Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Mon, 31 Oct 2011 17:58:43 -0400
Subject: [PATCH 57/78] [#704] grammar fix in comment. Sorry, no tests for the
 grammar fix.

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

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index c964352fd..33f3de0ed 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -2423,7 +2423,7 @@ test( "Teardown end tester", function() {
   });
 
   // start and end times to deault to entire video,
-  // to ensuring end function will never be called outside of _teardown
+  // to ensure the end function will never be called outside of _teardown
   popped.teardownEndTester({});
 
   popped.currentTime( 0 ).play();

From 537c044e7c8784c83365f43aa7f45713a874d3e9 Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Mon, 31 Oct 2011 18:08:37 -0400
Subject: [PATCH 58/78] [#792] fixed twitter tests running in opera

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

diff --git a/plugins/twitter/popcorn.twitter.unit.js b/plugins/twitter/popcorn.twitter.unit.js
index 1cfa4b535..033aca0ce 100755
--- a/plugins/twitter/popcorn.twitter.unit.js
+++ b/plugins/twitter/popcorn.twitter.unit.js
@@ -42,7 +42,8 @@ test( "Popcorn Twitter Plugin", function() {
   setupId = popped.getLastTrackEventId();
 
   popped.exec( 1, function() {
-    ok( /display: inline;/.test( twitterdiv.innerHTML ), "Div contents are displayed" );
+
+    ok( /display: inline/.test( twitterdiv.innerHTML ), "Div contents are displayed" );
     plus();
     ok( /twtr-widget/.test( twitterdiv.innerHTML ), "A Twitter widget exists" );
     plus();
@@ -50,7 +51,7 @@ test( "Popcorn Twitter Plugin", function() {
 
   popped.exec( 2, function() {
 
-    ok( /display: none;/.test( twitterdiv.innerHTML ), "Div contents are hidden again" );
+    ok( /display: none/.test( twitterdiv.innerHTML ), "Div contents are hidden again" );
     plus();
 
     popped.pause().removeTrackEvent( setupId );
@@ -98,7 +99,7 @@ test( "Popcorn Twitter Plugin", function() {
 
   popped.exec( 4, function() {
 
-    ok( /display: inline;/.test( twitterdiv.innerHTML ), "Div contents are displayed" );
+    ok( /display: inline/.test( twitterdiv.innerHTML ), "Div contents are displayed" );
     plus();
     ok( /twtr-widget/.test( twitterdiv.innerHTML ), "A Twitter widget exists" );
     plus();
@@ -106,7 +107,7 @@ test( "Popcorn Twitter Plugin", function() {
 
   popped.exec( 5, function() {
 
-    ok( /display: inline;/.test( twitterdiv.innerHTML ), "Div contents are displayed" );
+    ok( /display: inline/.test( twitterdiv.innerHTML ), "Div contents are displayed" );
     plus();
     ok( /twtr-widget/.test( twitterdiv.innerHTML ), "A Twitter widget exists" );
     plus();

From 515a212bd6b1873d70c2d7fb6f21fdcc073d7257 Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Mon, 31 Oct 2011 19:29:24 -0400
Subject: [PATCH 59/78] [#782] youtube height and width tests

---
 players/youtube/popcorn.youtube.unit.html |  2 ++
 players/youtube/popcorn.youtube.unit.js   | 28 +++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/players/youtube/popcorn.youtube.unit.html b/players/youtube/popcorn.youtube.unit.html
index ac1e6376d..50637ff29 100644
--- a/players/youtube/popcorn.youtube.unit.html
+++ b/players/youtube/popcorn.youtube.unit.html
@@ -34,6 +34,8 @@ <h2 id="qunit-userAgent"></h2>
   <div id="video" style="width: 360px; height: 300px" ></div>
   <div id="video2" style="width: 360px; height: 300px" ></div>
   <div id="video3" style="width: 360px; height: 300px" ></div>
+  <div id="video4"></div>
+  <div id="video5" style="width: 0px; height: 0px" ></div>
 </body>
 </html>
 
diff --git a/players/youtube/popcorn.youtube.unit.js b/players/youtube/popcorn.youtube.unit.js
index e014c7773..3e0a86c0e 100644
--- a/players/youtube/popcorn.youtube.unit.js
+++ b/players/youtube/popcorn.youtube.unit.js
@@ -407,3 +407,31 @@ test( "Controls and Annotations toggling", function() {
 
 });
 
+test( "Player height and width", function() {
+
+  QUnit.reset();
+
+  expect( 4 );
+
+  stop( 10000 );
+  var popcorn1 = Popcorn.youtube( "#video4", "http://www.youtube.com/watch?v=9oar9glUCL0" ),
+      popcorn2 = Popcorn.youtube( "#video5", "http://www.youtube.com/watch?v=9oar9glUCL0" ),
+      readyStatePoll = function() {
+
+        if ( popcorn1.media.readyState !== 4 && popcorn2.media.readyState !== 4 ) {
+
+          setTimeout( readyStatePoll, 10 );
+        } else {
+
+          equal( popcorn1.media.children[ 0 ].width, 560, "Youtube player default width is 560" );
+          equal( popcorn1.media.children[ 0 ].height, 315, "Youtube player default height is 315" );
+
+          equal( popcorn2.media.children[ 0 ].width, 0, "Youtube player explicit width is 0" );
+          equal( popcorn2.media.children[ 0 ].height, 0, "Youtube player explicit height is 0" );
+          start();
+        }
+      };
+
+  readyStatePoll();
+});
+

From a6f2a407a9c9253502cd130947ecdd30549d84d7 Mon Sep 17 00:00:00 2001
From: Jon Buckley <jon@jbuckley.ca>
Date: Mon, 31 Oct 2011 13:49:44 -0400
Subject: [PATCH 60/78] Seek to end of video before testing Compose to make
 independent

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

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 41e132527..f737235fe 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -2219,6 +2219,8 @@ test( "Popcorn Compose", function() {
     }
   });
 
+  popped.pause( popped.duration() );
+
   popped.testPlugin({
     start: 0,
     end: 1,
@@ -2267,13 +2269,11 @@ test( "Popcorn Compose", function() {
   equal( test.two.setup, 3, "three compose two setup" );
   plus();
 
-  popped.currentTime( 0 ).pause();
-
   popped.exec( 0, function() {
     equal( test.one.running, 1, "one compose running" );
-   plus();
-   equal( test.two.running, 1, "one effect running" );
-   plus();
+    plus();
+    equal( test.two.running, 1, "one effect running" );
+    plus();
   })
   .exec( 1, function() {
     equal( test.one.running, 0, "no compose running" );
@@ -2326,7 +2326,6 @@ test( "Popcorn Compose", function() {
   // 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" );

From 43c4a7e746dc59ced1ac1e88bffec6f46afc6b06 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Tue, 1 Nov 2011 12:07:04 -0400
Subject: [PATCH 61/78] Fixed my fail when I merged #776 [#802]

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

diff --git a/players/youtube/popcorn.youtube.js b/players/youtube/popcorn.youtube.js
index 291c3f88f..bfd7d3cd5 100755
--- a/players/youtube/popcorn.youtube.js
+++ b/players/youtube/popcorn.youtube.js
@@ -204,9 +204,8 @@ Popcorn.player( "youtube", {
       src = /^.*(?:\/|v=)(.{11})/.exec( media.src )[ 1 ];
       query = ( media.src.split( "?" )[ 1 ] || "" ).replace( /v=.{11}/, "" );
 
-      swfobject.embedSWF( "//www.youtube.com/e/" + src + "?enablejsapi=1&playerapiid=" + container.id + "&version=3",
-                          container.id, media.offsetWidth, media.offsetHeight, "8", null,
-                          flashvars, params, attributes );
+      swfobject.embedSWF( "//www.youtube.com/e/" + src + "?" + query + "&enablejsapi=1&playerapiid=" + container.id + "&version=3",
+                          container.id, media.offsetWidth, media.offsetHeight, "8", null, flashvars, params, attributes );
     };
 
     if ( !window.swfobject ) {

From f454e1915b2de65d9cf0321fa0917f65c43beb0b Mon Sep 17 00:00:00 2001
From: Jon Buckley <jon@jbuckley.ca>
Date: Tue, 1 Nov 2011 12:28:24 -0400
Subject: [PATCH 62/78] Fix parseTTML demo

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

diff --git a/parsers/parserTTML/popcorn.parserTTML.html b/parsers/parserTTML/popcorn.parserTTML.html
index fe6026a21..3c410773e 100644
--- a/parsers/parserTTML/popcorn.parserTTML.html
+++ b/parsers/parserTTML/popcorn.parserTTML.html
@@ -10,6 +10,7 @@
   <script>
     document.addEventListener( 'DOMContentLoaded', function () {
       var p = Popcorn( '#video' )
+      .parseTTML("data/data.ttml")
       .volume( 0 )
       .play();
     }, false);
@@ -31,8 +32,7 @@ <h1 id="qunit-header">Popcorn 0.3 TTML parser Plug-in Demo</h1>
     <video id='video'
       controls
       width= '250px'
-      data-timeline-sources="data/data.ttml"
-      poster="../../test/poster.png"> 
+      poster="../../test/poster.png">
 
       <source id='mp4'
         src="../../test/trailer.mp4"

From 284b3da82f21458696354a76050c2ca68cf7065c Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Tue, 1 Nov 2011 12:45:07 -0400
Subject: [PATCH 63/78] Fixed styling issues

---
 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 1bcc63648..0c475eee1 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -138,7 +138,7 @@ test( "Popcorn.getTrackEvents", function() {
   equal( Popcorn.getTrackEvents( popcorn ).length, 1, "Currently only one track event" );
 
   equal( typeof Popcorn.getTrackEvents( popcorn ), "object", "Popcorn.getTrackEvents() returns an object" ); 
-  
+
   Popcorn.removeTrackEvent( popcorn, Popcorn.getTrackEvents( popcorn )[ 0 ]._id );
 
   equal( Popcorn.getTrackEvents( popcorn ).length, 0, "Popcorn.getTrackEvents() has no items after removal" );
@@ -180,9 +180,8 @@ test( "Popcorn.getTrackEvent", function() {
 
   equal( typeof Popcorn.getTrackEvent( popcorn, "asdf" ), "object", "Popcorn.getTrackEvent() returns an object" ); 
   plus();
-  
-});
 
+});
 
 test( "Popcorn.forEach", function() {
 

From 612e4161bb18b6942fcc0016fef2643f63854093 Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Tue, 1 Nov 2011 13:06:15 -0400
Subject: [PATCH 64/78] [#805] Fixes minor core style issues and arguments ->
 array reference

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

diff --git a/popcorn.js b/popcorn.js
index 50eadd579..8e745f63e 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -870,7 +870,7 @@
 
         track._running = true;
         track._natives.start.call( obj, null, track );
-        
+
         if ( obj.options.frameAnimation &&
           track._natives.frame ) {
 
@@ -1305,13 +1305,16 @@
       natives.end = natives.end || natives[ "out" ];
 
       // extend teardown to always call end if running
-      natives._teardown = combineFn (function() {
+      natives._teardown = combineFn(function() {
+
+        var args = slice.call( arguments );
 
         // end function signature is not the same as teardown,
         // put null on the front of arguments for the event parameter
-        Array.prototype.unshift.call( arguments, null );
+        args.unshift( null );
+
         // only call end if event is running
-        arguments[ 1 ]._running && natives.end.apply( this, arguments );
+        args[ 1 ]._running && natives.end.apply( this, args );
       }, natives._teardown );
 
       // Check for previously set default options

From f57b1e1aff99a73942c486069f7d72dffccb3a42 Mon Sep 17 00:00:00 2001
From: David Seifried <david.c.seifried@gmail.com>
Date: Tue, 1 Nov 2011 13:15:11 -0400
Subject: [PATCH 65/78] Fixed some styling issues

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

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 0c475eee1..ff086a94f 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -99,13 +99,13 @@ test( "Popcorn.sizeOf", function() {
 
   equal( typeof Popcorn.sizeOf, "function", "Popcorn.sizeOf() is a provided static function" );
 
-  equal( Popcorn.sizeOf( [ "a", "b", "c" ] ), 3, "Popcorn.sizeOf working with arrays" );
+  equal( Popcorn.sizeOf([ "a", "b", "c" ]), 3, "Popcorn.sizeOf working with arrays" );
 
-  equal( Popcorn.sizeOf( [ ] ), 0, "Popcorn.sizeOf working with empty arrays" );
+  equal( Popcorn.sizeOf([ ]), 0, "Popcorn.sizeOf working with empty arrays" );
 
-  equal( Popcorn.sizeOf( { a: 1, b: "test" } ), 2, "Popcorn.sizeOf working with objects" );
+  equal( Popcorn.sizeOf({ a: 1, b: "test" }), 2, "Popcorn.sizeOf working with objects" );
 
-  equal( Popcorn.sizeOf( { } ), 0, "Popcorn.sizeOf working with empty objects" );
+  equal( Popcorn.sizeOf({ }), 0, "Popcorn.sizeOf working with empty objects" );
 
   equal( Popcorn.sizeOf(), 0, "Popcorn.sizeOf safely handling no parameter being passed in" );
 });
@@ -133,7 +133,7 @@ test( "Popcorn.getTrackEvents", function() {
 
   equal( Popcorn.getTrackEvents( popcorn ).length, 0, "Popcorn.getTrackEvents() currently has no trackEvents" ); 
 
-  popcorn.exec( 1 , function(){ } );
+  popcorn.exec( 1, function(){ });
 
   equal( Popcorn.getTrackEvents( popcorn ).length, 1, "Currently only one track event" );
 

From 32734414f3a9d98889444358b2da4949bde5baa2 Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Tue, 1 Nov 2011 13:27:06 -0400
Subject: [PATCH 66/78] [#806] Cleanup internal refresh() function

---
 popcorn.js | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index 50eadd579..37815fc0a 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -10,7 +10,7 @@
           "addTrackEvent removeTrackEvent getTrackEvents getTrackEvent getLastTrackEventId " +
           "timeUpdate plugin removePlugin compose effect parser xhr getJSONP getScript" ).split(/\s+/);
 
-    while( methods.length ) {
+    while ( methods.length ) {
       global.Popcorn[ methods.shift() ] = function() {};
     }
     return;
@@ -58,30 +58,30 @@
       };
   }()),
 
-  refresh = function ( obj ) {
+  refresh = function( obj ) {
     var currentTime = obj.media.currentTime,
+      animation = obj.options.frameAnimation,
+      disabled = obj.data.disabled,
       tracks = obj.data.trackEvents,
       animating = tracks.animating,
       start = tracks.startIndex,
-      animIndex = 0,
-      disabled = obj.data.disabled,
       registryByName = Popcorn.registryByName,
+      animIndex = 0,
       byStart, natives, type;
 
     start = Math.min( start + 1, tracks.byStart.length - 2 );
 
     while ( start > 0 && tracks.byStart[ start ] ) {
 
-      byStart = tracks.byStart [ start ];
+      byStart = tracks.byStart[ start ];
       natives = byStart._natives;
       type = natives && natives.type;
 
       if ( !natives ||
           ( !!registryByName[ type ] || !!obj[ type ] ) ) {
 
-        if ( byStart.start <= currentTime &&
-          byStart.end > currentTime &&
-          disabled.indexOf( type ) === -1 ) {
+        if ( ( byStart.start <= currentTime && byStart.end > currentTime ) &&
+                disabled.indexOf( type ) === -1 ) {
 
           if ( !byStart._running ) {
             byStart._running = true;
@@ -89,8 +89,8 @@
 
             // 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 ) ) {
+            if ( animation &&
+                ( byStart && byStart._running && byStart.natives.frame ) ) {
 
               natives.frame.call( obj, null, byStart, currentTime );
             }
@@ -100,13 +100,12 @@
           byStart._running = false;
           natives.end.call( obj, null, byStart );
 
-          if ( obj.options.frameAnimation && byStart._natives.frame ) {
+          if ( animation && byStart._natives.frame ) {
             animIndex = animating.indexOf( byStart );
             if ( animIndex >= 0 ) {
               animating.splice( animIndex, 1 );
             }
           }
-
         }
       }
 
@@ -870,7 +869,7 @@
 
         track._running = true;
         track._natives.start.call( obj, null, track );
-        
+
         if ( obj.options.frameAnimation &&
           track._natives.frame ) {
 

From 5d5443aba3b84646fb651e528605bd81d7c253cb Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Tue, 1 Nov 2011 13:41:48 -0400
Subject: [PATCH 67/78] [#807] Adds 36 instance shape tests

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

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 93f7ff1c3..41b0ee53d 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -423,6 +423,69 @@ test( "Object", function() {
   });
 });
 
+test( "Instance", function() {
+
+  var a = Popcorn( "#video" ),
+      b = Popcorn( "#video", { frameAnimation: true });
+
+  expect( 36 );
+
+	ok( a.options, "instance a has options property" );
+	ok( b.options, "instance b has options property" );
+
+	ok( a.isDestroyed === false , "instance a has isDestroyed property" );
+	ok( b.isDestroyed === false, "instance b has isDestroyed property" );
+
+	ok( a.data, "instance a has data property" );
+	ok( b.data, "instance b has data property" );
+
+	ok( a.data.timeUpdate, "instance a has data.timeUpdate property" );
+	ok( b.data.timeUpdate, "instance b has data.timeUpdate property" );
+
+	ok( a.data.disabled, "instance a has data.disabled property" );
+	ok( b.data.disabled, "instance b has data.disabled property" );
+
+	ok( a.data.events, "instance a has data.events property" );
+	ok( b.data.events, "instance b has data.events property" );
+
+	ok( a.data.hooks, "instance a has data.hooks property" );
+	ok( b.data.hooks, "instance b has data.hooks property" );
+
+	ok( a.data.history, "instance a has data.history property" );
+	ok( b.data.history, "instance b has data.history property" );
+
+	ok( a.data.state, "instance a has data.state property" );
+	ok( b.data.state, "instance b has data.state property" );
+
+	ok( a.data.state.volume, "instance a has data.state.volume property" );
+	ok( b.data.state.volume, "instance b has data.state.volume property" );
+
+	ok( a.data.trackRefs, "instance a has data.trackRefs property" );
+	ok( b.data.trackRefs, "instance b has data.trackRefs property" );
+
+	ok( a.data.trackEvents, "instance a has data.trackEvents property" );
+	ok( b.data.trackEvents, "instance b has data.trackEvents property" );
+
+	ok( a.data.trackEvents.byStart, "instance a has data.trackEvents.byStart property" );
+	ok( b.data.trackEvents.byStart, "instance b has data.trackEvents.byStart property" );
+
+	ok( a.data.trackEvents.byEnd, "instance a has data.trackEvents.byEnd property" );
+	ok( b.data.trackEvents.byEnd, "instance b has data.trackEvents.byEnd property" );
+
+	ok( a.data.trackEvents.animating, "instance a has data.trackEvents.animating property" );
+	ok( b.data.trackEvents.animating, "instance b has data.trackEvents.animating property" );
+
+	ok( a.data.trackEvents.startIndex, "instance a has data.trackEvents.startIndex property" );
+	ok( b.data.trackEvents.startIndex, "instance b has data.trackEvents.startIndex property" );
+
+	ok( a.data.trackEvents.endIndex, "instance a has data.trackEvents.endIndex property" );
+	ok( b.data.trackEvents.endIndex, "instance b has data.trackEvents.endIndex property" );
+
+	ok( a.data.trackEvents.previousUpdateTime === 0, "instance a has data.trackEvents.previousUpdateTime property" );
+	ok( b.data.trackEvents.previousUpdateTime === 0, "instance b has data.trackEvents.previousUpdateTime property" );
+
+});
+
 module( "Popcorn Static" );
 
 test( "Popcorn.[addTrackEvent | removeTrackEvent].ref()", function() {
@@ -1370,7 +1433,7 @@ test( "Manifest removal", function() {
   equal( Popcorn.sizeOf( Popcorn.manifest ), 0, "Before creating new plugin" );
 
   Popcorn.plugin( "tester", {
-  
+
     start: function() {},
     end: function() {}
   });

From 1343a1062a166dfdd19b9df0d342e717b69898a3 Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Tue, 1 Nov 2011 13:46:10 -0400
Subject: [PATCH 68/78] [#807] Implements common instance.data.timeUpdate() and
 fixes tests

---
 popcorn.js           | 19 +++++++++++--------
 test/popcorn.unit.js |  4 ++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index 50eadd579..1fb5d659b 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -203,6 +203,9 @@
 
       this.data = {
 
+				// Executed by either timeupdate event or in rAF loop
+				timeUpdate: Popcorn.nop,
+
         // Allows disabling a plugin per instance
         disabled: [],
 
@@ -244,7 +247,7 @@
       //  Wrap true ready check
       var isReady = function( that ) {
 
-        var duration, videoDurationPlus, animate;
+        var duration, videoDurationPlus;
 
         if ( that.media.readyState >= 2 ) {
           //  Adding padding to the front and end of the arrays
@@ -264,25 +267,25 @@
             //  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 () {
+            that.data.timeUpdate = function () {
 
               Popcorn.timeUpdate( that, {} );
 
               that.trigger( "timeupdate" );
 
-              !that.isDestroyed && requestAnimFrame( animate );
+              !that.isDestroyed && requestAnimFrame( that.data.timeUpdate );
             };
 
-            !that.isDestroyed && requestAnimFrame( animate );
+            !that.isDestroyed && requestAnimFrame( that.data.timeUpdate );
 
           } else {
 
-            that.data.timeUpdateFunction = function( event ) {
+            that.data.timeUpdate = function( event ) {
               Popcorn.timeUpdate( that, event );
             };
 
             if ( !that.isDestroyed ) {
-              that.media.addEventListener( "timeupdate", that.data.timeUpdateFunction, false );
+              that.media.addEventListener( "timeupdate", that.data.timeUpdate, false );
             }
           }
         } else {
@@ -444,7 +447,7 @@
       }
 
       if ( !instance.isDestroyed ) {
-        instance.data.timeUpdateFunction && instance.media.removeEventListener( "timeupdate", instance.data.timeUpdateFunction, false );
+        instance.data.timeUpdate && instance.media.removeEventListener( "timeupdate", instance.data.timeUpdate, false );
         instance.isDestroyed = true;
       }
     }
@@ -870,7 +873,7 @@
 
         track._running = true;
         track._natives.start.call( obj, null, track );
-        
+
         if ( obj.options.frameAnimation &&
           track._natives.frame ) {
 
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 41b0ee53d..947cd350a 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -481,8 +481,8 @@ test( "Instance", function() {
 	ok( a.data.trackEvents.endIndex, "instance a has data.trackEvents.endIndex property" );
 	ok( b.data.trackEvents.endIndex, "instance b has data.trackEvents.endIndex property" );
 
-	ok( a.data.trackEvents.previousUpdateTime === 0, "instance a has data.trackEvents.previousUpdateTime property" );
-	ok( b.data.trackEvents.previousUpdateTime === 0, "instance b has data.trackEvents.previousUpdateTime property" );
+	ok( a.data.trackEvents.previousUpdateTime >= -1, "instance a has data.trackEvents.previousUpdateTime property" );
+	ok( b.data.trackEvents.previousUpdateTime >= -1, "instance b has data.trackEvents.previousUpdateTime property" );
 
 });
 

From 160c753e7044ba8da77852d94de2a90bd8af6959 Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Tue, 1 Nov 2011 13:48:37 -0400
Subject: [PATCH 69/78] [#807] tabs => spaces

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

diff --git a/popcorn.js b/popcorn.js
index 1fb5d659b..eb7b18500 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -203,8 +203,8 @@
 
       this.data = {
 
-				// Executed by either timeupdate event or in rAF loop
-				timeUpdate: Popcorn.nop,
+        // Executed by either timeupdate event or in rAF loop
+        timeUpdate: Popcorn.nop,
 
         // Allows disabling a plugin per instance
         disabled: [],
diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
index 947cd350a..d33c67211 100644
--- a/test/popcorn.unit.js
+++ b/test/popcorn.unit.js
@@ -430,59 +430,59 @@ test( "Instance", function() {
 
   expect( 36 );
 
-	ok( a.options, "instance a has options property" );
-	ok( b.options, "instance b has options property" );
+  ok( a.options, "instance a has options property" );
+  ok( b.options, "instance b has options property" );
 
-	ok( a.isDestroyed === false , "instance a has isDestroyed property" );
-	ok( b.isDestroyed === false, "instance b has isDestroyed property" );
+  ok( a.isDestroyed === false , "instance a has isDestroyed property" );
+  ok( b.isDestroyed === false, "instance b has isDestroyed property" );
 
-	ok( a.data, "instance a has data property" );
-	ok( b.data, "instance b has data property" );
+  ok( a.data, "instance a has data property" );
+  ok( b.data, "instance b has data property" );
 
-	ok( a.data.timeUpdate, "instance a has data.timeUpdate property" );
-	ok( b.data.timeUpdate, "instance b has data.timeUpdate property" );
+  ok( a.data.timeUpdate, "instance a has data.timeUpdate property" );
+  ok( b.data.timeUpdate, "instance b has data.timeUpdate property" );
 
-	ok( a.data.disabled, "instance a has data.disabled property" );
-	ok( b.data.disabled, "instance b has data.disabled property" );
+  ok( a.data.disabled, "instance a has data.disabled property" );
+  ok( b.data.disabled, "instance b has data.disabled property" );
 
-	ok( a.data.events, "instance a has data.events property" );
-	ok( b.data.events, "instance b has data.events property" );
+  ok( a.data.events, "instance a has data.events property" );
+  ok( b.data.events, "instance b has data.events property" );
 
-	ok( a.data.hooks, "instance a has data.hooks property" );
-	ok( b.data.hooks, "instance b has data.hooks property" );
+  ok( a.data.hooks, "instance a has data.hooks property" );
+  ok( b.data.hooks, "instance b has data.hooks property" );
 
-	ok( a.data.history, "instance a has data.history property" );
-	ok( b.data.history, "instance b has data.history property" );
+  ok( a.data.history, "instance a has data.history property" );
+  ok( b.data.history, "instance b has data.history property" );
 
-	ok( a.data.state, "instance a has data.state property" );
-	ok( b.data.state, "instance b has data.state property" );
+  ok( a.data.state, "instance a has data.state property" );
+  ok( b.data.state, "instance b has data.state property" );
 
-	ok( a.data.state.volume, "instance a has data.state.volume property" );
-	ok( b.data.state.volume, "instance b has data.state.volume property" );
+  ok( a.data.state.volume, "instance a has data.state.volume property" );
+  ok( b.data.state.volume, "instance b has data.state.volume property" );
 
-	ok( a.data.trackRefs, "instance a has data.trackRefs property" );
-	ok( b.data.trackRefs, "instance b has data.trackRefs property" );
+  ok( a.data.trackRefs, "instance a has data.trackRefs property" );
+  ok( b.data.trackRefs, "instance b has data.trackRefs property" );
 
-	ok( a.data.trackEvents, "instance a has data.trackEvents property" );
-	ok( b.data.trackEvents, "instance b has data.trackEvents property" );
+  ok( a.data.trackEvents, "instance a has data.trackEvents property" );
+  ok( b.data.trackEvents, "instance b has data.trackEvents property" );
 
-	ok( a.data.trackEvents.byStart, "instance a has data.trackEvents.byStart property" );
-	ok( b.data.trackEvents.byStart, "instance b has data.trackEvents.byStart property" );
+  ok( a.data.trackEvents.byStart, "instance a has data.trackEvents.byStart property" );
+  ok( b.data.trackEvents.byStart, "instance b has data.trackEvents.byStart property" );
 
-	ok( a.data.trackEvents.byEnd, "instance a has data.trackEvents.byEnd property" );
-	ok( b.data.trackEvents.byEnd, "instance b has data.trackEvents.byEnd property" );
+  ok( a.data.trackEvents.byEnd, "instance a has data.trackEvents.byEnd property" );
+  ok( b.data.trackEvents.byEnd, "instance b has data.trackEvents.byEnd property" );
 
-	ok( a.data.trackEvents.animating, "instance a has data.trackEvents.animating property" );
-	ok( b.data.trackEvents.animating, "instance b has data.trackEvents.animating property" );
+  ok( a.data.trackEvents.animating, "instance a has data.trackEvents.animating property" );
+  ok( b.data.trackEvents.animating, "instance b has data.trackEvents.animating property" );
 
-	ok( a.data.trackEvents.startIndex, "instance a has data.trackEvents.startIndex property" );
-	ok( b.data.trackEvents.startIndex, "instance b has data.trackEvents.startIndex property" );
+  ok( a.data.trackEvents.startIndex, "instance a has data.trackEvents.startIndex property" );
+  ok( b.data.trackEvents.startIndex, "instance b has data.trackEvents.startIndex property" );
 
-	ok( a.data.trackEvents.endIndex, "instance a has data.trackEvents.endIndex property" );
-	ok( b.data.trackEvents.endIndex, "instance b has data.trackEvents.endIndex property" );
+  ok( a.data.trackEvents.endIndex, "instance a has data.trackEvents.endIndex property" );
+  ok( b.data.trackEvents.endIndex, "instance b has data.trackEvents.endIndex property" );
 
-	ok( a.data.trackEvents.previousUpdateTime >= -1, "instance a has data.trackEvents.previousUpdateTime property" );
-	ok( b.data.trackEvents.previousUpdateTime >= -1, "instance b has data.trackEvents.previousUpdateTime property" );
+  ok( a.data.trackEvents.previousUpdateTime >= -1, "instance a has data.trackEvents.previousUpdateTime property" );
+  ok( b.data.trackEvents.previousUpdateTime >= -1, "instance b has data.trackEvents.previousUpdateTime property" );
 
 });
 

From 8690f76ab218d069a5e706ae9f51f73bbe8d205e Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Tue, 1 Nov 2011 15:00:21 -0400
Subject: [PATCH 70/78] Fix linting error[#809]

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

diff --git a/players/vimeo/popcorn.vimeo.js b/players/vimeo/popcorn.vimeo.js
index 2ff80743c..60ac48872 100644
--- a/players/vimeo/popcorn.vimeo.js
+++ b/players/vimeo/popcorn.vimeo.js
@@ -233,7 +233,7 @@
         flashvars = {
           clip_id: src,
           js_api: 1,
-          js_swf_id: vimeoContainer.id,
+          js_swf_id: vimeoContainer.id
         };
 
         //  extend options from user to flashvars. NOTE: Videos owned by Plus Vimeo users may override these options

From 3ff377dd5316f895961eeaef7d319563727494c1 Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Tue, 1 Nov 2011 15:28:21 -0400
Subject: [PATCH 71/78] [#782] adding support for baseplayer nodelists in
 safari

---
 popcorn.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index 85a004ba4..84ce9a2c7 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -1650,10 +1650,18 @@
 
           basePlayer[ val ] = (function( value ) {
 
-            return function() {
+            // this is a stupid ugly kludgy hack in honour of Safari
+            // in Safari a NodeList is a function, not an object
+            if ( "length" in container[ value ] && !container[ value ].call ) {
 
-              return container[ value ].apply( container, arguments );
-            };
+              return container[ value ];
+            } else {
+
+              return function() {
+
+                return container[ value ].apply( container, arguments );
+              };
+            }
           }( val ));
         } else {
 

From e07c981971c265e474c47a78aa61af5c4bdf2ae0 Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Tue, 1 Nov 2011 16:01:34 -0400
Subject: [PATCH 72/78] [#810] fix semantic demo

---
 demos/semantic_video/index.html            | 7 +------
 demos/semantic_video/xml/webMadeMovies.xml | 9 ---------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/demos/semantic_video/index.html b/demos/semantic_video/index.html
index 1d561618e..01d45b370 100644
--- a/demos/semantic_video/index.html
+++ b/demos/semantic_video/index.html
@@ -11,12 +11,12 @@
   <script src="../../plugins/footnote/popcorn.footnote.js"></script>
   <script src="../../plugins/twitter/popcorn.twitter.js"></script>
   <script src="../../plugins/subtitle/popcorn.subtitle.js"></script>
-  <script src="../../plugins/googlenews/popcorn.googlenews.js"></script>
   <script src="../../plugins/tagthisperson/popcorn.tagthisperson.js"></script>
   <script src="../../plugins/wikipedia/popcorn.wikipedia.js"></script>
   <script src="../../plugins/flickr/popcorn.flickr.js"></script>
   <script src="../../plugins/attribution/popcorn.attribution.js"></script>
   <script src="../../plugins/lastfm/popcorn.lastfm.js"></script>
+  <script src="../../modules/timeline-sources/popcorn.timeline-sources.js"></script>
   <script src="popcorn.applyclass.js"></script>
 
   <script src="../../parsers/parserXML/popcorn.parserXML.js"></script>
@@ -214,11 +214,6 @@ <h3><img src="images/logo_twitter.png" alt="Twitter" width="80" height="19" /></
                 <h3><img src="images/logo_wiki.png" alt="Wikipedia" width="92" height="13" /></h3>
                 <a href="#" class="collapse"><span>Collapse</span></a>
                 <div class="content" id="wikidiv"><div class="overlay"></div><div class="inactive"></div></div>
-              </section>
-              <section>
-                <h3><img src="images/logo_google_news.png" alt="Google News" width="74" height="33" />
-                </h3>
-                <div id="googlenewsdiv"><div class="overlay"></div><div class="inactive"></div></div>
               </section>
 	          <section>
                 <h3><img src="images/logo_lastfm.png" alt="Lastfm" width="80" height="24" /></h3>
diff --git a/demos/semantic_video/xml/webMadeMovies.xml b/demos/semantic_video/xml/webMadeMovies.xml
index 21145bc8b..6084ac434 100644
--- a/demos/semantic_video/xml/webMadeMovies.xml
+++ b/demos/semantic_video/xml/webMadeMovies.xml
@@ -93,28 +93,23 @@
       <twitter in="00:00:05:02" out="00:00:10:07" title="Steve Song" src="@stevesong" target="personaltwitter" width="238" height="120"/>
       <wikipedia in="00:00:05:02" out="00:00:10:07" resourceid="villagetelco" numberofwords="200" lang="en" target="wikidiv"/>
       <flickr in="00:00:05:02" out="00:00:10:07" target="personalflickr" userid="78868639@N00" numberofimages="8" padding="4px"/>
-      <googlenews in="00:00:05:02" out="00:00:10:07" target="googlenewsdiv" topic="Village Telco"/>
 
       <twitter in="00:00:10:07" out="00:00:18:04" title="Oil Spill" src="#oilspill" target="twitter" width="238" height="120"/>
-      <googlenews in="00:00:10:07" out="00:00:18:04" target="googlenewsdiv" topic="Oil Spill"/>
       <attribution in="00:00:10:07" out="00:00:18:04" target="container5">Grassroots Mapping, Tungsten Monkey</attribution>
 
       <tagthisperson target="inthisvideo" in="00:00:18:04" out="00:00:25:02" person="Keyboard Cat"/>
       <twitter in="00:00:18:04" out="00:00:25:02" title="Keyboard Cat" src="#keyboardcat" target="twitter" width="238" height="120"/>
       <attribution in="00:00:18:04" out="00:00:25:02" target="container5">KeyBoard Cat, Charlie Schmidt</attribution>
-      <googlenews in="00:00:18:04" out="00:00:25:02" target="googlenewsdiv" topic="Keyboard Cat"/>
 
       <tagthisperson target="inthisvideo" in="00:00:28:09" out="00:00:29:07" person="Jeffrey Warren" />
       <attribution in="00:00:28:09" out="00:00:29:07" target="container5">Grassroots Mapping, Tungsten Monkey</attribution>
       <tagthisperson target="inthisvideo" in="00:00:29:08" out="00:00:31:00" person="Village Telco Guy" />
 
       <wikipedia in="00:00:32:00" out="00:00:41:00" resourceid="theinternet" numberofwords="200" target="wikidiv"/>
-      <googlenews in="00:00:32:00" out="00:00:41:00" target="googlenewsdiv" topic="the internet"/>
 
       <tagthisperson target="inthisvideo" in="00:00:41:00" out="00:01:07:09" person="Jeffrey Warren" />
       <flickr in="00:00:41:00" out="00:01:07:09" target="personalflickr" userid="35034346917@N01" numberofimages="8" padding="4px"/>
       <twitter in="00:00:41:00" out="00:01:07:09" title="Oil Spill" src="#oilspill" target="twitter" width="238" height="120"/>
-      <googlenews in="00:00:41:00" out="00:01:07:09" target="googlenewsdiv" topic="Oil Spill"/>
       <googlemap resourceid="grandislewiki" in="00:00:41:00" out="00:01:07:09" lat="29.2720" lng="-90.0233 " target="container2" zoom="8"/>
       <wikipedia in="00:00:41:00" out="00:01:07:09" resourceid="oilspill" numberofwords="200" target="wikidiv"/>
       <footnote in="00:00:41:00" out="00:01:07:09" target="footnotediv">Learn more about Grass Roots mapping at www.grassrootsmapping.org</footnote>
@@ -153,12 +148,8 @@
       <wikipedia in="00:02:57:01" out="00:03:03:00" resourceid="timbernerslee" numberofwords="200" target="wikidiv"/>
       <twitter in="00:02:57:01" out="00:03:03:00" title="Tim Berners-Lee" src="@timberners_lee" target="twitter" width="238" height="120"/>
 
-      <googlenews in="00:02:57:01" out="00:03:03:00" target="googlenewsdiv" topic="Tim Berners-Lee"/>
-
       <wikipedia in="00:03:03:01" out="00:03:28:00" resourceid="worldwideweb" numberofwords="200" target="wikidiv"/>
-      <googlenews in="00:03:03:01" out="00:03:28:00" target="googlenewsdiv" topic="World Wide Web"/>
 
-      <googlenews in="00:03:28:00" out="00:03:32:00" target="googlenewsdiv" topic="Wikipedia"/>
       <wikipedia in="00:03:28:01" out="00:03:32:00" resourceid="wikipedia" numberofwords="200" target="wikidiv"/>
 
       <wikipedia in="00:03:36:00" out="00:03:43:00" resourceid="openstandards" numberofwords="200" target="wikidiv"/>

From b68dfde39544422c862882160364635e2eebbfd7 Mon Sep 17 00:00:00 2001
From: ScottDowne <sdowne@learn.senecac.on.ca>
Date: Tue, 1 Nov 2011 16:20:33 -0400
Subject: [PATCH 73/78] [#811] twitter demo to use new youtube stuff

---
 demos/twittervideo/twitterVideo.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/demos/twittervideo/twitterVideo.html b/demos/twittervideo/twitterVideo.html
index 642e62c2b..2954af93f 100644
--- a/demos/twittervideo/twitterVideo.html
+++ b/demos/twittervideo/twitterVideo.html
@@ -43,11 +43,11 @@
           // and displaying the video accordingly, displays error message if the
           // video type is incompatable
 					if( document.getElementById( 'vidUrl' ).value.search( "youtube" ) != -1 ){
-						popcorn = Popcorn( Popcorn.youtube( 'video', document.getElementById( 'vidUrl' ).value ) );
+						popcorn = Popcorn.youtube( '#video', document.getElementById( 'vidUrl' ).value );
 						ok = true;
 					}
 					else if( document.getElementById( 'vidUrl' ).value.search( "vimeo" ) != -1 ){
-						popcorn = Popcorn( Popcorn.vimeo( 'video', document.getElementById( 'vidUrl' ).value ) );
+						popcorn = Popcorn.vimeo( '#video', document.getElementById( 'vidUrl' ).value );
 						ok = true;
 					}
 					else if( document.getElementById( 'vidUrl' ).value.search( "ogv" ) != -1 ){
@@ -84,7 +84,7 @@
 
 					if(ok){
             // Add twitter widget with associated parameters
-						popcorn = popcorn
+						popcorn
 							.twitter({
 								start: 0, // seconds
 								end: 45, // seconds
@@ -107,7 +107,7 @@ <h3>Twitter Hashtag video demo</h3>
 			<p>Twitter Hashtag:</p>
 			<input id="hashtag" size="20" value="#seneca"/>
 			<button class="start" id="srtBtn">Play</button><br />
-      <div id="video" width="360" height="300" ></div><br />
+      <div id="video" style="width: 360px; height: 300px;" ></div><br />
 			<div id="twitterdiv" style="position:relative;float:left;width:400px;height:600px"></div>
     </div>
   </body>

From b817acd3e536500a10792ea48d62aee985a4ae5c Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Tue, 1 Nov 2011 16:59:05 -0400
Subject: [PATCH 74/78] removed random character [#812]

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

diff --git a/modules/timeline-sources/popcorn.timeline-sources.unit.html b/modules/timeline-sources/popcorn.timeline-sources.unit.html
index c9578fe82..2c5e462da 100644
--- a/modules/timeline-sources/popcorn.timeline-sources.unit.html
+++ b/modules/timeline-sources/popcorn.timeline-sources.unit.html
@@ -38,6 +38,6 @@ <h2 id="qunit-userAgent"></h2>
 
     <p>Your user agent does not support the HTML5 Video element.</p>
 
-  </video> 
+  </video>
 </body>
 </html>

From c646400ba213d5bfccf5fbea6eaad61842983b57 Mon Sep 17 00:00:00 2001
From: Christopher De Cairos <chris.decairos@gmail.com>
Date: Tue, 1 Nov 2011 18:07:31 -0400
Subject: [PATCH 75/78] Updated parser test suite titles [#813]

---
 .../parserJSON/popcorn.parserJSON.unit.html   |  2 +-
 parsers/parserSBV/popcorn.parserSBV.unit.html | 22 ++++++++--------
 parsers/parserSRT/popcorn.parserSRT.unit.html |  6 ++---
 parsers/parserSSA/popcorn.parserSSA.unit.html |  2 +-
 .../parserTTML/popcorn.parserTTML.unit.html   | 24 ++++++++---------
 .../parserTTXT/popcorn.parserTTXT.unit.html   | 22 ++++++++--------
 parsers/parserVTT/popcorn.parserVTT.unit.html |  2 +-
 parsers/parserXML/popcorn.parserXML.unit.html | 26 +++++++++----------
 8 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/parsers/parserJSON/popcorn.parserJSON.unit.html b/parsers/parserJSON/popcorn.parserJSON.unit.html
index 4f2132fa9..49197732a 100644
--- a/parsers/parserJSON/popcorn.parserJSON.unit.html
+++ b/parsers/parserJSON/popcorn.parserJSON.unit.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Popcorn 0.3 JSON parser Plug-in Tes</title>
+  <title>Popcorn JSON parser Plug-in Test</title>
   <link rel="stylesheet" href="../../test/qunit/qunit.css" type="text/css" media="screen">
   <script src="../../test/qunit/qunit.js"></script>
   <!--
diff --git a/parsers/parserSBV/popcorn.parserSBV.unit.html b/parsers/parserSBV/popcorn.parserSBV.unit.html
index b53d5ec31..a43960f55 100644
--- a/parsers/parserSBV/popcorn.parserSBV.unit.html
+++ b/parsers/parserSBV/popcorn.parserSBV.unit.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Popcorn 0.3 SBV parser Plug-in Test</title>
+  <title>Popcorn SBV parser 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="../../plugins/subtitle/popcorn.subtitle.js"></script>
@@ -22,25 +22,25 @@ <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>
 </body>
diff --git a/parsers/parserSRT/popcorn.parserSRT.unit.html b/parsers/parserSRT/popcorn.parserSRT.unit.html
index 140cf450d..1282ca23b 100644
--- a/parsers/parserSRT/popcorn.parserSRT.unit.html
+++ b/parsers/parserSRT/popcorn.parserSRT.unit.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Popcorn 0.3 SRT parser Plug-in Test</title>
+  <title>Popcorn SRT parser Plug-in Test</title>
   <link rel="stylesheet" href="../../test/qunit/qunit.css" type="text/css" media="screen"></link>
   <script src="../../test/qunit/qunit.js"></script>
   <!--
@@ -22,7 +22,7 @@ <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"
@@ -35,7 +35,7 @@ <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"'>
diff --git a/parsers/parserSSA/popcorn.parserSSA.unit.html b/parsers/parserSSA/popcorn.parserSSA.unit.html
index f04845bb7..f6b9adccc 100644
--- a/parsers/parserSSA/popcorn.parserSSA.unit.html
+++ b/parsers/parserSSA/popcorn.parserSSA.unit.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Popcorn 0.3 SSA parser Plug-in Test</title>
+  <title>Popcorn SSA parser Plug-in Test</title>
   <link rel="stylesheet" href="../../test/qunit/qunit.css" type="text/css" media="screen">
   <script src="../../test/qunit/qunit.js"></script>
   <!--
diff --git a/parsers/parserTTML/popcorn.parserTTML.unit.html b/parsers/parserTTML/popcorn.parserTTML.unit.html
index 1c7232147..51cdef4ff 100644
--- a/parsers/parserTTML/popcorn.parserTTML.unit.html
+++ b/parsers/parserTTML/popcorn.parserTTML.unit.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Popcorn 0.3 TTML parser Plug-in Test</title>
+  <title>Popcorn TTML parser 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="../../plugins/subtitle/popcorn.subtitle.js"></script>
   <script src="popcorn.parserTTML.js"></script>
   <script src="popcorn.parserTTML.unit.js"></script>
@@ -22,25 +22,25 @@ <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>
 </body>
 </html>
diff --git a/parsers/parserTTXT/popcorn.parserTTXT.unit.html b/parsers/parserTTXT/popcorn.parserTTXT.unit.html
index 26dda37a8..7b1b175ac 100644
--- a/parsers/parserTTXT/popcorn.parserTTXT.unit.html
+++ b/parsers/parserTTXT/popcorn.parserTTXT.unit.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Popcorn 0.3 TTXT parser Plug-in Test</title>
+  <title>Popcorn TTXT parser 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.parserTTXT.js"></script>
@@ -22,25 +22,25 @@ <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>
 </body>
diff --git a/parsers/parserVTT/popcorn.parserVTT.unit.html b/parsers/parserVTT/popcorn.parserVTT.unit.html
index 60e62ede3..fe44d1c93 100644
--- a/parsers/parserVTT/popcorn.parserVTT.unit.html
+++ b/parsers/parserVTT/popcorn.parserVTT.unit.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Popcorn 0.3 WebSRT/VTT parser Plug-in Test</title>
+  <title>Popcorn WebSRT/VTT parser Plug-in Test</title>
   <link rel="stylesheet" href="../../test/qunit/qunit.css" type="text/css" media="screen"></link>
   <script src="../../test/qunit/qunit.js"></script>
   <!--
diff --git a/parsers/parserXML/popcorn.parserXML.unit.html b/parsers/parserXML/popcorn.parserXML.unit.html
index 906b73b67..6a7fdd851 100644
--- a/parsers/parserXML/popcorn.parserXML.unit.html
+++ b/parsers/parserXML/popcorn.parserXML.unit.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Popcorn 0.1 parser Plug-in Test</title>
+  <title>Popcorn parser 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.parserXML.js"></script>
@@ -21,27 +21,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"> 
+    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> 
-  <div id="footnotediv"></div>  
+  </video>
+  <div id="footnotediv"></div>
 </body>
 </html>

From 58626a6547a89d8a31fe48b6a06084be98544015 Mon Sep 17 00:00:00 2001
From: Jon Buckley <jon@jbuckley.ca>
Date: Tue, 1 Nov 2011 21:56:02 -0400
Subject: [PATCH 76/78] Update Processing.js script to v1.3.6 on the CDN

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

diff --git a/plugins/processing/popcorn.processing.js b/plugins/processing/popcorn.processing.js
index ab1b1eaaa..596dffad6 100644
--- a/plugins/processing/popcorn.processing.js
+++ b/plugins/processing/popcorn.processing.js
@@ -74,7 +74,7 @@
       }
 
       if ( !window.Processing ) {
-        Popcorn.getScript( "//processingjs.org/content/download/processing-js-1.3.0/processing-1.3.0.js", function() {
+        Popcorn.getScript( "//wac.1237.edgecastcdn.net/801237/cdn.processingjs.org/content/download/processing-js-1.3.6/processing-1.3.6.min.js", function() {
           scriptReady( options );
         });
       } else {

From 3184bf087f38e4f92a30f4a85c1674d293cfbede Mon Sep 17 00:00:00 2001
From: stevenaw <sweerdenburg@gmail.com>
Date: Wed, 2 Nov 2011 00:09:41 -0400
Subject: [PATCH 77/78] [#819] Numerous fixes to parser demo .html pages

---
 parsers/parserJSON/popcorn.parserJSON.html |  88 ++++++++---------
 parsers/parserSBV/popcorn.parserSBV.html   |  90 ++++++++---------
 parsers/parserSRT/popcorn.parserSRT.html   | 107 +++++++++++----------
 parsers/parserSSA/popcorn.parserSSA.html   |  87 ++++++++---------
 parsers/parserTTML/popcorn.parserTTML.html | 104 ++++++++++----------
 parsers/parserTTXT/popcorn.parserTTXT.html |  87 ++++++++---------
 parsers/parserVTT/popcorn.parserVTT.html   |  20 +++-
 parsers/parserXML/popcorn.parserXML.html   |  68 ++++++-------
 8 files changed, 334 insertions(+), 317 deletions(-)

diff --git a/parsers/parserJSON/popcorn.parserJSON.html b/parsers/parserJSON/popcorn.parserJSON.html
index ab44e22af..f401f46a1 100644
--- a/parsers/parserJSON/popcorn.parserJSON.html
+++ b/parsers/parserJSON/popcorn.parserJSON.html
@@ -1,47 +1,47 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>Popcorn 0.3 JSON parser Plug-in Demo</title>
-  
-  <script src="../../popcorn.js"></script>
-  <script src="../../test/jquery.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>
-  <script src="../../parsers/parserJSON/popcorn.parserJSON.js"></script>
-
-</head>
-<body>
-  <h1 id="qunit-header">Popcorn 0.3 JSON parser Plug-in Demo</h1>
-  <p></p>
-  <div>
-    <video id='video' data-timeline-sources="data/data.json"
-      controls
-      width= '250px'
-      poster="../../test/poster.png"> 
-
-      <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"'> 
-
-      <p>Your user agent does not support the HTML5 Video element.</p> 
-
-    </video> 
-  </div>
-  
-  <style>
-    .displays {
-      width: 300px;
-      height: 300px;
-    }
-  </style>
-  <div class="displays" id="iframe-container"></div>
-  <div class="displays" id="map-container"></div>
-  <div class="displays" id="footnote-container"></div>
-
-</body>
+  <head>
+    <title>Popcorn 1.0 JSON parser Plug-in Demo</title>
+
+    <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>
+    <script src="../../parsers/parserJSON/popcorn.parserJSON.js"></script>
+
+  </head>
+  <body>
+    <h1 id="qunit-header">Popcorn 1.0 JSON parser Plug-in Demo</h1>
+    <p></p>
+    <div>
+      <video id="video" data-timeline-sources="data/data.json"
+        controls
+        width= "250px"
+        poster="../../test/poster.png"> 
+
+        <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"'> 
+
+        <p>Your user agent does not support the HTML5 Video element.</p>
+
+      </video>
+    </div>
+
+    <style>
+      .displays {
+        width: 300px;
+        height: 300px;
+      }
+    </style>
+    <div class="displays" id="iframe-container"></div>
+    <div class="displays" id="map-container"></div>
+    <div class="displays" id="footnote-container"></div>
+
+  </body>
 </html>
diff --git a/parsers/parserSBV/popcorn.parserSBV.html b/parsers/parserSBV/popcorn.parserSBV.html
index c7ff3e917..8821edace 100644
--- a/parsers/parserSBV/popcorn.parserSBV.html
+++ b/parsers/parserSBV/popcorn.parserSBV.html
@@ -1,48 +1,48 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>Popcorn 0.3 SBV parser Plug-in Demo</title>
-  
-  <script src="../../popcorn.js"></script>
-  <script src="../../test/jquery.js"></script>
-  <script src="../../plugins/subtitle/popcorn.subtitle.js"></script>
-  <script src="popcorn.parserSBV.js"></script>
-  
-  <script>
-    document.addEventListener( 'DOMContentLoaded', function () {
-      var p = Popcorn( '#video' )
-      .volume( 0 )
-      .play();
-    }, false);
-  </script>
-</head>
-<body>
-  <h1 id="qunit-header">Popcorn 0.3 SBV parser Plug-in Demo</h1>
-  <p>From 2.4 to 7.2 seconds, "Senator, we're making our final approach into Coruscant." is shown
-  <br />From 9.712 to 13.399 seconds, "Very good, Lieutenant." is shown
-  <br />From 15.042 to 18.042 seconds, "It's a trap!" is shown</p>
-  <div>
-  <div>
-    <video id='video'
-      controls
-      width= '250px'
-      data-timeline-sources="data/data.sbv"
-      poster="../../test/poster.png"> 
-
-      <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"'> 
-
-      <p>Your user agent does not support the HTML5 Video element.</p> 
-
-    </video> 
-  </div>
-  
-  <h4>Subtitle Source<h4>
-  <iframe id="srcDisplay" src="data/data.sbv"></iframe>
-</body>
+  <head>
+    <title>Popcorn 1.0 SBV parser Plug-in Demo</title>
+
+    <script src="../../popcorn.js"></script>
+    <script src="../../plugins/subtitle/popcorn.subtitle.js"></script>
+    <script src="popcorn.parserSBV.js"></script>
+
+    <script>
+      document.addEventListener( "DOMContentLoaded", function () {
+        var p = Popcorn( "#video" )
+        .parseSBV( "data/data.sbv" )
+        .volume( 0 )
+        .play();
+      }, false);
+    </script>
+  </head>
+  <body>
+    <h1 id="qunit-header">Popcorn 1.0 SBV parser Plug-in Demo</h1>
+
+    <p>From 2.4 to 7.2 seconds, "Senator, we're making our final approach into Coruscant." is shown
+    <br />From 9.712 to 13.399 seconds, "Very good, Lieutenant." is shown
+    <br />From 15.042 to 18.042 seconds, "It's a trap!" is shown</p>
+
+    <div>
+      <video id="video"
+        controls
+        width= "250px"
+        poster="../../test/poster.png">
+
+        <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"'>
+
+        <p>Your user agent does not support the HTML5 Video element.</p>
+
+      </video>
+    </div>
+
+    <h4>Subtitle Source<h4>
+    <iframe id="srcDisplay" src="data/data.sbv"></iframe>
+  </body>
 </html>
diff --git a/parsers/parserSRT/popcorn.parserSRT.html b/parsers/parserSRT/popcorn.parserSRT.html
index 3aa8575bf..70314a719 100644
--- a/parsers/parserSRT/popcorn.parserSRT.html
+++ b/parsers/parserSRT/popcorn.parserSRT.html
@@ -1,56 +1,57 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>Popcorn 0.3 SRT parser Plug-in Demo</title>
-  
-  <script src="../../popcorn.js"></script>
-  <script src="../../plugins/subtitle/popcorn.subtitle.js"></script>
-  <script src="popcorn.parserSRT.js"></script>
-
-  <script>
-    document.addEventListener( 'DOMContentLoaded', function () {
-      var p = Popcorn( '#video' )
-      .volume( 0 )
-      .play();
-    }, false);
-  </script>
-</head>
-<body>
-  <h1 id="qunit-header">Popcorn 0.3 SRT parser Plug-in Demo</h1>
-  
-  <p>From 2.4 to 5.2 seconds, "[Background Music Playing]" is shown
-  <br />From 6 to 13.7 seconds, "&lt;true&gt; To say that 2 is greater than three (3 &gt; 2) would be lying&lt;true&gt;" is shown
-  <br />From 15.712 to 17.399 seconds, "Oh my god, Watch out! It's coming!!" is shown
-  <br />From 25.712 to 30.399 seconds, "[Bird noises]" is shown</p>
-  <div>
-    <video id='video'
-      controls
-      width="250px"
-      data-timeline-sources="data/data.srt"
-      poster="../../test/poster.png"> 
-
-      <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"'> 
-
-      <p>Your user agent does not support the HTML5 Video element.</p> 
-
-    </video> 
-  </div>
-  
-  <h4>Subtitle Source<h4>
-  <iframe id="srcDisplay" src="./data/data.srt"></iframe>
-  
-  <style>
-    .displays {
-      width: 300px;
-      height: 300px;
-    }
-  </style>
-
-</body>
+  <head>
+    <title>Popcorn 1.0 SRT parser Plug-in Demo</title>
+
+    <script src="../../popcorn.js"></script>
+    <script src="../../plugins/subtitle/popcorn.subtitle.js"></script>
+    <script src="popcorn.parserSRT.js"></script>
+
+    <script>
+      document.addEventListener( "DOMContentLoaded", function () {
+        var p = Popcorn( "#video" )
+        .parseSRT( "data/data.srt" )
+        .volume( 0 )
+        .play();
+      }, false);
+    </script>
+  </head>
+  <body>
+    <h1 id="qunit-header">Popcorn 1.0 SRT parser Plug-in Demo</h1>
+
+    <p>From 2.4 to 5.2 seconds, "[Background Music Playing]" is shown
+    <br />From 6 to 13.7 seconds, "&lt;true&gt; To say that 2 is greater than three (3 &gt; 2) would be lying&lt;true&gt;" is shown
+    <br />From 15.712 to 17.399 seconds, "Oh my god, Watch out! It's coming!!" is shown
+    <br />From 25.712 to 30.399 seconds, "[Bird noises]" is shown</p>
+
+    <div>
+      <video id="video"
+        controls
+        width="250px"
+        poster="../../test/poster.png">
+
+        <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"'>
+
+        <p>Your user agent does not support the HTML5 Video element.</p>
+
+      </video>
+    </div>
+
+    <h4>Subtitle Source<h4>
+    <iframe id="srcDisplay" src="./data/data.srt"></iframe>
+
+    <style>
+      .displays {
+        width: 300px;
+        height: 300px;
+      }
+    </style>
+
+  </body>
 </html>
diff --git a/parsers/parserSSA/popcorn.parserSSA.html b/parsers/parserSSA/popcorn.parserSSA.html
index aedb6cb05..b0a053886 100644
--- a/parsers/parserSSA/popcorn.parserSSA.html
+++ b/parsers/parserSSA/popcorn.parserSSA.html
@@ -1,46 +1,47 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>Popcorn 0.3 SSA parser Plug-in Demo</title>
-
-  <script src="../../popcorn.js"></script>
-  <script src="../../test/jquery.js"></script>
-  <script src="../../plugins/subtitle/popcorn.subtitle.js"></script>
-  <script src="popcorn.parserSSA.js"></script>
-
-  <script>
-    document.addEventListener( "DOMContentLoaded", function () {
-      var p = Popcorn( "#video" )
-      .volume( 0 )
-      .play();
-    }, false);
-  </script>
-</head>
-<body>
-  <h1 id="qunit-header">Popcorn 0.3 SSA parser Plug-in Demo</h1>
-  <p>From 2.4 to 7.2 seconds, "Senator, we're making our final approach into Coruscant." is shown
-  <br />From 9.71 to 13.39 seconds, "Very good, Lieutenant." is shown
-  <br />From 15.04 to 18.04 seconds, "It's a trap!" is shown</p>
-  <div>
-    <video id="video"
-      controls
-      width= "250px"
-      data-timeline-sources="data/data.ssa"
-      poster="../../test/poster.png">
-
-      <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"'>
-
-      <p>Your user agent does not support the HTML5 Video element.</p>
-
-    </video>
-  </div>
-  <h4>Subtitle Source<h4>
-  <iframe id="srcDisplay" src="data/data.ssa"></iframe>
-</body>
+  <head>
+    <title>Popcorn 1.0 SSA parser Plug-in Demo</title>
+
+    <script src="../../popcorn.js"></script>
+    <script src="../../plugins/subtitle/popcorn.subtitle.js"></script>
+    <script src="popcorn.parserSSA.js"></script>
+
+    <script>
+      document.addEventListener( "DOMContentLoaded", function () {
+        var p = Popcorn( "#video" )
+        .parseSSA( "data/data.ssa" )
+        .volume( 0 )
+        .play();
+      }, false);
+    </script>
+  </head>
+  <body>
+    <h1 id="qunit-header">Popcorn 1.0 SSA parser Plug-in Demo</h1>
+
+    <p>From 2.4 to 7.2 seconds, "Senator, we're making our final approach into Coruscant." is shown
+    <br />From 9.71 to 13.39 seconds, "Very good, Lieutenant." is shown
+    <br />From 15.04 to 18.04 seconds, "It's a trap!" is shown</p>
+
+    <div>
+      <video id="video"
+        controls
+        width= "250px"
+        poster="../../test/poster.png">
+
+        <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"'>
+
+        <p>Your user agent does not support the HTML5 Video element.</p>
+
+      </video>
+    </div>
+    <h4>Subtitle Source<h4>
+    <iframe id="srcDisplay" src="data/data.ssa"></iframe>
+  </body>
 </html>
diff --git a/parsers/parserTTML/popcorn.parserTTML.html b/parsers/parserTTML/popcorn.parserTTML.html
index 3c410773e..7876161e6 100644
--- a/parsers/parserTTML/popcorn.parserTTML.html
+++ b/parsers/parserTTML/popcorn.parserTTML.html
@@ -1,54 +1,56 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>Popcorn 0.3 TTML parser Plug-in Demo</title>
-  
-  <script src="../../popcorn.js"></script>
-  <script src="../../plugins/subtitle/popcorn.subtitle.js"></script>
-  <script src="popcorn.parserTTML.js"></script>
-
-  <script>
-    document.addEventListener( 'DOMContentLoaded', function () {
-      var p = Popcorn( '#video' )
-      .parseTTML("data/data.ttml")
-      .volume( 0 )
-      .play();
-    }, false);
-  </script>
-</head>
-<body>
-  <h1 id="qunit-header">Popcorn 0.3 TTML parser Plug-in Demo</h1>
-  <p>From 0.76 to 3.45 seconds, "It seems a paradox, does it not," is shown
-  <br />From 5 to 10 seconds, "that the image formed on the Retina should be inverted?" is shown
-  <br />From 10 to 16 seconds, "It is puzzling, why is it we do not see things upside-down?" is shown
-  <br />From 17.2 to 23 seconds, "You have never heard the Theory, then, that the Brain also is inverted?" is shown
-  <br />From 23 to 27 seconds, "No indeed! What a beautiful fact!" is shown
-  <br />From 27.76 to 30.45 seconds, "It seems a paradox, does it not," is shown
-  <br />From 32 to 37 seconds, "that the image formed on the Retina should be inverted?" is shown
-  <br />From 37 to 43 seconds, "It is puzzling, why is it we do not see things upside-down?" is shown
-  <br />From 44.2 to 50 seconds, "You have never heard the Theory, then, that the Brain also is inverted?" is shown
-  <br />From 50 to 54 seconds, "No indeed! What a beautiful fact!" is shown</p>
-  <div>
-    <video id='video'
-      controls
-      width= '250px'
-      poster="../../test/poster.png">
-
-      <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"'> 
-
-      <p>Your user agent does not support the HTML5 Video element.</p> 
-
-    </video> 
-  </div>
-
-  <h4>Subtitle Source<h4>
-  <iframe id="srcDisplay" src="data/data.ttml"></iframe>
-
-</body>
+  <head>
+    <title>Popcorn 1.0 TTML parser Plug-in Demo</title>
+
+    <script src="../../popcorn.js"></script>
+    <script src="../../plugins/subtitle/popcorn.subtitle.js"></script>
+    <script src="popcorn.parserTTML.js"></script>
+
+    <script>
+      document.addEventListener( "DOMContentLoaded", function () {
+        var p = Popcorn( "#video" )
+        .parseTTML( "data/data.ttml" )
+        .volume( 0 )
+        .play();
+      }, false);
+    </script>
+  </head>
+  <body>
+    <h1 id="qunit-header">Popcorn 1.0 TTML parser Plug-in Demo</h1>
+
+    <p>From 0.76 to 3.45 seconds, "It seems a paradox, does it not," is shown
+    <br />From 5 to 10 seconds, "that the image formed on the Retina should be inverted?" is shown
+    <br />From 10 to 16 seconds, "It is puzzling, why is it we do not see things upside-down?" is shown
+    <br />From 17.2 to 23 seconds, "You have never heard the Theory, then, that the Brain also is inverted?" is shown
+    <br />From 23 to 27 seconds, "No indeed! What a beautiful fact!" is shown
+    <br />From 27.76 to 30.45 seconds, "It seems a paradox, does it not," is shown
+    <br />From 32 to 37 seconds, "that the image formed on the Retina should be inverted?" is shown
+    <br />From 37 to 43 seconds, "It is puzzling, why is it we do not see things upside-down?" is shown
+    <br />From 44.2 to 50 seconds, "You have never heard the Theory, then, that the Brain also is inverted?" is shown
+    <br />From 50 to 54 seconds, "No indeed! What a beautiful fact!" is shown</p>
+
+    <div>
+      <video id="video"
+        controls
+        width= "250px"
+        poster="../../test/poster.png">
+
+        <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"'>
+
+        <p>Your user agent does not support the HTML5 Video element.</p>
+
+      </video>
+    </div>
+
+    <h4>Subtitle Source<h4>
+    <iframe id="srcDisplay" src="data/data.ttml"></iframe>
+
+  </body>
 </html>
diff --git a/parsers/parserTTXT/popcorn.parserTTXT.html b/parsers/parserTTXT/popcorn.parserTTXT.html
index 92ae798d5..b6ff55b7b 100644
--- a/parsers/parserTTXT/popcorn.parserTTXT.html
+++ b/parsers/parserTTXT/popcorn.parserTTXT.html
@@ -1,46 +1,47 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>Popcorn 0.3 TTXT parser Plug-in Demo</title>
-  
-  <script src="../../popcorn.js"></script>
-  <script src="../../plugins/subtitle/popcorn.subtitle.js"></script>
-  <script src="popcorn.parserTTXT.js"></script>
-  
-  <script>
-    document.addEventListener('DOMContentLoaded', function () {
-      var p = Popcorn('#video')
-      .volume(0)
-      .play()
-    }, false);
-  </script>
-</head>
-<body>
-  <h1 id="qunit-header">Popcorn 0.3 TTXT parser Plug-in Demo</h1>
-  <p>Subtitles are processed from <a href="data/data.TTXT">here</a></p>
-  
-  <p>From 2.4 to 5.2 seconds, "[Background Music Playing]" is shown
-  <br />From 15.712 to 17.399 seconds, "Heay!!" is shown
-  <br />From 25.712 to 30.399 seconds, "[Bird noises]" is shown</p>
-  <div>
-    <video id='video'
-      data-timeline-sources="data/data.TTXT"
-      controls
-      width= '250px'
-      poster="../../test/poster.png"> 
-
-      <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"'> 
-
-      <p>Your user agent does not support the HTML5 Video element.</p> 
-
-    </video> 
-  </div>
-
-</body>
+  <head>
+    <title>Popcorn 1.0 TTXT parser Plug-in Demo</title>
+
+    <script src="../../popcorn.js"></script>
+    <script src="../../plugins/subtitle/popcorn.subtitle.js"></script>
+    <script src="popcorn.parserTTXT.js"></script>
+
+    <script>
+      document.addEventListener("DOMContentLoaded", function () {
+        var p = Popcorn("#video")
+        .parseTTXT( "data/data.TTXT" )
+        .volume(0)
+        .play()
+      }, false);
+    </script>
+  </head>
+  <body>
+    <h1 id="qunit-header">Popcorn 0.3 TTXT parser Plug-in Demo</h1>
+    <p>Subtitles are processed from <a href="data/data.TTXT">here</a></p>
+
+    <p>From 2.4 to 5.2 seconds, "[Background Music Playing]" is shown
+    <br />From 15.712 to 17.399 seconds, "Heay!!" is shown
+    <br />From 25.712 to 30.399 seconds, "[Bird noises]" is shown</p>
+
+    <div>
+      <video id="video"
+        controls
+        width= "250px"
+        poster="../../test/poster.png">
+
+        <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"'>
+
+        <p>Your user agent does not support the HTML5 Video element.</p>
+
+      </video>
+    </div>
+
+  </body>
 </html>
diff --git a/parsers/parserVTT/popcorn.parserVTT.html b/parsers/parserVTT/popcorn.parserVTT.html
index 65519e253..cb0400f79 100644
--- a/parsers/parserVTT/popcorn.parserVTT.html
+++ b/parsers/parserVTT/popcorn.parserVTT.html
@@ -10,6 +10,7 @@
     <script>
       document.addEventListener( "DOMContentLoaded", function () {
         var p = Popcorn( "#video" )
+        .parseVTT( "data/data.VTT" )
         .volume( 0 )
         .play();
       }, false);
@@ -17,14 +18,25 @@
   </head>
   <body>
     <h1 id="qunit-header">Popcorn 1.0 WebSRT/VTT parser Plug-in Demo</h1>
-    <p>From 2.4 to 7.2 seconds, "Senator, we're making our final approach into Coruscant." is shown
-    <br />From 9.712 to 13.399 seconds, "Very good, Lieutenant." is shown
-    <br />From 15.542 to 18.542 seconds, "It's a trap!" is shown, with trap in italics</p>
+    <p>From 11 to 13 seconds, "We are in New York City" is shown
+    <br />From 13 to 16 seconds, "We're actually at the Lucern Hotel, just down the street" is shown
+    <br />From 16 to 18 seconds, "from the American Museum of Natural History" is shown
+    <br />From 18 to 20 seconds, "And with me is Neil DeGrasse Tyson" is shown
+    <br />From 20 to 22 seconds, "Astrophysicist, Director of the Hayden Planetarium" is shown
+    <br />From 22 to 24 seconds, "at the AMNH." is shown
+    <br />From 24 to 26 seconds, "Thank you for walking down here." is shown
+    <br />From 27 to 30 seconds, "And I want to do a follow-up on the last conversation we did." is shown
+    <br />From 30 to 31.5 seconds, "When we e-mailed—" is shown
+    <br />From 31.5 to 32 seconds, "When we e-mailed—Didn't we talk about enough in that conversation?" is shown
+    <br />From 32 to 32.5 seconds, "When we e-mailed—Didn't we talk about enough in that conversation?No! No no no no; 'cos 'cos obviously 'cos" is shown
+    <br />From 32.5 to 33.5 seconds, "No! No no no no; 'cos 'cos obviously 'cos<i>Laughs</i>" is shown
+    <br />From 33.5 to 35.5 seconds, "No! No no no no; 'cos 'cos obviously 'cos" is shown
+    <br />From 35.5 to 38 seconds, "You know I'm so excited my glasses are falling off here." is shown
+    </p>
     <div>
       <video id="video"
         controls
         width= "250px"
-        data-timeline-sources="data/data.vtt"
         poster="../../test/poster.png">
 
         <source id="mp4"
diff --git a/parsers/parserXML/popcorn.parserXML.html b/parsers/parserXML/popcorn.parserXML.html
index ede5f06e3..55e5fcd31 100644
--- a/parsers/parserXML/popcorn.parserXML.html
+++ b/parsers/parserXML/popcorn.parserXML.html
@@ -1,37 +1,37 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>Popcorn 0.1 parser Plug-in Demo</title>
-  
-  <script src="../../popcorn.js"></script>
-  <script src="../../test/jquery.js"></script>
-  <script src="../../plugins/flickr/popcorn.flickr.js"></script>
-  <script src="popcorn.parserXML.js"></script>
-
-</head>
-<body>
-  <h1 id="qunit-header">Popcorn 0.1 parser Plug-in Demo</h1>
-  <p></p>
-  <div>
-    <video data-timeline-sources="data/data.XML"
-      controls
-      width= '250px'
-      poster="../../test/poster.png"> 
-
-      <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"'> 
-
-      <p>Your user agent does not support the HTML5 Video element.</p> 
-
-    </video> 
-  </div>
-  
-  <div id="flickrdiv"></div>
-
-</body>
+  <head>
+    <title>Popcorn 1.0 parser Plug-in Demo</title>
+
+    <script src="../../popcorn.js"></script>
+    <script src="../../modules/timeline-sources/popcorn.timeline-sources.js"></script>
+    <script src="../../plugins/flickr/popcorn.flickr.js"></script>
+    <script src="popcorn.parserXML.js"></script>
+
+  </head>
+  <body>
+    <h1 id="qunit-header">Popcorn 1.0 parser Plug-in Demo</h1>
+    <p></p>
+    <div>
+      <video data-timeline-sources="data/data.XML"
+        controls
+        width= "250px"
+        poster="../../test/poster.png">
+
+        <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"'>
+
+        <p>Your user agent does not support the HTML5 Video element.</p>
+
+      </video>
+    </div>
+
+    <div id="flickrdiv"></div>
+
+  </body>
 </html>

From 00973c0fa6fe510cf689bd7a4f9234f3881b4aeb Mon Sep 17 00:00:00 2001
From: stevenaw <sweerdenburg@gmail.com>
Date: Wed, 2 Nov 2011 00:40:56 -0400
Subject: [PATCH 78/78] [#819] Missed one change

---
 parsers/parserTTXT/popcorn.parserTTXT.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parsers/parserTTXT/popcorn.parserTTXT.html b/parsers/parserTTXT/popcorn.parserTTXT.html
index b6ff55b7b..c5927ecd4 100644
--- a/parsers/parserTTXT/popcorn.parserTTXT.html
+++ b/parsers/parserTTXT/popcorn.parserTTXT.html
@@ -17,7 +17,7 @@
     </script>
   </head>
   <body>
-    <h1 id="qunit-header">Popcorn 0.3 TTXT parser Plug-in Demo</h1>
+    <h1 id="qunit-header">Popcorn 1.0 TTXT parser Plug-in Demo</h1>
     <p>Subtitles are processed from <a href="data/data.TTXT">here</a></p>
 
     <p>From 2.4 to 5.2 seconds, "[Background Music Playing]" is shown