diff options
author | Valerio Virgillito | 2012-04-04 11:11:58 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-04 11:11:58 -0700 |
commit | a11ef2eed7049835c8bdfa50a2b893632c46eaa0 (patch) | |
tree | fcbb067044d339daa49622537e934bf3a309db96 /js/stage/stage.reel | |
parent | c6de22bf42be90b403491b5f87b1818d9020310c (diff) | |
download | ninja-a11ef2eed7049835c8bdfa50a2b893632c46eaa0.tar.gz |
Squashed commit of Preparing for the montage undo-manager: Architecture changes
Reworked the add and remove elements into 1 function which can take 1 or more elements.
Removed the _element from the selection array
Many other changes related to those 2 changes
Undo/Redo shortcuts are now using montage undo/redo manager.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/stage/stage.reel')
-rwxr-xr-x | js/stage/stage.reel/stage.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 00b72490..3500b6a3 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js | |||
@@ -560,8 +560,7 @@ exports.Stage = Montage.create(Component, { | |||
560 | elt = this.application.ninja.currentDocument.GetElementFromPoint(point.x + this.scrollLeft,point.y + this.scrollTop); | 560 | elt = this.application.ninja.currentDocument.GetElementFromPoint(point.x + this.scrollLeft,point.y + this.scrollTop); |
561 | 561 | ||
562 | // workaround Chrome 3d bug | 562 | // workaround Chrome 3d bug |
563 | if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.application.ninja.currentDocument.inExclusion(elt) !== -1) | 563 | if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.application.ninja.currentDocument.inExclusion(elt) !== -1) { |
564 | { | ||
565 | return this._getElementUsingSnapping(point); | 564 | return this._getElementUsingSnapping(point); |
566 | } else { | 565 | } else { |
567 | return elt; | 566 | return elt; |
@@ -605,7 +604,7 @@ exports.Stage = Montage.create(Component, { | |||
605 | var selArray = new Array(); | 604 | var selArray = new Array(); |
606 | 605 | ||
607 | for(var i = 0; this.application.ninja.selectedElements[i];i++) { | 606 | for(var i = 0; this.application.ninja.selectedElements[i];i++) { |
608 | var curElement = this.application.ninja.selectedElements[i]._element; | 607 | var curElement = this.application.ninja.selectedElements[i]; |
609 | 608 | ||
610 | // Add element to array that is used to calculate 3d-bounding box of all elements | 609 | // Add element to array that is used to calculate 3d-bounding box of all elements |
611 | selArray.push( curElement ); | 610 | selArray.push( curElement ); |