aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/RDGE/src
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-27 09:10:58 -0700
committerPushkar Joshi2012-03-27 09:10:58 -0700
commit0c26aff9c19c2b39fca06fa6b3bc76b672204065 (patch)
treee778f2b9d5d525aa364360d5996536a0a06379bd /js/helper-classes/RDGE/src
parent753244b4713243ab19ca246be674f0b45fb85b72 (diff)
parent309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff)
downloadninja-0c26aff9c19c2b39fca06fa6b3bc76b672204065.tar.gz
Merge branch 'master' into brushtool
Conflicts: js/controllers/elements/shapes-controller.js
Diffstat (limited to 'js/helper-classes/RDGE/src')
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/engine.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/js/helper-classes/RDGE/src/core/script/engine.js b/js/helper-classes/RDGE/src/core/script/engine.js
index f5724665..1341d032 100755
--- a/js/helper-classes/RDGE/src/core/script/engine.js
+++ b/js/helper-classes/RDGE/src/core/script/engine.js
@@ -214,6 +214,11 @@ function Engine()
214 return contextManager.contextMap[optCanvasID]; 214 return contextManager.contextMap[optCanvasID];
215 } 215 }
216 } 216 }
217
218 this.clearContext = function( canvasID )
219 {
220 contextManager.contextMap[canvasID] = undefined;
221 }
217 222
218 /* 223 /*
219 * give the contextID (canvas id) of the context to set 224 * give the contextID (canvas id) of the context to set
@@ -488,7 +493,7 @@ Engine.prototype.registerCanvas = function(canvas, runState) {
488Engine.prototype.unregisterCanvas = function(canvas) { 493Engine.prototype.unregisterCanvas = function(canvas) {
489 stat.closePage(canvas.rdgeid + "_fps"); 494 stat.closePage(canvas.rdgeid + "_fps");
490 contextManager.removeObject(canvas.rdgeCtxHandle); 495 contextManager.removeObject(canvas.rdgeCtxHandle);
491 496 this.clearContext( canvas.rdgeid );
492} 497}
493 498
494Engine.prototype.getCanvas = function( id ) 499Engine.prototype.getCanvas = function( id )