Changed new Date().getTime()'s to Date.now().

PBS-KIDS · Dec 18, 2015 · f1c1417 · f1c1417
1 parent d78e4f6
commit f1c1417
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 19 deletions.
diff --git a/src/Scene.js b/src/Scene.js
@@ -93,7 +93,7 @@ platypus.Scene = (function () {
             }
             messages.length = 0;
 
-            this.time = new Date().getTime();
+            this.time = Date.now();
             this.timeElapsed = {
                 name: '',
                 time: 0
@@ -118,23 +118,9 @@ platypus.Scene = (function () {
                 value: event
             });
         } else {
-            if (eventId === 'tick') {
-                time = new Date().getTime();
-                this.timeElapsed.name = 'Non-Engine';
-                this.timeElapsed.time = time - this.time;
-                this.trigger('time-elapsed', this.timeElapsed);
-                this.time = time;
-            }
             for (i = 0; i < this.layers.length; i++) {
                 this.layers[i].trigger(eventId, event);
             }
-            if (eventId === 'tick') {
-                time = new Date().getTime();
-                this.timeElapsed.name = 'Engine Total';
-                this.timeElapsed.time = time - this.time;
-                this.trigger('time-elapsed', this.timeElapsed);
-                this.time = time;
-            }
         }
     };
 

diff --git a/src/components/Camera.js b/src/components/Camera.js
@@ -7,11 +7,13 @@
  * @class Camera
  * @uses platypus.Component
 */
-/*global console, createjs, PIXI, platypus, springroll */
+/*global console, createjs, PIXI, platypus, include */
 /*jslint plusplus:true */
 (function () {
     "use strict";
 
+    var Application = include("springroll.Application");
+
     return platypus.createComponentClass({
         id: 'Camera',
         properties: {
@@ -215,7 +217,7 @@
             if (this.owner.container) {
                 this.parentContainer = this.owner.container;
             } else if (this.owner.stage) {
-                this.canvas = this.canvas || springroll.Application.instance.display.canvas; //TODO: Probably need to find a better way to handle resizing - DDD 10/4/2015
+                this.canvas = this.canvas || Application.instance.display.canvas; //TODO: Probably need to find a better way to handle resizing - DDD 10/4/2015
                 this.parentContainer = this.owner.stage;
                 this.owner.width  = this.canvas.width;
                 this.owner.height = this.canvas.height;
@@ -398,7 +400,7 @@
                 }
 
                 if (this.lastFollow.begin) {
-                    if (this.lastFollow.begin < new Date().getTime()) {
+                    if (this.lastFollow.begin < Date.now()) {
                         this.follow(this.lastFollow);
                     }
                 }
@@ -522,7 +524,7 @@
                         this.lastFollow.offsetX = this.offsetX;
                         this.lastFollow.offsetY = this.offsetY;
                     }
-                    this.lastFollow.begin  = new Date().getTime() + def.time;
+                    this.lastFollow.begin  = Date.now() + def.time;
                 } else {
                     if (this.lastFollow.begin) {
                         this.lastFollow.begin = 0;