Moved scoreboard.php to ScoreboardModalController.php, removed unused…

… modals, updated Gruntfile
facebookarchive · May 7, 2016 · 0e4fdb6 · 0e4fdb6
1 parent 4cfbf30
commit 0e4fdb6
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 236 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -81,6 +81,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-run');
 
   grunt.registerTask('check', ['force:eslint', 'run:flow']);
-  grunt.registerTask('default', ['check', 'browserify', 'copy:browserify', 'sass']);
+  grunt.registerTask('build', ['browserify', 'copy:browserify', 'sass']);
+  grunt.registerTask('default', ['check', 'build']);
   grunt.registerTask('release', ['env:release', 'eslint', 'run:flow', 'browserify', 'uglify', 'sass']);
 };
diff --git a/src/Router.php b/src/Router.php
@@ -31,6 +31,8 @@ class Router {
         return await (new TutorialModalController())->genRender($modal);
       case 'country':
         return await (new CountryModalController())->genRender($modal);
+      case 'scoreboard':
+        return await (new ScoreboardModalController())->genRender($modal);
       default:
         throw new NotFoundRedirectException();
     }

diff --git a/src/inc/modals/scoreboard.php → ...lers/modals/ScoreboardModalController.php b/src/inc/modals/scoreboard.php → ...lers/modals/ScoreboardModalController.php
@@ -1,14 +1,9 @@
 <?hh // strict
 
-require_once($_SERVER['DOCUMENT_ROOT'] . '/../vendor/autoload.php');
-
-/* HH_IGNORE_ERROR[1002] */
-SessionUtils::sessionStart();
-SessionUtils::enforceLogin();
-
-class ScoreboardController {
+class ScoreboardModalController extends ModalController {
   public async function genGenerateIndicator(): Awaitable<:xhp> {
     $indicator = <div class="indicator game-progress-indicator"></div>;
+
     $game = await Configuration::gen('game');
     if ($game->getValue() === '1') {
       $start_ts = await Configuration::gen('start_ts');
@@ -22,26 +17,23 @@ class ScoreboardController {
       $current_s = intval($now) - intval($start_ts);
       $current = intval($current_s/$s_each);
 
-      for ($i=0; $i<10; $i++) {
+      for ($i = 0; $i < 10; $i++) {
         $indicator_classes = 'indicator-cell ';
         if ($current >= $i) {
           $indicator_classes .= 'active ';
         }
-        $indicator->appendChild(
-          <span class={$indicator_classes}></span>
-        );
+        $indicator->appendChild(<span class={$indicator_classes}></span>);
       }
     } else {
-      for ($i=0; $i<10; $i++) {
-        $indicator->appendChild(
-          <span class="indicator-cell"></span>
-        );
+      for ($i = 0; $i < 10; $i++) {
+        $indicator->appendChild(<span class="indicator-cell"></span>);
       }
     }
     return $indicator;
   }
 
-  public async function genRender(): Awaitable<:xhp> {
+  <<__Override>>
+  public async function genRender(string $_): Awaitable<:xhp> {
     $scoreboard_tbody = <tbody></tbody>;
 
     // If refresing is enabled, do the needful
@@ -83,7 +75,6 @@ class ScoreboardController {
           <a href="#" class="js-close-modal">
             <svg class="icon icon--close">
               <use href="#icon--close"/>
-
             </svg>
           </a>
         </div>
@@ -118,6 +109,3 @@ class ScoreboardController {
       </div>;
   }
 }
-
-$scoreboard_generated = new ScoreboardController();
-echo \HH\Asio\join($scoreboard_generated->genRender());
diff --git a/src/inc/modals/forgot-login-password.php b/src/inc/modals/forgot-login-password.php
diff --git a/src/inc/modals/scoreboard-final.php b/src/inc/modals/scoreboard-final.php
diff --git a/src/static/js/fb-ctf.js b/src/static/js/fb-ctf.js
@@ -1767,6 +1767,11 @@ function setupInputListeners() {
     function init() {
       // init the jquery object variables
       $gameboard = $('#fb-gameboard');
+      console.log('1');
+      $gameboard.find('[data-modal=scoreboard]').on('click', function() {
+        console.log('2');
+        Modal.loadController('index.php?p=scoreboard&modal=scoreboard');
+      });
 
       setInterval(Clock.clockRunning, 10);
 

diff --git a/src/static/js/modal.js b/src/static/js/modal.js
@@ -22,28 +22,7 @@ module.exports = (function() {
     $modalContainer = $('#fb-main-content');
     $countryHover = $('#fb-country-popup');
 
-    //
-    // trigger the launch of a modal
-    //
-    $body.on('click', '.js-launch-modal', function(event) {
-      event.preventDefault();
-      var modal = $(this).data('modal'),
-          cb;
-
-      //
-      // if we're launching the login modal, add the active
-      //  class to the nav item
-      //
-      if (modal === 'login') {
-        $('.fb-main-nav a').removeClass('active');
-        $(this).addClass('active');
-      }
-      load(modal, cb);
-    });
-
-    //
     // close the modal
-    //
     $body.on('click', '.js-close-modal', close);
   }
 
@@ -60,16 +39,6 @@ module.exports = (function() {
     }
 
     $('div[id^="fb-modal"]').removeClass(ACTIVE_CLASS);
-
-    //
-    // @NOTICE
-    // this is here to re-enable the active state on the nav
-    //  in case it was altered when the modal was launched.
-    //
-    // TODO:
-    //if (_BUILDKIT !== undefined) {
-    //  _BUILDKIT.enableNavActiveState();
-    //}
   }
 
   /**