diff options
author | Alex Xu <alex_y_xu@yahoo.ca> | 2014-10-20 07:23:12 -0400 |
---|---|---|
committer | Alex Xu <alex_y_xu@yahoo.ca> | 2014-10-20 07:23:12 -0400 |
commit | e4334416bc7f222a0bf1ca817892a43220da6fca (patch) | |
tree | 89bad097c087b6f59846370b3f2439825ae05d53 | |
parent | 254289e4d03046dbc0c9efb31cbf4d97639b44e9 (diff) | |
download | html5ks-master.tar.xz html5ks-master.zip |
-rw-r--r-- | config-all.json | 86 | ||||
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | nginx.conf | 2 | ||||
-rw-r--r-- | www/css/index.css | 8 | ||||
-rw-r--r-- | www/index.html.dist | 4 | ||||
-rw-r--r-- | www/js/api.js | 5 | ||||
-rw-r--r-- | www/js/html5ks.js | 3 | ||||
-rw-r--r-- | www/js/menu.js | 3 |
8 files changed, 98 insertions, 15 deletions
diff --git a/config-all.json b/config-all.json index d99dea8..724ba78 100644 --- a/config-all.json +++ b/config-all.json @@ -4,21 +4,31 @@ "addTest", "atRule", "fnBind", + "html5printshiv", + "load", "prefixedCSS", "setClasses", "testProp" ], "feature-detects": [ + "test/a/download", "test/applicationcache", "test/audio/loop", "test/audio/preload", "test/audio/webaudio", "test/audio", + "test/battery/lowbattery", + "test/battery", "test/blob", + "test/canvas/todataurl", "test/canvas", "test/canvastext", + "test/contenteditable", + "test/contentsecuritypolicy", "test/contextmenu", "test/cookies", + "test/cors", + "test/crypto/getrandomvalues", "test/css/all", "test/css/animations", "test/css/backgroundblendmode", @@ -88,11 +98,28 @@ "test/css/vwunit", "test/css/will-change", "test/css/wrapflow", + "test/custom-protocol-handler", + "test/dart", + "test/dataview-api", "test/dom/classlist", "test/dom/createElement-attrs", "test/dom/dataset", "test/dom/documentfragment", + "test/dom/microdata", + "test/dom/hidden", + "test/dom/mutationObserver", "test/draganddrop", + "test/elem/unknown", + "test/elem/datalist", + "test/elem/details", + "test/elem/output", + "test/elem/picture", + "test/elem/progress-meter", + "test/elem/ruby", + "test/elem/template", + "test/elem/time", + "test/elem/track", + "test/emoji", "test/es5/array", "test/es5/date", "test/es5/function", @@ -110,15 +137,49 @@ "test/es6/contains", "test/es6/promises", "test/es6/generators", + "test/event/deviceorientation-motion", "test/event/oninput", "test/eventlistener", + "test/exif-orientation", + "test/file/api", + "test/file/filesystem", "test/flash", + "test/forms/capture", + "test/forms/fileinput", + "test/forms/fileinputdirectory", + "test/forms/formattribute", + "test/forms/inputnumber-l10n", + "test/forms/placeholder", + "test/forms/requestautocomplete", + "test/forms/validation", "test/fullscreen-api", + "test/gamepad", + "test/geolocation", + "test/hashchange", + "test/hiddenscroll", "test/history", + "test/htmlimports", + "test/ie8compat", + "test/iframe/sandbox", + "test/iframe/seamless", + "test/iframe/srcdoc", "test/img/apng", + "test/img/jpegxr", + "test/img/srcset", "test/img/webp", + "test/indexeddb", + "test/indexeddbblob", "test/input", + "test/input/formaction", + "test/inputsearchevent", + "test/inputtypes", + "test/intl", "test/json", + "test/lists-reversed", + "test/mathml", + "test/network/beacon", + "test/network/connection", + "test/network/eventsource", "test/network/xhr-responsetype-arraybuffer", "test/network/xhr-responsetype-blob", "test/network/xhr-responsetype-document", @@ -126,14 +187,23 @@ "test/network/xhr-responsetype-text", "test/network/xhr-responsetype", "test/network/xhr2", + "test/notification", "test/pagevisibility-api", + "test/performance", "test/pointerevents", + "test/pointerlock-api", + "test/postmessage", + "test/quota-management-api", "test/requestanimationframe", "test/script/async", "test/script/defer", "test/serviceworker", + "test/speech/speech-recognition", + "test/speech/speech-synthesis", "test/storage/localstorage", "test/storage/sessionstorage", + "test/storage/websqldatabase", + "test/style/scoped", "test/svg/asimg", "test/svg/clippaths", "test/svg/filters", @@ -141,20 +211,34 @@ "test/svg/foreignobject", "test/svg/smil", "test/svg", + "test/textarea/maxlength", "test/touchevents", "test/typed-arrays", "test/unicode", "test/unicode-range", + "test/url/bloburls", "test/url/data-uri", "test/url/parser", + "test/userdata", "test/vibration", "test/video/autoplay", "test/video/loop", "test/video/preload", "test/video", + "test/vml", "test/web-intents", "test/webanimations", "test/webgl/extensions", - "test/webgl" + "test/webgl", + "test/webrtc/getusermedia", + "test/webrtc/peerconnection", + "test/websockets/binary", + "test/websockets", + "test/window/framed", + "test/workers/blobworkers", + "test/workers/dataworkers", + "test/workers/sharedworkers", + "test/workers/transferables", + "test/workers/webworkers" ] } @@ -164,7 +164,7 @@ if __name__ == "__main__": f.write(''.join('%s := %s\n' % (k, list2cmdline(cmds[k])) for k in cmds)) stderr.write("Making various directories\n") - os.mkdir("www/json") + if not os.path.isdir("www/json"): os.mkdir("www/json") if len(warnings): stderr.write("Warnings during configuration:\n") @@ -47,7 +47,7 @@ http { index index.html; server { - listen 8080; + listen [::]:8080 ipv6only=off; root www; include nginx.inc.conf; } diff --git a/www/css/index.css b/www/css/index.css index 9c8a62c..b4217f0 100644 --- a/www/css/index.css +++ b/www/css/index.css @@ -268,16 +268,16 @@ h2 { display: none; } .no-webp #auto { - background: url("dump/ui/sd-auto.png"); + background: url("../dump/ui/sd-auto.png"); } .webp #auto { - background: url("dump/ui/sd-auto.webp"); + background: url("../dump/ui/sd-auto.webp"); } .no-webp #skip { - background: url("dump/ui/sd-skip.png"); + background: url("../dump/ui/sd-skip.png"); } .webp #skip { - background: url("dump/ui/sd-skip.webp"); + background: url("../dump/ui/sd-skip.webp"); } #choices { left: 0; diff --git a/www/index.html.dist b/www/index.html.dist index 36fb5ba..66d75e0 100644 --- a/www/index.html.dist +++ b/www/index.html.dist @@ -53,8 +53,8 @@ </div> <div id="choices" class="centered"></div> <div id="centered" class="centered say"></div> - <span class="status" id="auto" alt="Auto"> - <span class="status" id="skip" alt="Skip"> + <span class="status" id="auto" alt="Auto"></span> + <span class="status" id="skip" alt="Skip"></span> </div> <div id="main-menu" style="display: none;"> <div id="main-menu-buttons"> diff --git a/www/js/api.js b/www/js/api.js index e88ac91..0d64cc5 100644 --- a/www/js/api.js +++ b/www/js/api.js @@ -208,8 +208,7 @@ window.html5ks.api = { console.debug(key, args); if (obj[key]) return obj[key].apply(obj, args); else { - console.error("no such function " + n); - debugger; + console.error("no such function " + key); return when.resolve(); } }, @@ -412,8 +411,6 @@ window.html5ks.api = { chr = { name: who }; } - this._lastchar = chr; - if (!extend && chr.what_prefix) { what = chr.what_prefix + what; } diff --git a/www/js/html5ks.js b/www/js/html5ks.js index 4113c1d..ffdf321 100644 --- a/www/js/html5ks.js +++ b/www/js/html5ks.js @@ -143,6 +143,9 @@ window.html5ks = { }, initEvents: function () { window.onresize = html5ks.scale; + this.elements.gray.addEventListener("click", function (e) { + e.stopPropagation(); + }, false); this.elements.container.addEventListener("click", function (e) { if (html5ks.store.status === "scene") { switch (e.button) { diff --git a/www/js/menu.js b/www/js/menu.js index 8539853..dc2b898 100644 --- a/www/js/menu.js +++ b/www/js/menu.js @@ -199,8 +199,7 @@ html5ks.menu = { case false: html5ks.api.window(html5ks.store.window); html5ks.api.nvl(html5ks.store.nvl); - html5ks.store.status = html5ks.store.status; - /* falls through */ + html5ks.store.status = "scene"; case "showImage": this.elements.context.style.display = "none"; html5ks.elements.gray.style.display = "none"; |