From d7ad79ebf668a8f136b1e4569a4f59b88ba1376b Mon Sep 17 00:00:00 2001 From: Garrett Finucane Date: Wed, 3 Jun 2015 15:45:16 -0400 Subject: [PATCH] fixed sweet alers --- index.html | 1 + js_v9/input.js | 2 +- js_v9/view.js | 10 ++-- vendor/js.cookie.js | 137 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 144 insertions(+), 6 deletions(-) create mode 100644 vendor/js.cookie.js diff --git a/index.html b/index.html index b3093b2..739806d 100644 --- a/index.html +++ b/index.html @@ -35,6 +35,7 @@ + diff --git a/js_v9/input.js b/js_v9/input.js index caa2f3a..8f565ca 100644 --- a/js_v9/input.js +++ b/js_v9/input.js @@ -110,9 +110,9 @@ function addKeyListeners() { canRestart = false; }); $("#restart").on('touchstart', function() { - alert("hey"); init(); canRestart = false; + $("#gameoverscreen").fadeOut(); }); } diff --git a/js_v9/view.js b/js_v9/view.js index a21f08d..a51cc59 100644 --- a/js_v9/view.js +++ b/js_v9/view.js @@ -138,7 +138,7 @@ function hideText() { } function gameOverDisplay() { - if( localStorage.getItem("been_mobile") != "true" || true){ + if(Cookies.get("visited") == null){ settings.ending_block=true; if(settings.os == "android"){ sweetAlert({ @@ -175,7 +175,7 @@ function gameOverDisplay() { } } - localStorage.setItem("been_mobile", "true"); + Cookies.set("visited",true); $("#attributions").show(); var c = document.getElementById("canvas"); c.className = "blur"; @@ -189,9 +189,9 @@ function gameOverDisplay() { function updateHighScores (){ $("#cScore").text(score); - $("#1score").text(highscores[0]); - $("#2score").text(highscores[1]); - $("#3score").text(highscores[2]); + $("#1place").text(highscores[0]); + $("#2place").text(highscores[1]); + $("#3place").text(highscores[2]); } function pause(o) { writeHighScores(); diff --git a/vendor/js.cookie.js b/vendor/js.cookie.js new file mode 100644 index 0000000..116e62d --- /dev/null +++ b/vendor/js.cookie.js @@ -0,0 +1,137 @@ +/*! + * JavaScript Cookie v2.0.0-pre + * https://github.com/js-cookie/js-cookie + * + * Copyright 2006, 2015 Klaus Hartl + * Released under the MIT license + */ +(function (factory) { + if (typeof define === 'function' && define.amd) { + define(factory); + } else if (typeof exports === 'object') { + module.exports = factory(); + } else { + var _OldCookies = window.Cookies; + var api = window.Cookies = factory(window.jQuery); + api.noConflict = function () { + window.Cookies = _OldCookies; + return api; + }; + } +}(function () { + function extend () { + var i = 0; + var result = {}; + for (; i < arguments.length; i++) { + var attributes = arguments[ i ]; + for (var key in attributes) { + result[key] = attributes[key]; + } + } + return result; + } + + function init (converter) { + function api (key, value, attributes) { + var result; + + // Write + + if (arguments.length > 1) { + attributes = extend({ + path: '/' + }, api.defaults, attributes); + + if (typeof attributes.expires === 'number') { + var expires = new Date(); + expires.setMilliseconds(expires.getMilliseconds() + attributes.expires * 864e+5); + attributes.expires = expires; + } + + try { + result = JSON.stringify(value); + if (/^[\{\[]/.test(result)) { + value = result; + } + } catch (e) {} + + value = encodeURIComponent(String(value)); + value = value.replace(/%(23|24|26|2B|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g, decodeURIComponent); + + key = encodeURIComponent(String(key)); + key = key.replace(/%(23|24|26|2B|5E|60|7C)/g, decodeURIComponent); + key = key.replace(/[\(\)]/g, escape); + + return (document.cookie = [ + key, '=', value, + attributes.expires && '; expires=' + attributes.expires.toUTCString(), // use expires attribute, max-age is not supported by IE + attributes.path && '; path=' + attributes.path, + attributes.domain && '; domain=' + attributes.domain, + attributes.secure && '; secure' + ].join('')); + } + + // Read + + if (!key) { + result = {}; + } + + // To prevent the for loop in the first place assign an empty array + // in case there are no cookies at all. Also prevents odd result when + // calling "get()" + var cookies = document.cookie ? document.cookie.split('; ') : []; + var rdecode = /(%[0-9A-Z]{2})+/g; + var i = 0; + + for (; i < cookies.length; i++) { + var parts = cookies[i].split('='); + var name = parts[0].replace(rdecode, decodeURIComponent); + var cookie = parts.slice(1).join('='); + + if (cookie.charAt(0) === '"') { + cookie = cookie.slice(1, -1); + } + + cookie = converter && converter(cookie, name) || cookie.replace(rdecode, decodeURIComponent); + + if (this.json) { + try { + cookie = JSON.parse(cookie); + } catch (e) {} + } + + if (key === name) { + result = cookie; + break; + } + + if (!key) { + result[name] = cookie; + } + } + + return result; + } + + api.get = api.set = api; + api.getJSON = function () { + return api.apply({ + json: true + }, [].slice.call(arguments)); + }; + api.defaults = {}; + + api.remove = function (key, attributes) { + api(key, '', extend(attributes, { + expires: -1 + })); + }; + + api.withConverter = init; + + return api; + } + + return init(); +}));