aboutsummaryrefslogtreecommitdiff
path: root/js/tools/modifier-tool-base.js
diff options
context:
space:
mode:
authorhwc4872012-04-13 11:52:13 -0700
committerhwc4872012-04-13 11:52:13 -0700
commit4f2fb5764703cab4ce3ada719b1395ed1e2f3b7c (patch)
tree3dc2e3c5a041179eed38eab1a00f851554e50005 /js/tools/modifier-tool-base.js
parent521df0ed9242efff45715998837068c87aca7efd (diff)
parent4b900ea5cd6bb77eb30cec8c03b9ec9fa662c1e9 (diff)
downloadninja-4f2fb5764703cab4ce3ada719b1395ed1e2f3b7c.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping_II
Conflicts: js/helper-classes/3D/view-utils.js js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js js/tools/Translate3DToolBase.js
Diffstat (limited to 'js/tools/modifier-tool-base.js')
-rwxr-xr-xjs/tools/modifier-tool-base.js14
1 files changed, 10 insertions, 4 deletions
diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js
index 2bc2d5f1..03b100f2 100755
--- a/js/tools/modifier-tool-base.js
+++ b/js/tools/modifier-tool-base.js
@@ -9,8 +9,8 @@ var Montage = require("montage/core/core").Montage,
9 snapManager = require("js/helper-classes/3D/snap-manager").SnapManager, 9 snapManager = require("js/helper-classes/3D/snap-manager").SnapManager,
10 viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils, 10 viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils,
11 vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils, 11 vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils,
12 drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils, 12 drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils;
13 Properties3D = ("js/models/properties-3d").Properties3D; 13// Properties3D = ("js/models/properties-3d").Properties3D;
14 14
15exports.ModifierToolBase = Montage.create(DrawingTool, { 15exports.ModifierToolBase = Montage.create(DrawingTool, {
16 16
@@ -458,6 +458,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
458 { 458 {
459 this.isDrawing = true; 459 this.isDrawing = true;
460 this.application.ninja.stage.showSelectionBounds = false; 460 this.application.ninja.stage.showSelectionBounds = false;
461 this._updateTargets();
461 462
462 if(this._canSnap) 463 if(this._canSnap)
463 { 464 {
@@ -768,6 +769,11 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
768 snapManager.enableGridSnap( snapManager.gridSnapEnabledAppLevel() ); 769 snapManager.enableGridSnap( snapManager.gridSnapEnabledAppLevel() );
769 this.eventManager.removeEventListener( "toolOptionsChange", this, false); 770 this.eventManager.removeEventListener( "toolOptionsChange", this, false);
770 this.eventManager.removeEventListener( "toolDoubleClick", this, false); 771 this.eventManager.removeEventListener( "toolDoubleClick", this, false);
772
773 if (this._targetedElement) {
774 this._targetedElement.classList.remove("active-element-outline");
775 this._targetedElement = null;
776 }
771 } 777 }
772 } 778 }
773 }, 779 },
@@ -796,7 +802,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
796 { 802 {
797 this.target = this.application.ninja.currentDocument.documentRoot; 803 this.target = this.application.ninja.currentDocument.documentRoot;
798 } 804 }
799 this._updateTargets(); 805// this._updateTargets();
800 } 806 }
801 else 807 else
802 { 808 {
@@ -817,7 +823,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
817 HandleLeftButtonDown: { 823 HandleLeftButtonDown: {
818 value: function(event) { 824 value: function(event) {
819 825
820 console.log( "modifier-tool-base.HandleLeftButtonDown" ); 826// console.log( "modifier-tool-base.HandleLeftButtonDown" );
821 827
822 var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY)); 828 var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY));
823 this.downPoint.x = point.x; 829 this.downPoint.x = point.x;