Impaczus/2048
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Gabriele Cirulli
2014-03-12 13:03:37 +01:00
parent ebf96bfebb 385b65d086
commit 03ec53ea25
8 changed files with 122 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/html_actuator.js
+17 -7
View File
@@ -1,8 +1,9 @@
function HTMLActuator() {
this.tileContainer = document.getElementsByClassName("tile-container")[0];
this.scoreContainer = document.getElementsByClassName("score-container")[0];
this.messageContainer = document.getElementsByClassName("game-message")[0];
this.sharingContainer = document.getElementsByClassName("score-sharing")[0];
this.tileContainer = document.querySelector(".tile-container");
this.scoreContainer = document.querySelector(".score-container");
this.bestContainer = document.querySelector(".best-container");
this.messageContainer = document.querySelector(".game-message");
this.sharingContainer = document.querySelector(".score-sharing");
this.score = 0;
}
@@ -22,6 +23,7 @@ HTMLActuator.prototype.actuate = function (grid, metadata) {
});
self.updateScore(metadata.score);
self.updateBestScore(metadata.bestScore);
if (metadata.over) self.message(false); // You lose
if (metadata.won) self.message(true); // You win!
@@ -29,7 +31,9 @@ HTMLActuator.prototype.actuate = function (grid, metadata) {
};
HTMLActuator.prototype.restart = function () {
if (ga) ga("send", "event", "game", "restart");
if (typeof ga !== "undefined") {
ga("send", "event", "game", "restart");
}
this.clearMessage();
};
@@ -105,11 +109,17 @@ HTMLActuator.prototype.updateScore = function (score) {
}
};
HTMLActuator.prototype.updateBestScore = function (bestScore) {
this.bestContainer.textContent = bestScore;
};
HTMLActuator.prototype.message = function (won) {
var type = won ? "game-won" : "game-over";
var message = won ? "You win!" : "Game over!"
var message = won ? "You win!" : "Game over!";
if (ga) ga("send", "event", "game", "end", type, this.score);
if (typeof ga !== "undefined") {
ga("send", "event", "game", "end", type, this.score);
}
this.messageContainer.classList.add(type);
this.messageContainer.getElementsByTagName("p")[0].textContent = message;