From 806974142d44afdd23534bf2d18eff0a8e701e0c Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 8 Jun 2012 16:59:59 -0700
Subject: rewrite: currentSelectedContainer -> domContainer

Fixed the currentSelectedContainer by removing bindings and using property change on the current document
added the red outline back.

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/helper-classes/3D/snap-manager.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'js/helper-classes')

diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index a8b6e739..0157140f 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -496,7 +496,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
 			this._elementCache = new Array;
 
 //			var stage = this.getStage();
-			var stage = this.application.ninja.currentSelectedContainer || this.getStage();
+			var stage = this.application.ninja.currentDocument.model.domContainer || this.getStage();
 			this.hLoadElementCache( stage,  plane, 0 );
             this._isCacheInvalid = false;
 
@@ -987,7 +987,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
 		value: function( screenPt,  hitRecs ) {
 			// start at the stage.
 //			var stage = this.getStage();
-            var stage = this.application.ninja.currentSelectedContainer || this.getStage();
+            var stage = this.application.ninja.currentDocument.model.domContainer || this.getStage();
 
 			// the root should be the 'view' canvas, so the first matrix is the camera
 			viewUtils.setViewportObj( stage );
@@ -1009,7 +1009,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
             }
 			// hit test the current object
 			var hit;
-			var snapToStage = ((depth === 0) && (elt === this.application.ninja.currentSelectedContainer) && (elt.nodeName === 'CANVAS'));
+			var snapToStage = ((depth === 0) && (elt === this.application.ninja.currentDocument.model.domContainer) && (elt.nodeName === 'CANVAS'));
 			if ((depth > 0) || snapToStage)	// don't snap to the root unles we are working inside a canvas
 			{
 				// if the element is in the 2D cache snapping is done there
-- 
cgit v1.2.3


From 5b5e059a8dabc02d78fcde1bf271c2e49af6334a Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Thu, 14 Jun 2012 10:25:28 -0700
Subject: IKNinja-1710 - Boundary box is drawn offset when switching between
 docs. This issue is related to move object to negative space.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/helper-classes/3D/draw-utils.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'js/helper-classes')

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index bef1e435..6a84c86b 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -117,7 +117,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 	},
 
     initializeFromDocument:{
-        value:function(){
+        value:function(adjustScrollOffsets){
             var i,
                 documentRootChildren = this.application.ninja.currentDocument.model.views.design.getLiveNodeList(true),
                 stage = this.application.ninja.stage,
@@ -144,13 +144,15 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                 for(i=0; i<len; i++) {
                     elt = documentRootChildren[i];
                     plane = this.addElement(elt);
-                    l = plane._rect.m_left - docLeft;
-                    t = plane._rect.m_top - docTop;
-                    if(l < minLeft) {
-                        minLeft = l;
-                    }
-                    if(t < minTop) {
-                        minTop = t;
+                    if(adjustScrollOffsets) {
+                        l = plane._rect.m_left - docLeft;
+                        t = plane._rect.m_top - docTop;
+                        if(l < minLeft) {
+                            minLeft = l;
+                        }
+                        if(t < minTop) {
+                            minTop = t;
+                        }
                     }
                 }
                 if(minLeft !== initL) {
-- 
cgit v1.2.3