aboutsummaryrefslogtreecommitdiff
path: root/js/tools/modifier-tool-base.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/tools/modifier-tool-base.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/tools/modifier-tool-base.js')
-rw-r--r--js/tools/modifier-tool-base.js35
1 files changed, 21 insertions, 14 deletions
diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js
index f78e99c8..67b217c4 100644
--- a/js/tools/modifier-tool-base.js
+++ b/js/tools/modifier-tool-base.js
@@ -437,16 +437,19 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
437 437
438 startDraw: { 438 startDraw: {
439 value: function(event) { 439 value: function(event) {
440 this.isDrawing = true; 440 if(this._target)
441 this.application.ninja.stage.showSelectionBounds = false;
442
443 if(this._canSnap)
444 {
445 this.initializeSnapping(event);
446 }
447 else
448 { 441 {
449 this.drawWithoutSnapping(event); 442 this.isDrawing = true;
443 this.application.ninja.stage.showSelectionBounds = false;
444
445 if(this._canSnap)
446 {
447 this.initializeSnapping(event);
448 }
449 else
450 {
451 this.drawWithoutSnapping(event);
452 }
450 } 453 }
451 } 454 }
452 }, 455 },
@@ -674,11 +677,15 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
674 return this._targets; 677 return this._targets;
675 }, 678 },
676 set: function (value) { 679 set: function (value) {
677 this._target = value; 680 this._targets = value;
678 if (value === null) 681 if (value !== null && value.length)
679 { 682 {
680 return; 683 this.target = value[0];
681 } 684 }
685 else
686 {
687 this.target = null;
688 }
682 } 689 }
683 }, 690 },
684 691
@@ -723,7 +730,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
723 } else { 730 } else {
724 this.eventManager.removeEventListener("selectionChange", this, true); 731 this.eventManager.removeEventListener("selectionChange", this, true);
725 this.application.ninja.stage._iframeContainer.removeEventListener("scroll", this, false); 732 this.application.ninja.stage._iframeContainer.removeEventListener("scroll", this, false);
726 this._targets = null; 733 this._targets = [];
727 734
728 // Clean up 735 // Clean up
729 NJevent("disableStageMove"); 736 NJevent("disableStageMove");
@@ -749,7 +756,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
749 756
750 captureSelectionDrawn: { 757 captureSelectionDrawn: {
751 value: function(event){ 758 value: function(event){
752 this._targets = null; 759 this._targets = [];
753 760
754 var len = this.application.ninja.selectedElements.length; 761 var len = this.application.ninja.selectedElements.length;
755 if(len) 762 if(len)