From 45fa3dc45a572877e64c03ca047dbea85328b93d Mon Sep 17 00:00:00 2001
From: Steve Heffernan <steve@sevenwire.com>
Date: Sun, 14 Nov 2010 14:04:42 -0800
Subject: [PATCH] Created shell script for combining source files.

---
 dev/src/behaviors.js      | 5 ++---
 dev/update_from_source.sh | 3 +++
 2 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100755 dev/update_from_source.sh

diff --git a/dev/src/behaviors.js b/dev/src/behaviors.js
index babbb5f98..554e178fa 100644
--- a/dev/src/behaviors.js
+++ b/dev/src/behaviors.js
@@ -78,8 +78,6 @@ VideoJS.player.newBehavior("video", function(element){
       this.updatePlayProgress();
       this.updateCurrentTimeDisplays();
       this.updateDurationDisplays();
-      // currentTime changed, reset subtitles
-      // if (!this.subtitles) { this.currentSubtitlePosition = 0; }
     },
     // Play progress
     updatePlayProgress: function(){
@@ -530,7 +528,8 @@ VideoJS.player.newBehavior("subtitlesDisplay", function(element){
     subtitlesDisplaysOnVideoTimeUpdate: function(){
       // show the subtitles
       if (this.subtitles) {
-        var x = this.currentSubtitlePosition;
+        // var x = this.currentSubtitlePosition;
+        var x = 0;
 
         while (x<this.subtitles.length && this.video.currentTime>this.subtitles[x].endTime) {
           if (this.subtitles[x].showing) {
diff --git a/dev/update_from_source.sh b/dev/update_from_source.sh
new file mode 100755
index 000000000..51fb7b770
--- /dev/null
+++ b/dev/update_from_source.sh
@@ -0,0 +1,3 @@
+#! /bin/csh
+# Combines Source Files. In terminal, sh update_from_source.sh
+cat src/video.js src/html5.js src/behaviors.js > combined.js
\ No newline at end of file