From e93827d6c157c7648eb52e6c10b7f458b215b580 Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Fri, 23 Mar 2012 07:34:11 -0700 Subject: Timeline : Bug Fix : IKNINJA 1374 Signed-off-by: Kruti Shah Signed-off-by: Jonathan Duran --- js/tools/SelectionTool.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'js/tools') diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js index f9411f48..3db51501 100755 --- a/js/tools/SelectionTool.js +++ b/js/tools/SelectionTool.js @@ -223,8 +223,10 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { HandleDoubleClick: { value: function(event) { if(this.application.ninja.selectedElements.length > 0) { + this.application.ninja.breadCrumbClick = true; this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0]._element; } else { + this.application.ninja.breadCrumbClick = true; this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.documentRoot; } } -- cgit v1.2.3 From a9050f96d814469f420bcf3630d16d576b62258e Mon Sep 17 00:00:00 2001 From: Kruti Shah Date: Fri, 6 Apr 2012 12:10:48 -0700 Subject: Breadcrumb Fix Signed-off-by: Kruti Shah --- js/tools/SelectionTool.js | 1 + 1 file changed, 1 insertion(+) (limited to 'js/tools') diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js index ea2379bb..7120e18f 100755 --- a/js/tools/SelectionTool.js +++ b/js/tools/SelectionTool.js @@ -223,6 +223,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { HandleDoubleClick: { value: function(event) { if(this.application.ninja.selectedElements.length > 0) { + this.application.ninja.breadCrumbClick = true; this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0]; } else { this.application.ninja.breadCrumbClick = true; -- cgit v1.2.3 From b7d5b9e9b69644cdafdcc9b7ef2fe2674f35db18 Mon Sep 17 00:00:00 2001 From: Kruti Shah Date: Thu, 19 Apr 2012 13:48:28 -0700 Subject: BreadCrumb Bug Fix Signed-off-by: Kruti Shah --- js/tools/SelectionTool.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/tools') diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js index eb5341de..78eda1b7 100755 --- a/js/tools/SelectionTool.js +++ b/js/tools/SelectionTool.js @@ -224,10 +224,10 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { HandleDoubleClick: { value: function(event) { if(this.application.ninja.selectedElements.length > 0) { - this.application.ninja.breadCrumbClick = true; + this.application.ninja.currentDocument.breadCrumbClick = true; this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0]; } else { - this.application.ninja.breadCrumbClick = true; + this.application.ninja.currentDocument.breadCrumbClick = true; this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.documentRoot; } } -- cgit v1.2.3 From 933338e13e73243965d105170a269a41f7efd77f Mon Sep 17 00:00:00 2001 From: Kruti Shah Date: Fri, 20 Apr 2012 16:25:36 -0700 Subject: Breadcrumb Fix Signed-off-by: Kruti Shah --- js/tools/SelectionTool.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/tools') diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js index 30e56b28..414f9d11 100755 --- a/js/tools/SelectionTool.js +++ b/js/tools/SelectionTool.js @@ -221,10 +221,10 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { HandleDoubleClick: { value: function(event) { if(this.application.ninja.selectedElements.length > 0) { - this.application.ninja.currentDocument.breadCrumbClick = true; +// this.application.ninja.currentDocument.breadCrumbClick = true; this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0]; } else { - this.application.ninja.currentDocument.breadCrumbClick = true; +// this.application.ninja.currentDocument.breadCrumbClick = true; this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.documentRoot; } } -- cgit v1.2.3 From 0475cb7e37601366ec07d77fcea44269d3d49633 Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Mon, 23 Apr 2012 11:36:09 -0700 Subject: Fix Pen Tool not broadcasting elementAdded event Signed-off-by: Jonathan Duran --- js/tools/PenTool.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'js/tools') diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js index 7fc8dd95..3ffe0b62 100755 --- a/js/tools/PenTool.js +++ b/js/tools/PenTool.js @@ -619,6 +619,8 @@ exports.PenTool = Montage.create(ShapeTool, { // TODO - update the shape's info only. shapeModel will likely need an array of shapes. } + NJevent("elementAdded", newCanvas); + if(newCanvas.elementModel.isShape) { this.application.ninja.selectionController.selectElement(newCanvas); -- cgit v1.2.3 From 12fadd1494a9b5fcdaa17fde2f4847277237cf79 Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Mon, 23 Apr 2012 11:47:15 -0700 Subject: Fix Brush tool not broadcasting elementAdded event Signed-off-by: Jonathan Duran --- js/tools/BrushTool.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'js/tools') diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js index 4347658a..34a3c3ff 100644 --- a/js/tools/BrushTool.js +++ b/js/tools/BrushTool.js @@ -343,6 +343,8 @@ exports.BrushTool = Montage.create(ShapeTool, { // TODO - update the shape's info only. shapeModel will likely need an array of shapes. } + NJevent("elementAdded", newCanvas); + //if(newCanvas.elementModel.isShape) if (true) { -- cgit v1.2.3 From ef704fcb6b1bb290eb45b6685b073e2932237a68 Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Wed, 25 Apr 2012 08:15:11 -0700 Subject: Revert "Fix Pen Tool not broadcasting elementAdded event" This reverts commit 0475cb7e37601366ec07d77fcea44269d3d49633. Signed-off-by: Jonathan Duran --- js/tools/PenTool.js | 2 -- 1 file changed, 2 deletions(-) (limited to 'js/tools') diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js index 3ffe0b62..7fc8dd95 100755 --- a/js/tools/PenTool.js +++ b/js/tools/PenTool.js @@ -619,8 +619,6 @@ exports.PenTool = Montage.create(ShapeTool, { // TODO - update the shape's info only. shapeModel will likely need an array of shapes. } - NJevent("elementAdded", newCanvas); - if(newCanvas.elementModel.isShape) { this.application.ninja.selectionController.selectElement(newCanvas); -- cgit v1.2.3 From 185dae2438e680acfe8c974dc5d653000c380066 Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Fri, 27 Apr 2012 11:47:36 -0700 Subject: Revert "Fix Brush tool not broadcasting elementAdded event" This reverts commit 12fadd1494a9b5fcdaa17fde2f4847277237cf79. Signed-off-by: Jonathan Duran --- js/tools/BrushTool.js | 2 -- 1 file changed, 2 deletions(-) (limited to 'js/tools') diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js index 94958fd6..6cd6858c 100644 --- a/js/tools/BrushTool.js +++ b/js/tools/BrushTool.js @@ -342,8 +342,6 @@ exports.BrushTool = Montage.create(ShapeTool, { // TODO - update the shape's info only. shapeModel will likely need an array of shapes. } - NJevent("elementAdded", newCanvas); - //if(newCanvas.elementModel.isShape) if (true) { -- cgit v1.2.3 From 69dba9ace7a1b77f57ee418abfc2e0fd0e0a9896 Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Fri, 27 Apr 2012 11:50:06 -0700 Subject: Refix brush tool elementAdded event Signed-off-by: Jonathan Duran --- js/tools/BrushTool.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'js/tools') 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, { // TODO - update the shape's info only. shapeModel will likely need an array of shapes. } + //now send the event that will add this canvas to the timeline + NJevent("elementAdded", newCanvas); + //if(newCanvas.elementModel.isShape) if (true) { -- cgit v1.2.3