aboutsummaryrefslogtreecommitdiff
path: root/js/tools
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-27 14:19:36 -0700
committerValerio Virgillito2012-04-27 14:19:36 -0700
commit314709dd189807bfc762aa150bb1b29d2ccdf25b (patch)
tree94a2b7a9c3e89173d3fb39246485bae46cf0f23a /js/tools
parent917668dbd753d69b346cb9fd2e665fbe257f5311 (diff)
parent69dba9ace7a1b77f57ee418abfc2e0fd0e0a9896 (diff)
downloadninja-314709dd189807bfc762aa150bb1b29d2ccdf25b.tar.gz
Merge pull request #181 from imix23ways/TimelineUber
Timeline uber
Diffstat (limited to 'js/tools')
-rw-r--r--js/tools/BrushTool.js3
-rwxr-xr-xjs/tools/SelectionTool.js2
2 files changed, 5 insertions, 0 deletions
diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js
index 4e13bd43..ded56ecc 100644
--- a/js/tools/BrushTool.js
+++ b/js/tools/BrushTool.js
@@ -417,6 +417,9 @@ exports.BrushTool = Montage.create(ShapeTool, {
417 // TODO - update the shape's info only. shapeModel will likely need an array of shapes. 417 // TODO - update the shape's info only. shapeModel will likely need an array of shapes.
418 } 418 }
419 419
420 //now send the event that will add this canvas to the timeline
421 NJevent("elementAdded", newCanvas);
422
420 //if(newCanvas.elementModel.isShape) 423 //if(newCanvas.elementModel.isShape)
421 if (true) 424 if (true)
422 { 425 {
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 7033ee3d..414f9d11 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -221,8 +221,10 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
221 HandleDoubleClick: { 221 HandleDoubleClick: {
222 value: function(event) { 222 value: function(event) {
223 if(this.application.ninja.selectedElements.length > 0) { 223 if(this.application.ninja.selectedElements.length > 0) {
224// this.application.ninja.currentDocument.breadCrumbClick = true;
224 this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0]; 225 this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0];
225 } else { 226 } else {
227// this.application.ninja.currentDocument.breadCrumbClick = true;
226 this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.documentRoot; 228 this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.documentRoot;
227 } 229 }
228 } 230 }