Merge pull request #19 from MahjongPantheon/TYR-16-empty-data-bug

Tyr 16 empty data bug

package.json

@@ -28,24 +28,24 @@
     "lodash": "^4.17.2",
     "rxjs": "^5.0.1",
     "ts-helpers": "^1.1.1",
-    "zone.js": "^0.8.4"
+    "zone.js": "0.8.0"
   },
   "devDependencies": {
-    "@angular/cli": "1.0.0-beta.20-4",
+    "@angular/cli": "1.0.0",
     "@types/jasmine": "^2.5.46",
-    "@types/node": "^6.0.42",
-    "codelyzer": "~1.0.0-beta.3",
-    "jasmine-core": "2.4.1",
-    "jasmine-spec-reporter": "2.5.0",
-    "karma": "1.2.0",
+    "@types/node": "^7.0.12",
+    "codelyzer": "~2.1.1",
+    "jasmine-core": "2.5.2",
+    "jasmine-spec-reporter": "3.2.0",
+    "karma": "1.5.0",
     "karma-chrome-launcher": "^2.0.0",
     "karma-cli": "^1.0.1",
     "karma-jasmine": "^1.0.2",
-    "karma-remap-istanbul": "^0.2.1",
-    "protractor": "4.0.9",
-    "ts-node": "1.2.1",
-    "tslint": "3.13.0",
+    "karma-remap-istanbul": "^0.6.0",
+    "protractor": "5.1.1",
+    "ts-node": "3.0.2",
+    "tslint": "5.0.0",
     "typescript": "^2.2.1",
-    "webdriver-manager": "10.2.5"
+    "webdriver-manager": "12.0.4"
   }
 }

src/app/primitives/appstate/timer.ts

@@ -57,13 +57,13 @@ export function getCurrentTimerZone(state: AppState, yellowZoneAlreadyPlayed: bo
   switch (state.getGameConfig('timerPolicy')) {
     case 'redZone':
       zoneLength = state.getGameConfig('redZone');
-      if (zoneLength && (this.state.getTimeRemaining() < zoneLength)) {
+      if (zoneLength && (state.getTimeRemaining() < zoneLength)) {
         return 'redZone';
       }
       break;
     case 'yellowZone':
       zoneLength = state.getGameConfig('yellowZone');
-      if (zoneLength && (this.state.getTimeRemaining() < zoneLength)) {
+      if (zoneLength && (state.getTimeRemaining() < zoneLength)) {
         return yellowZoneAlreadyPlayed ? 'redZone' : 'yellowZone';
       }
       break;