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, 142 insertions, 140 deletions

diff --git a/js/helper-classes/3D/math-utils.js b/js/helper-classes/3D/math-utils.js
index 8a9be4b5..977b9fe4 100755
--- a/js/helper-classes/3D/math-utils.js
+++ b/js/helper-classes/3D/math-utils.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
@@ -33,15 +34,15 @@ POSSIBILITY OF SUCH DAMAGE.
 //      Math Utility functions
 ///////////////////////////////////////////////////////////////////////
 var VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils,
-        ViewUtils = require("js/helper-classes/3D/view-utils").ViewUtils,
-        Rectangle = require("js/helper-classes/3D/rectangle").Rectangle;
+    ViewUtils = require("js/helper-classes/3D/view-utils").ViewUtils,
+    Rectangle = require("js/helper-classes/3D/rectangle").Rectangle;
 
 var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
 //    VecUtils: { value: null, writable: true },
-    
+
     EPSILON: { value: 1.e-5, writable: true },
 
     // these are used in containment tests
@@ -61,7 +62,7 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
     // Vector Methods
     ///////////////////////////////////////////////////////////////////////
 
-        vecIntersectPlaneForParam: {
+    vecIntersectPlaneForParam: {
         value: function( pt0, vec, plane )
         {
             // declare the variable to return - undefined when there is no solution
@@ -82,7 +83,7 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
         }
     },
 
-        vecMag3: {
+    vecMag3: {
         value: function( vec )
         {
             if (vec.length < 3)  return;
@@ -92,7 +93,7 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
         }
     },
 
-        vecMag: {
+    vecMag: {
         value: function( dimen, vec )
         {
             var sum = 0.0;
@@ -102,7 +103,7 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
         }
     },
 
-        vecSubtract: {
+    vecSubtract: {
         value: function( a, b )
         {
             var rtnVec;
@@ -119,7 +120,7 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
         }
     },
 
-        vecAdd: {
+    vecAdd: {
         value: function( a, b )
         {
             var rtnVec;
@@ -136,7 +137,7 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
         }
     },
 
-        vecDist: {
+    vecDist: {
         value: function( a, b )
         {
             var sum;
@@ -176,7 +177,7 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
         }
     },
 
-        getPointOnPlane: {
+    getPointOnPlane: {
         value: function( plane )
         {
             // abreviate the plane equation
@@ -203,7 +204,7 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
         }
     },
 
-        transformPlane: {
+    transformPlane: {
         value: function( plane,  mat )
         {
             // we will project a point down one of the coordinate axes to find a point on the plane
@@ -213,7 +214,7 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
             // find a point on the plane
             var ptOnPlane = this.getPointOnPlane(plane);
 
-            ptOnPlane[3] = 1.0; // 4 dimen so we can transform it
+            ptOnPlane[3] = 1.0; // 4 dimen so we can transform it
 
             // transform the point
             //ptOnPlane = mat.multiply( ptOnPlane );
@@ -225,12 +226,12 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
         }
     },
 
-        transformHomogeneousPoint: {
+    transformHomogeneousPoint: {
         value: function( srcPt, mat )
         {
             var pt = srcPt.slice(0);
             this.makeDimension4( pt );
-            var x = VecUtils.vecDot(4,  pt, [mat[0], mat[4], mat[ 8], mat[12]] ),
+            var x = VecUtils.vecDot(4,  pt, [mat[0], mat[4], mat[ 8], mat[12]] ),
                     y = VecUtils.vecDot(4,  pt, [mat[1], mat[5], mat[ 9], mat[13]] ),
                     z = VecUtils.vecDot(4,  pt, [mat[2], mat[6], mat[10], mat[14]] ),
                     w = VecUtils.vecDot(4,  pt, [mat[3], mat[7], mat[11], mat[15]] );
@@ -239,7 +240,7 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
         }
     },
 
-        applyHomogeneousCoordinate: {
+    applyHomogeneousCoordinate: {
         value: function( hPt )
         {
             var w = hPt[3];
@@ -252,19 +253,19 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
         }
     },
 
-        transformAndDivideHomogeneousPoint: {
+    transformAndDivideHomogeneousPoint: {
         value: function( pt, mat )
         {
             return this.applyHomogeneousCoordinate( this.transformHomogeneousPoint(pt, mat) );
         }
     },
 
-        transformPoint: {
+    transformPoint: {
         value: function( srcPt, mat )
         {
             var pt = srcPt.slice(0);
             this.makeDimension3( pt );
-            var x = VecUtils.vecDot(3,  pt, [mat[0], mat[4], mat[ 8]] ) + mat[12],
+            var x = VecUtils.vecDot(3,  pt, [mat[0], mat[4], mat[ 8]] ) + mat[12],
                     y = VecUtils.vecDot(3,  pt, [mat[1], mat[5], mat[ 9]] ) + mat[13],
                     z = VecUtils.vecDot(3,  pt, [mat[2], mat[6], mat[10]] ) + mat[14];
 
@@ -272,11 +273,11 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {