diff options
author | Pushkar Joshi | 2012-05-31 17:16:21 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-05-31 17:16:21 -0700 |
commit | 8915a7109d918a2e69b0999ebaa2deb84811fef8 (patch) | |
tree | 19a8af74c58c9ea261f0842f36efdab959be3256 /js/tools/modifier-tool-base.js | |
parent | eea0a556e44c2b60d3aaf6e46d2432d3e6303812 (diff) | |
parent | 06b609df1ff7833592faddbd8d7abb5b9f15a74d (diff) | |
download | ninja-8915a7109d918a2e69b0999ebaa2deb84811fef8.tar.gz |
Merge branch 'pentool' into brushtool
Diffstat (limited to 'js/tools/modifier-tool-base.js')
-rwxr-xr-x | js/tools/modifier-tool-base.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js index d023206a..6aea77aa 100755 --- a/js/tools/modifier-tool-base.js +++ b/js/tools/modifier-tool-base.js | |||
@@ -39,7 +39,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { | |||
39 | return this._clickedObject; | 39 | return this._clickedObject; |
40 | }, | 40 | }, |
41 | set: function (value) { | 41 | set: function (value) { |
42 | if(value === this.application.ninja.currentDocument.documentRoot) | 42 | if(value === this.application.ninja.currentDocument.model.documentRoot) |
43 | { | 43 | { |
44 | this._clickedObject = this._target; | 44 | this._clickedObject = this._target; |
45 | } | 45 | } |
@@ -64,7 +64,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { | |||
64 | value: function(hitRec) | 64 | value: function(hitRec) |
65 | { | 65 | { |
66 | var elt = hitRec.getElt(); | 66 | var elt = hitRec.getElt(); |
67 | if(elt === this.application.ninja.currentDocument.documentRoot) | 67 | if(elt === this.application.ninja.currentDocument.model.documentRoot) |
68 | { | 68 | { |
69 | elt = this._target; | 69 | elt = this._target; |
70 | } | 70 | } |
@@ -531,7 +531,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { | |||
531 | 531 | ||
532 | snapManager.enableSnapAlign( snapManager.snapAlignEnabledAppLevel() ); | 532 | snapManager.enableSnapAlign( snapManager.snapAlignEnabledAppLevel() ); |
533 | if ( snapManager.snapAlignEnabled() && this._clickedObject && | 533 | if ( snapManager.snapAlignEnabled() && this._clickedObject && |
534 | (this._clickedObject !== this.application.ninja.currentDocument.documentRoot) ) | 534 | (this._clickedObject !== this.application.ninja.currentDocument.model.documentRoot) ) |
535 | { | 535 | { |
536 | var alignBounds = !hitRec || (hitRec.getType() == hitRec.SNAP_TYPE_STAGE) || hitRec.isSomeGridTypeSnap(); | 536 | var alignBounds = !hitRec || (hitRec.getType() == hitRec.SNAP_TYPE_STAGE) || hitRec.isSomeGridTypeSnap(); |
537 | if (alignBounds) | 537 | if (alignBounds) |
@@ -776,7 +776,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { | |||
776 | } | 776 | } |
777 | else | 777 | else |
778 | { | 778 | { |
779 | this.target = this.application.ninja.currentDocument.documentRoot; | 779 | this.target = this.application.ninja.currentDocument.model.documentRoot; |
780 | } | 780 | } |
781 | // this._updateTargets(); | 781 | // this._updateTargets(); |
782 | } | 782 | } |