diff options
| -rwxr-xr-x | .travis.sh | 16 | ||||
| m--------- | Modernizr | 0 | ||||
| m--------- | fastclick | 0 | ||||
| m--------- | spin.js | 0 | ||||
| m--------- | when | 0 | ||||
| -rw-r--r-- | www/css/index.css | 2 | ||||
| -rw-r--r-- | www/js/api.js | 3 |
7 files changed, 11 insertions, 10 deletions
@@ -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 -Subproject 7ea2b19a6ad3e97c7649aabe75a823d55be48c9 +Subproject bcbd353025e680b9a87df9e358ae1cf4e898728 diff --git a/fastclick b/fastclick -Subproject 96c956bbf5efd0f860cfc67499a44927ba5c9b7 +Subproject 2d43c55a1f942eeaaec9b08c4f532a43809993b diff --git a/spin.js b/spin.js -Subproject 0271cbb28ac9a4be3910df937a586380ec25235 +Subproject cdf391a8e41b6ad8f902dc9a10cae80486d472e diff --git a/when b/when -Subproject 42074c715039af32950c3dbcf144e403660d415 +Subproject 6f1f470e6ac61e09a6dda1b5e225c1739e287eb 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(); }; |