aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/RDGE/src/core/script/runtime.js
diff options
context:
space:
mode:
authorJohn Mayhew2012-02-10 16:04:19 -0800
committerJohn Mayhew2012-02-10 16:04:19 -0800
commit730c1e191e36b8ab8dba576c481a6585e0dfa69e (patch)
treec86445ff8d1981e97096ec5e9f6cc5301dc9ea40 /js/helper-classes/RDGE/src/core/script/runtime.js
parentcde1dd9a9156b9682fdf85ce2cd4acdd94124c37 (diff)
parent48977780443d97b9e97b047066639c9056788041 (diff)
downloadninja-730c1e191e36b8ab8dba576c481a6585e0dfa69e.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts: js/ninja.reel/ninja.html
Diffstat (limited to 'js/helper-classes/RDGE/src/core/script/runtime.js')
-rw-r--r--js/helper-classes/RDGE/src/core/script/runtime.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/helper-classes/RDGE/src/core/script/runtime.js b/js/helper-classes/RDGE/src/core/script/runtime.js
index 8d8fdf38..18b9b223 100644
--- a/js/helper-classes/RDGE/src/core/script/runtime.js
+++ b/js/helper-classes/RDGE/src/core/script/runtime.js
@@ -179,7 +179,7 @@ RDGERequestAnimationFrame = (function() {
179RDGETask = (function() { 179RDGETask = (function() {
180 var tasks = {}; 180 var tasks = {};
181 return function(canvas, startNow) { 181 return function(canvas, startNow) {
182 this.id = canvas.id; 182 this.id = canvas.rdgeid;
183 this.currTime = 0.0; 183 this.currTime = 0.0;
184 this.lastTime = 0.0; 184 this.lastTime = 0.0;
185 this.running = false; 185 this.running = false;