diff options
| author | Alex Xu <alex_y_xu@yahoo.ca> | 2014-02-15 09:58:48 -0500 |
|---|---|---|
| committer | Alex Xu <alex_y_xu@yahoo.ca> | 2014-02-15 09:58:48 -0500 |
| commit | d0746fad25e2b3c11258ca8d3772da22cf4133b4 (patch) | |
| tree | 9e1fbfd05934f36350bc1aa36f5b23b8688fc0fd | |
| parent | 282216e3d8dbd3f8f80308399d6d6b8b9aff26e7 (diff) | |
| download | html5ks-d0746fad25e2b3c11258ca8d3772da22cf4133b4.tar.xz html5ks-d0746fad25e2b3c11258ca8d3772da22cf4133b4.zip | |
minor stuff
| -rw-r--r-- | unrpyc/Makefile | 4 | ||||
| -rw-r--r-- | www/css/index.css | 6 | ||||
| -rw-r--r-- | www/index.html | 1 | ||||
| -rw-r--r-- | www/js/api.js | 1 |
4 files changed, 5 insertions, 7 deletions
diff --git a/unrpyc/Makefile b/unrpyc/Makefile index 5a86ca6..ee0ef42 100644 --- a/unrpyc/Makefile +++ b/unrpyc/Makefile @@ -13,7 +13,7 @@ script.json: $(patsubst %.rpyc,%.json,$(wildcard script-*.rpyc)) sed -i -e 's/^/{/;s/,$$/}/' script.json %.json: %.json.o - node fix.js $< $@ + uglifyjs $< --expr > $@ ui-strings.json.o ui-strings_FR.json.o: ui-strings%.json.o: ui-strings%.rpyc *.py python unrpyc.py --clobber $< $@ @@ -27,7 +27,7 @@ ui_settings.json.o: ui_settings.rpyc *.py python unrpyc.py --clobber $< $@ script-%.json: script-%.json.o - node fix.js $< $@ + uglifyjs $< --expr > $@ sed -i -e 's/^{//;s/}$$/,/' $@ clean: diff --git a/www/css/index.css b/www/css/index.css index fde07dc..e0136c1 100644 --- a/www/css/index.css +++ b/www/css/index.css @@ -173,9 +173,6 @@ html.no-js #gotit { display: block; margin: 10px 8px; } -.webp .ctc { - background-image: url("../dump/ui/ctc.webp"); -} .ctc { position: absolute; bottom: 20px; @@ -188,6 +185,9 @@ html.no-js #gotit { -webkit-animation: blink 2s infinite linear; animation: blink 2s infinite linear; } +.webp .ctc { + background-image: url("../dump/ui/ctc.webp"); +} .apng .ctc, .webpanimation .ctc { -o-animation: none; -moz-animation: none; diff --git a/www/index.html b/www/index.html index 39ce063..357cab6 100644 --- a/www/index.html +++ b/www/index.html @@ -48,7 +48,6 @@ </div> <div id="choices" class="centered"></div> <div id="centered" class="centered say"></div> - <img class="status" id="spinner" src="img/spinner.gif" alt="Loading"> <img class="status" id="auto" src="dump/ui/sd-auto.png" alt="Auto"> <img class="status" id="skip" src="dump/ui/sd-skip.png" alt="Skip"> </div> diff --git a/www/js/api.js b/www/js/api.js index 609ea4d..4eef78a 100644 --- a/www/js/api.js +++ b/www/js/api.js @@ -148,7 +148,6 @@ window.html5ks.api = { ['video/webm; codecs="vp9,opus"', "vp9.webm"], ['video/webm; codecs="vp8,vorbis"', "webm"], ['video/ogg; codecs="theora,vorbis"', "ogv"], - // TODO: check that this is the right codec ['video/mp4; codecs="avc1.42E01E,mp4a.40.2"']]); video.style.display = "block"; video.volume = html5ks.persistent.musicVolume; |