Offline easter egg - Fix incorrect score when restarting from a paused game

components/neterror/resources/offline.js

 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 (function() {
 'use strict';
 /**
  * T-Rex runner.
  * @param {string} outerContainerId Outer containing element id.
  * @param {Object} opt_config
  * @constructor
  * @export
  */
 function Runner(outerContainerId, opt_config) {
   // Singleton
   if (Runner.instance_) {
     return Runner.instance_;
   }
   Runner.instance_ = this;
 
   this.outerContainerEl = document.querySelector(outerContainerId);
   this.containerEl = null;
   this.snackbarEl = null;
-  this.detailsButton = this.outerContainerEl.querySelector('#details-button');
 
   this.config = opt_config || Runner.config;
 
   this.dimensions = Runner.defaultDimensions;
 
   this.canvas = null;
   this.canvasCtx = null;
 
   this.tRex = null;
 
@@ skipping 620 matching lines @@
   /**
    * Process keydown.
    * @param {Event} e
    */
   onKeyDown: function(e) {
     // Prevent native page scrolling whilst tapping on mobile.
     if (IS_MOBILE && this.playing) {
       e.preventDefault();
     }
 
-    if (e.target != this.detailsButton) {
-      if (!this.crashed && (Runner.keycodes.JUMP[e.keyCode] ||
-           e.type == Runner.events.TOUCHSTART)) {
+    if (!this.crashed && !this.paused) {

[mmenke, 2017/03/21 18:59:58]

Removing the e.target != this.detailsButton doesn't hurt accessibility, right? 
i.e., a user selects the details button (Or reload button) with tab and presses
space to expand it?  (Disclaimer:  I know nothing about accessibility)

[edwardjung, 2017/03/23 10:31:46]

In the past yes, but we no longer have the details button on the internet
disconnected error. Keeping it in doesn't hurt in case the details button is
reintroduced in future, but I think it's more likely we have new switches for
turning wifi / data settings, which I'll handle down the line. 

+      if (Runner.keycodes.JUMP[e.keyCode] ||
+          e.type == Runner.events.TOUCHSTART) {
+        // Starting the game for the first time.

[mmenke, 2017/03/21 18:59:58]

One more question:  Should this also call e.preventDefault()?  Down does, to
avoid scrolling.  Should up do it, too?

[edwardjung, 2017/03/23 10:31:46]

Good point. The vast majority of the time the page isn't scrollable, but it is
possible to scroll down on small screens sizes. Added.

         if (!this.playing) {
           this.loadSounds();
           this.playing = true;
           this.update();
           if (window.errorPageController) {
             errorPageController.trackEasterEgg();
           }
         }
-        //  Play sound effect and jump on starting the game for the first time.
+        // Start jump.
         if (!this.tRex.jumping && !this.tRex.ducking) {
           this.playSound(this.soundFx.BUTTON_PRESS);
           this.tRex.startJump(this.currentSpeed);
         }
+      } else if (this.playing && Runner.keycodes.DUCK[e.keyCode]) {
+        e.preventDefault();
+        if (this.tRex.jumping) {
+          // Speed drop, activated only when jump key is not pressed.
+          this.tRex.setSpeedDrop();
+        } else if (!this.tRex.jumping && !this.tRex.ducking) {
+          // Duck.
+          this.tRex.setDuck(true);
+        }
       }
-
-      if (this.crashed && e.type == Runner.events.TOUCHSTART &&
-          e.currentTarget == this.containerEl) {
-        this.restart();
-      }
-    }
-
-    if (this.playing && !this.crashed && Runner.keycodes.DUCK[e.keyCode]) {
-      e.preventDefault();
-      if (this.tRex.jumping) {
-        // Speed drop, activated only when jump key is not pressed.
-        this.tRex.setSpeedDrop();
-      } else if (!this.tRex.jumping && !this.tRex.ducking) {
-        // Duck.
-        this.tRex.setDuck(true);
-      }
+    } else if (this.crashed && e.type == Runner.events.TOUCHSTART &&
+      e.currentTarget == this.containerEl) {

[mmenke, 2017/03/21 18:59:59]

nit:  Fix indentation (Align after (, or use 4-space indent)

[edwardjung, 2017/03/23 10:31:46]

Done.

+      this.restart();
     }
   },
 
 
   /**
    * Process key up.
    * @param {Event} e
    */
   onKeyUp: function(e) {
     var keyCode = String(e.keyCode);
@@ skipping 98 matching lines @@
       this.time = getTimeStamp();
       this.update();
     }
   },
 
   restart: function() {
     if (!this.raqId) {
       this.playCount++;
       this.runningTime = 0;
       this.playing = true;
+      this.paused = false;
       this.crashed = false;
       this.distanceRan = 0;
       this.setSpeed(this.config.SPEED);
       this.time = getTimeStamp();
       this.containerEl.classList.remove(Runner.classes.CRASHED);
       this.clearCanvas();
       this.distanceMeter.reset(this.highestScore);
       this.horizon.reset();
       this.tRex.reset();
       this.playSound(this.soundFx.BUTTON_PRESS);
@@ skipping 1866 matching lines @@
 
   /**
    * Add a new cloud to the horizon.
    */
   addCloud: function() {
     this.clouds.push(new Cloud(this.canvas, this.spritePos.CLOUD,
         this.dimensions.WIDTH));
   }
 };
 })();