Merge branch 'refs/heads/ninja-internal-master' into codemirror-custom-theme-removal

Conflicts:
	js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css
	js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 410 insertions, 409 deletions

diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js
index 55baecc8..9b855e66 100755
--- a/js/tools/modifier-tool-base.js
+++ b/js/tools/modifier-tool-base.js
@@ -1,24 +1,25 @@
 /* <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
+Copyright (c) 2012, Motorola Mobility LLC.
 All Rights Reserved.
-BSD License.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
-  - Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-  - Neither the name of Motorola Mobility nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of Motorola Mobility LLC nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -45,43 +46,43 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
     //-------------------------------------------------------------------------
     // Snapping-specific properties
     _canSnap: { value: true },
-        _snapParam: { value: null },
-        _snapIndex: { value: -1 },
-        _useQuadPt: { value: false },
+    _snapParam: { value: null },
+    _snapIndex: { value: -1 },
+    _useQuadPt: { value: false },
     _shouldUseQuadPt: { value: false },
 
-        // we set snapping capabilities depending on the tool.
-        // The following variables are set in a tool's initializeSnapping method called on mouse down.
-        _snapToElements: { value: true },
-        _snapToGrid: { value: true },
+    // we set snapping capabilities depending on the tool.
+    // The following variables are set in a tool's initializeSnapping method called on mouse down.
+    _snapToElements: { value: true },
+    _snapToGrid: { value: true },
 
     _clickedObject : {value : null },
     clickedObject:
-        {
-                get: function () {
-                        return this._clickedObject;
-                },
-                set: function (value) {
-                        if(value === this.application.ninja.currentDocument.model.documentRoot)
-                        {
-                                this._clickedObject = this._target;
-                        }
-                        else
-                        {
-                                this._clickedObject = value;
-                        }
-
-                        if(value)
-                        {
-                                this._startMat = viewUtils.getMatrixFromElement(this._clickedObject);
-                        }
-                        else
-                        {
-                                this._startMat = null;
-                        }
-                }
-        },
-    
+    {
+        get: function () {
+            return this._clickedObject;
+        },
+        set: function (value) {
+            if(value === this.application.ninja.currentDocument.model.documentRoot)
+            {
+                this._clickedObject = this._target;
+            }
+            else
+            {
+                this._clickedObject = value;
+            }
+
+            if(value)
+            {
+                this._startMat = viewUtils.getMatrixFromElement(this._clickedObject);
+            }
+            else
+            {
+                this._startMat = null;
+            }
+        }
+    },
+
     _getObjectBeingTracked :
     {
         value: function(hitRec)
@@ -103,25 +104,25 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
             // override in subclasses
         }
     },
-    
+
     initializeSnapping:
     {
         value: function(event)
         {
             this._mouseDownHitRec = null;
-                        this._mouseUpHitRec   = null;
+            this._mouseUpHitRec   = null;
 
-                        snapManager.clearAvoidList();
-                        snapManager.clearDragPlane();
+            snapManager.clearAvoidList();
+            snapManager.clearDragPlane();
 
-                        // the translate tool does snap align to the bounds of the object only.
-                        // turn off snap align to the cursor.  This needs to be re-enabled in the mouse up method
-                        snapManager.enableSnapAlign( false );
+            // the translate tool does snap align to the bounds of the object only.
+            // turn off snap align to the cursor.  This needs to be re-enabled in the mouse up method
+            snapManager.enableSnapAlign( false );
 
-                        // snap to element and snap to grid are conditionally enabled based
-                        // on the snap results of the mouse down.  enable everything for the first snap
-                        this._snapToElements = snapManager.elementSnapEnabledAppLevel();
-                        this._snapToGrid = snapManager.gridSnapEnabledAppLevel();
+            // snap to element and snap to grid are conditionally enabled based
+            // on the snap results of the mouse down.  enable everything for the first snap
+            this._snapToElements = snapManager.elementSnapEnabledAppLevel();
+            this._snapToGrid = snapManager.gridSnapEnabledAppLevel();
 
             this._dragPlane = null;
             var do3DSnap = true;
@@ -132,8 +133,8 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
 //                {
 //                    this.doSelection(event);
 
-                    snapManager.enableElementSnap       ( true  );
-//                    snapManager.enableGridSnap                ( true  );
+                    snapManager.enableElementSnap   ( true  );
+//                    snapManager.enableGridSnap        ( true  );
 //                }
 //            }
 //            else
@@ -152,9 +153,9 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
             {
                 var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas,
                                                                 new WebKitPoint(event.pageX, event.pageY));
-                                // do the snap before setting up the avoid list to allow
-                                // a snap on the mouse down
-                                var hitRec = snapManager.snap(point.x, point.y, do3DSnap);
+                // do the snap before setting up the avoid list to allow
+                // a snap on the mouse down
+                var hitRec = snapManager.snap(point.x, point.y, do3DSnap);
 
                 // TODO - Check that hitRec's element matches element that browser says we clicked on
                 var elt = this.application.ninja.stage.getElement(event, true);
@@ -168,21 +169,21 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
                     snapManager.addToAvoidList(element);
                 });
 
-                                if (hitRec)
-                                {
-                                        // disable snap attributes
-                                        if (hitRec.getType() == hitRec.SNAP_TYPE_ELEMENT)
-                                        {
-                                                this._snapToElements = false;
-                                                this._snapToGrid = false;
-                                        }
-                                        else if (hitRec.getType() == hitRec.SNAP_TYPE_ELEMENT_CENTER)
-                                        {
-                                                snapManager.enableSnapAlign( snapManager.snapAlignEnabledAppLevel() );
-                                        }
-
-                                        // parameterize the snap point on the target
-                                        this._snapParam = this.parameterizeSnap( hitRec );
+                if (hitRec)
+                {
+                    // disable snap attributes
+                    if (hitRec.getType() == hitRec.SNAP_TYPE_ELEMENT)
+                    {
+                        this._snapToElements = false;
+                        this._snapToGrid = false;
+                    }
+                    else if (hitRec.getType() == hitRec.SNAP_TYPE_ELEMENT_CENTER)
+                    {
+                        snapManager.enableSnapAlign( snapManager.snapAlignEnabledAppLevel() );
+                    }
+
+                    // parameterize the snap point on the target
+                    this._snapParam = this.parameterizeSnap( hitRec );
 
                     if(!this._dragPlane)
                     {
@@ -201,20 +202,20 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
                     var sign = MathUtils.fpSign( vecUtils.vecDot(3,this._dragPlane,[0,0,1]) + this._dragPlane[3] - 1.0);
                     this._shouldUseQuadPt = (sign == 0)
 
-                                        var wpHitRec = hitRec.convertToWorkingPlane( this._dragPlane );
-                                        this._mouseDownHitRec = wpHitRec;
+                    var wpHitRec = hitRec.convertToWorkingPlane( this._dragPlane );
+                    this._mouseDownHitRec = wpHitRec;