2048: Tweaks before production (#4027)

* Added additional trigger.

* Fixed container placement / alignment.

* Updated tests.

* Add async start.

* Revert "Add async start."

This reverts commit 54b3edb88221051393d818ccff35d9ae45d10049.

* Check for mobile device and return before onShow

* Ensure we return value from DDH.failed

* remove trailing spaces

lib/DDG/Goodie/Game2048.pm

@@ -5,7 +5,7 @@ use DDG::Goodie;
 zci answer_type => "2048";
 zci is_cached   => 1;
 
-triggers start => "play 2048", "game 2048";
+triggers start => "2048", "play 2048", "game 2048";
 
 handle query_lc => sub {
 

share/goodie/game2048/content.handlebars

@@ -1,5 +1,6 @@
 <div class="game2048__container">
 
+
     <div id="game2048__area_container">
         <div class="game2048__message">
             <p></p>
@@ -10,8 +11,7 @@
             {{/loop}}
         </table>
     </div>
-
-
+    
     <div class="game2048__info">
         <div class="game2048__counter">
             <div class="game2048__points_addition"></div>
@@ -24,4 +24,5 @@
 
         <button class="game2048__new_game">New Game</button>
     </div>
+
 </div>

share/goodie/game2048/game2048.css

@@ -113,7 +113,7 @@
 
 .zci--game2048 .game2048__info {
     float: right;
-    width: 40%;
+    width: 35%;
 }
 
 .zci--game2048 .game2048__help {

share/goodie/game2048/game2048.js

@@ -2,12 +2,17 @@ DDH.game2048 = DDH.game2048 || {};
 
 DDH.game2048.build = function(ops) {
     "use strict";
-    
+
+    //Hide this goodie on mobile devices for now
+    if (DDG.device.isMobile || DDG.device.isMobileDevice) {
+        return DDH.failed('game2048');
+    }
+
     // Global Variables Declaration
     var WINNUM = 2048,
         SIZE = 4,
         TILE_COUNT = SIZE * SIZE,
-        started = false, 
+        started = false,
         tiles = init_area(),
         $game_area,
         $game_area_container,
@@ -38,7 +43,7 @@ DDH.game2048.build = function(ops) {
             swap_cols_area();
             swapped = true;
         }
-    
+
         var result = handle_move(transposed, swapped);
 
         if (dir === 'd' || dir === 's')
@@ -65,7 +70,7 @@ DDH.game2048.build = function(ops) {
             if (tiles[i].val === 0) {
                 ++moves;
                 continue;
-            } 
+            }
 
             //Move across empty tiles
             if(moves > 0) {
@@ -86,7 +91,7 @@ DDH.game2048.build = function(ops) {
                 if(tile_b.val === 0)
                     continue;
 
-                if(tile_a.val === tile_b.val) { 
+                if(tile_a.val === tile_b.val) {
                     merge(tile_a, tile_b, row, col - moves, transposed, swapped);
 
                     result.points = tile_a.val;
@@ -109,21 +114,21 @@ DDH.game2048.build = function(ops) {
         tile_b.val = 0;
 
         //Recalculate the real world pos
-        if(swapped) 
+        if(swapped)
             col = SIZE - 1 - col;
 
         if(transposed) {
             var tmp = col;
             col = row;
             row = tmp;
-        } 
+        }
 
         var translate_string = gen_translate_string(row, col);
 
         tile_b.tile_div.css({ "-ms-transform" : translate_string,
                         "-webkit-transform" : translate_string,
                         "transform" : translate_string,
-                        "opacity" : 0.00 }); 
+                        "opacity" : 0.00 });
 
         tile_b.tile_div.on("transitionend webkitTransitionEnd oTransitionEnd otransitionend MSTransitionEnd", function () {
             $(this).remove();
@@ -149,7 +154,7 @@ DDH.game2048.build = function(ops) {
         for(var i = 0; i < TILE_COUNT; ++i) {
             var pos = index_to_rc(i);
             var tile = tiles[i];
-            
+
             if("undefined" !== typeof(tile.tile_div) && tile.val > 0) {
                 var translate_string = gen_translate_string(pos.row, pos.col);
                 tile.tile_div
@@ -185,7 +190,7 @@ DDH.game2048.build = function(ops) {
         for(var i = 0; i < TILE_COUNT; ++i) {
             var pos = index_to_rc(i);
 
-            if(pos.col >= pos.row) 
+            if(pos.col >= pos.row)
                 continue;
 
             var index_to_swap = rc_to_index(pos.col, pos.row);
@@ -212,7 +217,7 @@ DDH.game2048.build = function(ops) {
             if(tiles[i].val === 0) {
                 unused_tiles.push(i);
             }
-        } 
+        }
 
         var rand_tile = unused_tiles[Math.floor(Math.random() * unused_tiles.length)];
         var rand_val = Math.floor(Math.random() * 11) < 2 ? 4 : 2;
@@ -316,12 +321,6 @@ DDH.game2048.build = function(ops) {
 
     return {
         onShow: function() {
-            //Hide this goodie on mobile devices for now
-            if(DDG.device.isMobile || DDG.device.isMobileDevice) {
-                DDH.spice_tabs.game2048.hideLink();
-                DDH.spice_tabs.game2048.hide();
-                return;
-            }
 
             //'started' is a boolean variable used in order to avoid the
             //duplication of the gaming tiles. Moving around the DDG tabs the

t/Game2048.t

@@ -12,6 +12,19 @@ zci is_cached   => 1;
 ddg_goodie_test(
     [qw( DDG::Goodie::Game2048 )],
 
+    '2048' => test_zci(
+        '',
+        structured_answer => {
+            data => ignore(),
+            templates => {
+                group => "text",
+                item => 0,
+                options => {
+                    content => "DDH.game2048.content"
+                },
+            }
+        }
+    ),
     'play 2048' => test_zci(
         '',
         structured_answer => {
@@ -25,7 +38,10 @@ ddg_goodie_test(
             }
         }
     ),
-    '2048 online' => undef
+    'what is 2048?' => undef,
+    'how to play 2048' => undef,
+    '204823 34232' => undef
+    
 );
 
 done_testing;