From cf01ca7e8bf670822c55b0a4b04cd5c2b0271b3e Mon Sep 17 00:00:00 2001 From: Gabriele Cirulli Date: Sun, 23 Mar 2014 19:51:29 +0100 Subject: [PATCH] manually apply #81 --- index.html | 2 ++ js/bind_polyfill.js | 9 +++++ js/classlist_polyfill.js | 71 ++++++++++++++++++++++++++++++++++++++++ js/game_manager.js | 4 +-- js/html_actuator.js | 2 +- 5 files changed, 85 insertions(+), 3 deletions(-) create mode 100644 js/bind_polyfill.js create mode 100644 js/classlist_polyfill.js diff --git a/index.html b/index.html index edc7b55..8d188c1 100644 --- a/index.html +++ b/index.html @@ -82,6 +82,8 @@

+ + diff --git a/js/bind_polyfill.js b/js/bind_polyfill.js new file mode 100644 index 0000000..8d9c4a4 --- /dev/null +++ b/js/bind_polyfill.js @@ -0,0 +1,9 @@ +Function.prototype.bind = Function.prototype.bind || function (target) { + var self = this; + return function (args) { + if (!(args instanceof Array)) { + args = [args]; + } + self.apply(target, args); + }; +}; diff --git a/js/classlist_polyfill.js b/js/classlist_polyfill.js new file mode 100644 index 0000000..1789ae7 --- /dev/null +++ b/js/classlist_polyfill.js @@ -0,0 +1,71 @@ +(function () { + if (typeof window.Element === "undefined" || + "classList" in document.documentElement) { + return; + } + + var prototype = Array.prototype, + push = prototype.push, + splice = prototype.splice, + join = prototype.join; + + function DOMTokenList(el) { + this.el = el; + // The className needs to be trimmed and split on whitespace + // to retrieve a list of classes. + var classes = el.className.replace(/^\s+|\s+$/g, '').split(/\s+/); + for (var i = 0; i < classes.length; i++) { + push.call(this, classes[i]); + } + } + + DOMTokenList.prototype = { + add: function (token) { + if (this.contains(token)) return; + push.call(this, token); + this.el.className = this.toString(); + }, + contains: function (token) { + return this.el.className.indexOf(token) != -1; + }, + item: function (index) { + return this[index] || null; + }, + remove: function (token) { + if (!this.contains(token)) return; + for (var i = 0; i < this.length; i++) { + if (this[i] == token) break; + } + splice.call(this, i, 1); + this.el.className = this.toString(); + }, + toString: function () { + return join.call(this, ' '); + }, + toggle: function (token) { + if (!this.contains(token)) { + this.add(token); + } else { + this.remove(token); + } + + return this.contains(token); + } + }; + + window.DOMTokenList = DOMTokenList; + + function defineElementGetter(obj, prop, getter) { + if (Object.defineProperty) { + Object.defineProperty(obj, prop, { + get: getter + }); + } else { + obj.__defineGetter__(prop, getter); + } + } + + defineElementGetter(HTMLElement.prototype, 'classList', function () { + return new DOMTokenList(this); + }); +})(); diff --git a/js/game_manager.js b/js/game_manager.js index e018ef9..aea99f3 100644 --- a/js/game_manager.js +++ b/js/game_manager.js @@ -16,14 +16,14 @@ function GameManager(size, InputManager, Actuator, StorageManager) { // Restart the game GameManager.prototype.restart = function () { this.storageManager.clearGameState(); - this.actuator.continue(); // Clear the game won/lost message + this.actuator.continueGame(); // Clear the game won/lost message this.setup(); }; // Keep playing after winning (allows going over 2048) GameManager.prototype.keepPlaying = function () { this.keepPlaying = true; - this.actuator.continue(); // Clear the game won/lost message + this.actuator.continueGame(); // Clear the game won/lost message }; // Return true if the game is lost, or has won and the user hasn't kept playing diff --git a/js/html_actuator.js b/js/html_actuator.js index d840068..6b31f2d 100644 --- a/js/html_actuator.js +++ b/js/html_actuator.js @@ -36,7 +36,7 @@ HTMLActuator.prototype.actuate = function (grid, metadata) { }; // Continues the game (both restart and keep playing) -HTMLActuator.prototype.continue = function () { +HTMLActuator.prototype.continueGame = function () { this.clearMessage(); }; -- GitLab