From 4da506408edc02607ac3827c7c09ab6a6c8cf0b8 Mon Sep 17 00:00:00 2001
From: Alex Xu <alex_y_xu@yahoo.ca>
Date: Tue, 25 Mar 2014 22:36:42 -0400
Subject: bleh

---
 .travis.sh        | 16 ++++++++--------
 Modernizr         |  2 +-
 fastclick         |  2 +-
 spin.js           |  2 +-
 when              |  2 +-
 www/css/index.css |  2 +-
 www/js/api.js     |  3 ++-
 7 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.travis.sh b/.travis.sh
index 66faac3..131f73f 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -8,7 +8,7 @@ case "$1" in
     sudo service mysql stop
     sudo apt-get update -qq
 
-    curl http://nodejs.org/dist/node-latest.tar.gz | tar -xz
+    curl http://ftpmirror.gnu.org/make/make-4.0.tar.bz2 | tar -xj
     curl https://webp.googlecode.com/files/libwebp-0.4.0.tar.gz | tar -xz
     curl -L http://downloads.sourceforge.net/project/opencore-amr/fdk-aac/fdk-aac-0.1.3.tar.gz | tar -xz
     curl http://downloads.xiph.org/releases/opus/opus-1.1.tar.gz | tar -xz
@@ -27,6 +27,13 @@ case "$1" in
     MAKEOPTS="-s ${MAKEOPTS}"
     sudo apt-get install --no-install-recommends -qq libtheora-dev libx264-dev nginx yasm
 
+    cd make-4.0
+    ./configure --disable-dependency-tracking --quiet
+    make $MAKEOPTS >/dev/null
+    sudo make $MAKEOPTS install >/dev/null
+    cd ..
+    rm -rf make-4.0
+
     cd libwebp-0.4.0
     sed -i -e '/unset ac_cv_header_GL_glut_h/d' configure
     ac_cv_header_gif_lib_h=no \
@@ -38,13 +45,6 @@ case "$1" in
     cd ..
     rm -rf libwebp-0.4.0
 
-    cd node-v*
-    ./configure --openssl-use-sys --shared-zlib
-    make $MAKEOPTS >/dev/null
-    sudo python tools/install.py install >/dev/null
-    cd ..
-    rm -rf node-v*
-
     cd fdk-aac-0.1.3
     ./configure --disable-shared --disable-dependency-tracking --quiet
     make $MAKEOPTS >/dev/null
diff --git a/Modernizr b/Modernizr
index 7ea2b19..bcbd353 160000
--- a/Modernizr
+++ b/Modernizr
@@ -1 +1 @@
-Subproject commit 7ea2b19a6ad3e97c7649aabe75a823d55be48c99
+Subproject commit bcbd353025e680b9a87df9e358ae1cf4e8987289
diff --git a/fastclick b/fastclick
index 96c956b..2d43c55 160000
--- a/fastclick
+++ b/fastclick
@@ -1 +1 @@
-Subproject commit 96c956bbf5efd0f860cfc67499a44927ba5c9b75
+Subproject commit 2d43c55a1f942eeaaec9b08c4f532a43809993bb
diff --git a/spin.js b/spin.js
index 0271cbb..cdf391a 160000
--- a/spin.js
+++ b/spin.js
@@ -1 +1 @@
-Subproject commit 0271cbb28ac9a4be3910df937a586380ec25235e
+Subproject commit cdf391a8e41b6ad8f902dc9a10cae80486d472ef
diff --git a/when b/when
index 42074c7..6f1f470 160000
--- a/when
+++ b/when
@@ -1 +1 @@
-Subproject commit 42074c715039af32950c3dbcf144e403660d415b
+Subproject commit 6f1f470e6ac61e09a6dda1b5e225c1739e287ebc
diff --git a/www/css/index.css b/www/css/index.css
index f46f79b..bc35230 100644
--- a/www/css/index.css
+++ b/www/css/index.css
@@ -310,7 +310,7 @@ h2 {
   background-image: url("../dump/ui/bg-gm.png");
 }
 #context-menu {
-  background: white no-repeat top center;
+  background: transparent no-repeat top center;
   margin-top: -210px;
   padding-top: 60px;
   position: absolute;
diff --git a/www/js/api.js b/www/js/api.js
index 04d8c5a..b8c2f28 100644
--- a/www/js/api.js
+++ b/www/js/api.js
@@ -56,7 +56,7 @@ window.html5ks.api = {
     };
 
     setTimeout(function () {
-      if (el.oncanplaythrough) {
+      if (el.src && el.oncanplaythrough) {
         console.warn("video not playing after 3 seconds");
         el.oncanplaythrough();
       }
@@ -161,6 +161,7 @@ window.html5ks.api = {
     video.volume = html5ks.persistent.musicVolume;
     var done = function () {
       video.style.display = "none";
+      video.onerror = null;
       video.src = "";
       deferred.resolve();
     };
-- 
cgit v1.2.3-54-g00ecf