Merge branch 'refs/heads/ToolFixes' into WebGLMaterials

Conflicts:
	js/document/templates/montage-html/default_html.css
	js/mediators/element-mediator.js
	js/panels/properties.reel/properties.js
	js/tools/BrushTool.js
	js/tools/LineTool.js
	js/tools/PenTool.js
	js/tools/SelectionTool.js
	js/tools/ShapeTool.js
	js/tools/TranslateObject3DTool.js

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 14 insertions, 22 deletions

diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index aec5b6a3..94cc6b83 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -60,6 +60,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
             else
             {
                 this._canSnap = true;
+                this._updateTargets();
             }
 
             this.isDrawing = true;
@@ -223,7 +224,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
     HandleDoubleClick: {
         value: function(event) {
             if(this.application.ninja.selectedElements.length > 0) {
-                this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0]._element;
+                this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0];
             } else {
                 this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.documentRoot;
             }
@@ -242,8 +243,8 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
                         case Keyboard.LEFT:
                             var newLeft = [];
                             var leftArr = this.application.ninja.selectedElements.map(function(item) {
-                                newLeft.push( (parseInt(ElementsMediator.getProperty(item._element, "left")) - inc) + "px"  );
-                                return ElementsMediator.getProperty(item._element, "left");
+                                newLeft.push( (parseInt(ElementsMediator.getProperty(item, "left")) - inc) + "px"  );
+                                return ElementsMediator.getProperty(item, "left");
                             });
 
                             ElementsMediator.setProperty(this.application.ninja.selectedElements, "left", newLeft , "Change", "selectionTool", leftArr);
@@ -251,8 +252,8 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
                         case Keyboard.UP:
                             var newTop = [];
                             var topArr = this.application.ninja.selectedElements.map(function(item) {
-                                newTop.push( (parseInt(ElementsMediator.getProperty(item._element, "top")) - inc) + "px"  );
-                                return ElementsMediator.getProperty(item._element, "top");
+                                newTop.push( (parseInt(ElementsMediator.getProperty(item, "top")) - inc) + "px"  );
+                                return ElementsMediator.getProperty(item, "top");
                             });
 
                             ElementsMediator.setProperty(this.application.ninja.selectedElements, "top", newTop , "Change", "selectionTool", topArr);
@@ -260,8 +261,8 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
                         case Keyboard.RIGHT:
                             var newLeft = [];
                             var leftArr = this.application.ninja.selectedElements.map(function(item) {
-                                newLeft.push( (parseInt(ElementsMediator.getProperty(item._element, "left")) + inc) + "px"  );
-                                return ElementsMediator.getProperty(item._element, "left");
+                                newLeft.push( (parseInt(ElementsMediator.getProperty(item, "left")) + inc) + "px"  );
+                                return ElementsMediator.getProperty(item, "left");
                             });
 
                             ElementsMediator.setProperty(this.application.ninja.selectedElements, "left", newLeft , "Change", "selectionTool", leftArr);
@@ -269,8 +270,8 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
                         case Keyboard.DOWN:
                             var newTop = [];
                             var topArr = this.application.ninja.selectedElements.map(function(item) {
-                                newTop.push( (parseInt(ElementsMediator.getProperty(item._element, "top")) + inc) + "px"  );
-                                return ElementsMediator.getProperty(item._element, "top");
+                                newTop.push( (parseInt(ElementsMediator.getProperty(item, "top")) + inc) + "px"  );
+                                return ElementsMediator.getProperty(item, "top");
                             });
 
                             ElementsMediator.setProperty(this.application.ninja.selectedElements, "top", newTop , "Change", "selectionTool", topArr);
@@ -308,16 +309,14 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
                 previousStyles = [];
             var len = this.application.ninja.selectedElements.length;
             this._targets = [];
-            for(var i = 0; i < len; i++)
-            {
-                var elt = this.application.ninja.selectedElements[i]._element;
+            for(var i = 0; i < len; i++) {
+                var elt = this.application.ninja.selectedElements[i];
 
                 var curMat = viewUtils.getMatrixFromElement(elt);
                 var curMatInv = glmat4.inverse(curMat, []);
 
                 this._targets.push({elt:elt, mat:curMat, matInv:curMatInv});
-                if(addToUndoStack)
-                {
+                if(addToUndoStack) {
                     var prevX,
                         prevY,
                         prevW,
@@ -330,8 +329,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
                         previousStyleStr,
                         newStyleStr;
 
-                    if(!this._use3DMode)
-                    {
+                    if(!this._use3DMode) {
                         prevX = this._undoArray[i]._x;
                         prevY = this._undoArray[i]._y;
                         prevW = this._undoArray[i]._w;
@@ -465,12 +463,6 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
                 }
                 else
                 {
-//                    curMat = item.mat.slice(0);
-//                    glmat4.multiply(curMat, qMat, curMat);
-//                    var previousMat = this._undoArray[i].mat.slice(0);
-//                    var _x = parseInt(ElementsMediator.getProperty(elt, "left")) + curMat[12] - previousMat[12];
-//                    var _y = parseInt(ElementsMediator.getProperty(elt, "top")) + curMat[13] - previousMat[13];
-
                     var _x = parseInt(ElementsMediator.getProperty(elt, "left")) + transMat[12];
                     var _y = parseInt(ElementsMediator.getProperty(elt, "top")) + transMat[13];