aboutsummaryrefslogtreecommitdiff
path: root/js/tools
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-14 16:13:20 -0700
committerJose Antonio Marquez2012-06-14 16:13:20 -0700
commitc72058c9e61f5c1e345482d0eb3741c669612e40 (patch)
tree284475902c0b7af56b15bab735c98074ef6210df /js/tools
parent708d6d4736cdb67bde5ecfb31b34e19d26eef611 (diff)
parent5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff)
downloadninja-c72058c9e61f5c1e345482d0eb3741c669612e40.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/tools')
-rwxr-xr-xjs/tools/PenTool.js10
1 files changed, 6 insertions, 4 deletions
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index 33ca5c71..2cffb44d 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -204,10 +204,12 @@ exports.PenTool = Montage.create(ShapeTool, {
204 this.application.ninja.stage.clearDrawingCanvas();//stageManagerModule.stageManager.clearDrawingCanvas(); 204 this.application.ninja.stage.clearDrawingCanvas();//stageManagerModule.stageManager.clearDrawingCanvas();
205 205
206 //undo/redo...go through ElementController and NJEvent 206 //undo/redo...go through ElementController and NJEvent
207 var els = []; 207 if (this._selectedSubpathCanvas) {
208 ElementController.removeElement(this._selectedSubpathCanvas); 208 var els = [];
209 els.push(this._selectedSubpathCanvas); 209 ElementController.removeElement(this._selectedSubpathCanvas);
210 NJevent( "elementsRemoved", els ); 210 els.push(this._selectedSubpathCanvas);
211 NJevent( "elementsRemoved", els );
212 }
211 this._selectedSubpathCanvas = null; 213 this._selectedSubpathCanvas = null;
212 } 214 }
213 }, 215 },