Skip to content

Commit 433127c

Browse files
remove use of class list in actuator, fix animations for firefox
1 parent a1e98e0 commit 433127c

3 files changed

Lines changed: 59 additions & 26 deletions

File tree

‎js/html_actuator.js‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,24 +44,37 @@ HTMLActuator.prototype.addTile = function (tile) {
4444
var position = tile.previousPosition || { x: tile.x, y: tile.y };
4545
positionClass = this.positionClass(position);
4646

47-
element.classList.add("tile", "tile-" + tile.value, positionClass);
48-
element.textContent = tile.value;
47+
// We can't use classlist because it somehow glitches when replacing classes
48+
var classes = ["tile", "tile-" + tile.value, positionClass];
49+
this.applyClasses(element, classes);
4950

50-
this.tileContainer.appendChild(element);
51+
element.textContent = tile.value;
5152

5253
if (tile.previousPosition) {
54+
// Make sure that the tile gets rendered in the previous position first
5355
window.requestAnimationFrame(function () {
54-
element.classList.remove(element.classList[2]);
55-
element.classList.add(self.positionClass({ x: tile.x, y: tile.y }));
56+
classes[2] = self.positionClass({ x: tile.x, y: tile.y });
57+
self.applyClasses(element, classes); // Update the position
5658
});
5759
} else if (tile.mergedFrom) {
58-
element.classList.add("tile-merged");
60+
classes.push("tile-merged");
61+
this.applyClasses(element, classes);
62+
63+
// Render the tiles that merged
5964
tile.mergedFrom.forEach(function (merged) {
6065
self.addTile(merged);
6166
});
6267
} else {
63-
element.classList.add("tile-new");
68+
classes.push("tile-new");
69+
this.applyClasses(element, classes);
6470
}
71+
72+
// Put the tile on the board
73+
this.tileContainer.appendChild(element);
74+
};
75+
76+
HTMLActuator.prototype.applyClasses = function (element, classes) {
77+
element.setAttribute("class", classes.join(" "));
6578
};
6679

6780
HTMLActuator.prototype.normalizePosition = function (position) {

‎style/main.css‎

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ hr {
143143
border-radius: 6px;
144144
width: 500px;
145145
height: 500px;
146+
-webkit-box-sizing: border-box;
147+
-moz-box-sizing: border-box;
146148
box-sizing: border-box; }
147149
.game-container .game-message {
148150
display: none;
@@ -336,29 +338,35 @@ hr {
336338
@-webkit-keyframes appear {
337339
0% {
338340
opacity: 0;
339-
-webkit-transform: scale(0); }
341+
-webkit-transform: scale(0);
342+
-moz-transform: scale(0); }
340343

341344
100% {
342345
opacity: 1;
343-
-webkit-transform: scale(1); } }
346+
-webkit-transform: scale(1);
347+
-moz-transform: scale(1); } }
344348

345349
@-moz-keyframes appear {
346350
0% {
347351
opacity: 0;
348-
-webkit-transform: scale(0); }
352+
-webkit-transform: scale(0);
353+
-moz-transform: scale(0); }
349354

350355
100% {
351356
opacity: 1;
352-
-webkit-transform: scale(1); } }
357+
-webkit-transform: scale(1);
358+
-moz-transform: scale(1); } }
353359

354360
@keyframes appear {
355361
0% {
356362
opacity: 0;
357-
-webkit-transform: scale(0); }
363+
-webkit-transform: scale(0);
364+
-moz-transform: scale(0); }
358365

359366
100% {
360367
opacity: 1;
361-
-webkit-transform: scale(1); } }
368+
-webkit-transform: scale(1);
369+
-moz-transform: scale(1); } }
362370

363371
.tile-new {
364372
-webkit-animation: appear 200ms ease 100ms;
@@ -368,33 +376,42 @@ hr {
368376

369377
@-webkit-keyframes pop {
370378
0% {
371-
-webkit-transform: scale(0); }
379+
-webkit-transform: scale(0);
380+
-moz-transform: scale(0); }
372381

373382
50% {
374-
-webkit-transform: scale(1.2); }
383+
-webkit-transform: scale(1.2);
384+
-moz-transform: scale(1.2); }
375385

376386
100% {
377-
-webkit-transform: scale(1); } }
387+
-webkit-transform: scale(1);
388+
-moz-transform: scale(1); } }
378389

379390
@-moz-keyframes pop {
380391
0% {
381-
-webkit-transform: scale(0); }
392+
-webkit-transform: scale(0);
393+
-moz-transform: scale(0); }
382394

383395
50% {
384-
-webkit-transform: scale(1.2); }
396+
-webkit-transform: scale(1.2);
397+
-moz-transform: scale(1.2); }
385398

386399
100% {
387-
-webkit-transform: scale(1); } }
400+
-webkit-transform: scale(1);
401+
-moz-transform: scale(1); } }
388402

389403
@keyframes pop {
390404
0% {
391-
-webkit-transform: scale(0); }
405+
-webkit-transform: scale(0);
406+
-moz-transform: scale(0); }
392407

393408
50% {
394-
-webkit-transform: scale(1.2); }
409+
-webkit-transform: scale(1.2);
410+
-moz-transform: scale(1.2); }
395411

396412
100% {
397-
-webkit-transform: scale(1); } }
413+
-webkit-transform: scale(1);
414+
-moz-transform: scale(1); } }
398415

399416
.tile-merged {
400417
z-index: 20;

‎style/main.scss‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,8 @@ hr {
155155
border-radius: $tile-border-radius * 2;
156156
width: $field-width;
157157
height: $field-width;
158+
-webkit-box-sizing: border-box;
159+
-moz-box-sizing: border-box;
158160
box-sizing: border-box;
159161

160162
.game-message {
@@ -342,15 +344,15 @@ hr {
342344

343345
@include keyframes(appear) {
344346
0% {
345-
// -webkit-transform: scale(1.5);
346347
opacity: 0;
347348
-webkit-transform: scale(0);
349+
-moz-transform: scale(0);
348350
}
349351

350352
100% {
351-
// -webkit-transform: scale(1);
352353
opacity: 1;
353354
-webkit-transform: scale(1);
355+
-moz-transform: scale(1);
354356
}
355357
}
356358

@@ -362,16 +364,17 @@ hr {
362364
@include keyframes(pop) {
363365
0% {
364366
-webkit-transform: scale(0);
365-
// opacity: 0;
367+
-moz-transform: scale(0);
366368
}
367369

368370
50% {
369371
-webkit-transform: scale(1.2);
372+
-moz-transform: scale(1.2);
370373
}
371374

372375
100% {
373376
-webkit-transform: scale(1);
374-
// opacity: 1;
377+
-moz-transform: scale(1);
375378
}
376379
}
377380

0 commit comments

Comments
 (0)