From d1754b5a296dcd4db353783aa3049a05cdb65f6b Mon Sep 17 00:00:00 2001
From: Steve Heffernan <steve@sevenwire.com>
Date: Thu, 23 Sep 2010 10:21:52 -0700
Subject: [PATCH] Removed vars from global scope. Updated readme.

---
 README.markdown |  8 +++++++-
 video.js        | 11 ++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/README.markdown b/README.markdown
index ff7763d54..d75f02fe1 100644
--- a/README.markdown
+++ b/README.markdown
@@ -14,7 +14,7 @@ Originally based on [this tutorial](http://blog.steveheffernan.com/2010/04/how-t
 
 Contributors (Github Username)
 ------------------------------
-heff, dz0ny, sentientbit, tvdeyen, brandonarbini, gordonbrander, Shraymonks, albertogasparin, sandaru1, nicholasbs, majornista
+heff, dz0ny, sentientbit, tvdeyen, brandonarbini, gordonbrander, Shraymonks, albertogasparin, sandaru1, nicholasbs, majornista, Fredust85
 
 
 Getting Started
@@ -129,6 +129,12 @@ Set options when setting up the videos. The defaults are shown here.
 
 Changelog
 ---------
+1.1.3
+
+- Feature: Width/Height functions for resizing the player
+- Fix: Removed trailing comma that was breaking IE7
+- Fix: Removed some vars from global scope
+
 1.1.2 (2010-09-20)
 
 - Added a fix for the poster bug in iPad/iPhone
diff --git a/video.js b/video.js
index ebc06b6f8..992181fa6 100644
--- a/video.js
+++ b/video.js
@@ -854,7 +854,7 @@ var VideoJS = JRClass.extend({
         this.subtitles[x].showing = true;
       }
     }
-  },
+  }
 
 
   /* Device Fixes
@@ -1026,7 +1026,8 @@ VideoJS.DOMReady = function(fn){
 VideoJS.setup = function(videos, options){
 
   var returnSingular = false,
-  playerList = [];
+  playerList = [],
+  videoElement;
 
   // If videos is undefined or "All", set up all videos with the video-js class
   if (!videos || videos == "All") {
@@ -1055,7 +1056,7 @@ VideoJS.setup = function(videos, options){
 // Find video tags with the video-js class
 VideoJS.getVideoJSTags = function() {
   var videoTags = document.getElementsByTagName("video"),
-  videoJSTags = [];
+  videoJSTags = [], videoTag;
 
   for (var i=0,j=videoTags.length; i<j; i++) {
     videoTag = videoTags[i];
@@ -1077,7 +1078,7 @@ VideoJS.browserSupportsVideo = function() {
 VideoJS.getFlashVersion = function(){
   // Cache Version
   if (typeof VideoJS.flashVersion != "undefined") { return VideoJS.flashVersion; }
-  var version = 0;
+  var version = 0, desc;
   if (typeof navigator.plugins != "undefined" && typeof navigator.plugins["Shockwave Flash"] == "object") {
     desc = navigator.plugins["Shockwave Flash"].description;
     if (desc && !(typeof navigator.mimeTypes != "undefined" && navigator.mimeTypes["application/x-shockwave-flash"] && !navigator.mimeTypes["application/x-shockwave-flash"].enabledPlugin)) {
@@ -1105,7 +1106,7 @@ VideoJS.isAndroid = function(){ return navigator.userAgent.match(/Android/i) !==
 // Allows for binding context to functions
 // when using in event listeners and timeouts
 Function.prototype.context = function(obj) {
-  var method = this;
+  var method = this, temp;
   temp = function() {
     return method.apply(obj, arguments);
   };