Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping

Conflicts:
	js/panels/presets/animations-presets.reel/animations-presets.js
	js/panels/presets/style-presets.reel/style-presets.js
	js/panels/presets/transitions-presets.reel/transitions-presets.js

1 files changed, 185 insertions, 253 deletions

diff --git a/js/lib/rdge/materials/radial-gradient-material.js b/js/lib/rdge/materials/radial-gradient-material.js
index 87e20ad4..dd40d31d 100755
--- a/js/lib/rdge/materials/radial-gradient-material.js
+++ b/js/lib/rdge/materials/radial-gradient-material.js
@@ -1,8 +1,8 @@
 /* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
 
 var MaterialParser = require("js/lib/rdge/materials/material-parser").MaterialParser;
 var Material = require("js/lib/rdge/materials/material").Material;
@@ -11,46 +11,46 @@ var RadialGradientMaterial = function RadialGradientMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-        this._name = "RadialGradientMaterial";
-        this._shaderName = "radialGradient";
-
-        this._color1            = [1,0,0,1];
-        this._color2            = [0,1,0,1];
-        this._color3            = [0,0,1,1];
-        this._color4            = [0,1,1,1];
-        this._colorStop1        = 0.0;
-        this._colorStop2        = 0.3;
-        this._colorStop3        = 0.6;
-        this._colorStop4        = 1.0;
-//      this._colorCount        = 4;
+    this._name = "RadialGradientMaterial";
+    this._shaderName = "radialGradient";
+
+    this._color1 = [1, 0, 0, 1];
+    this._color2 = [0, 1, 0, 1];
+    this._color3 = [0, 0, 1, 1];
+    this._color4 = [0, 1, 1, 1];
+    this._colorStop1 = 0.0;
+    this._colorStop2 = 0.3;
+    this._colorStop3 = 0.6;
+    this._colorStop4 = 1.0;
+    //  this._colorCount        = 4;
 
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
-        this.getName            = function()    {
+    this.getName = function () {
         return this._name;
     };
 
-        this.getShaderName      = function()    {
+    this.getShaderName = function () {
         return this._shaderName;
     };
 
-        this.getColor1  = function()            {
+    this.getColor1 = function () {
         return this._color1;
     };
 
-        this.setColor1  = function(c)           {
+    this.setColor1 = function (c) {
         this._color1 = c.slice();
         if (this._shader && this._shader['default']) {
             this._shader['default'].u_color1.set(c);
         }
     };
 
-        this.getColor2  = function()            {
+    this.getColor2 = function () {
         return this._color2;
     };
 
-        this.setColor2  = function(c)           {
+    this.setColor2 = function (c) {
         this._color2 = c.slice();
         if (this._shader && this._shader['default']) {
             this._shader['default'].u_color2.set(c);
@@ -58,84 +58,84 @@ var RadialGradientMaterial = function RadialGradientMaterial() {
 
     };
 
-        this.getColor3  = function()            {
+    this.getColor3 = function () {
         return this._color3;
     };
 
-        this.setColor3  = function(c)           {
+    this.setColor3 = function (c) {
         this._color3 = c.slice();
         if (this._shader && this._shader['default']) {
             this._shader['default'].u_color3.set(c);
         }
     };
 
-        this.getColor4  = function()            {
+    this.getColor4 = function () {
         return this._color4;
     };
 
-        this.setColor4  = function(c)           {
+    this.setColor4 = function (c) {
         this._color4 = c.slice();
         if (this._shader && this._shader['default']) {
             this._shader['default'].u_color4.set(c);
         }
     };
 
-        this.getColorStop1 = function()         {
+    this.getColorStop1 = function () {
         return this._colorStop1;
     };
 
-        this.setColorStop1 = function(s)        {
+    this.setColorStop1 = function (s) {
         this._colorStop1 = s;
         if (this._shader && this._shader['default']) {
             this._shader['default'].u_colorStop1.set([s]);
         }
     };
 
-        this.getColorStop2 = function()         {
+    this.getColorStop2 = function () {
         return this._colorStop2;
     };
 
-        this.setColorStop2 = function(s)        {
+    this.setColorStop2 = function (s) {
         this._colorStop2 = s;
         if (this._shader && this._shader['default']) {
             this._shader['default'].u_colorStop2.set([s]);
         }
     };
 
-        this.getColorStop3 = function()         {
+    this.getColorStop3 = function () {
         return this._colorStop3;
     };
 
-        this.setColorStop3 = function(s)        {
+    this.setColorStop3 = function (s) {
         this._colorStop3 = s;
         if (this._shader && this._shader['default']) {
             this._shader['default'].u_colorStop3.set([s]);
         }
     };
 
-        this.getColorStop4 = function()         {
+    this.getColorStop4 = function () {
         return this._colorStop4;
     };
 
-        this.setColorStop4 = function(s)        {
+    this.setColorStop4 = function (s) {
         this._colorStop4 = s;
         if (this._shader && this._shader['default']) {
             this._shader['default'].u_colorStop4.set([s]);
         }
     };
 
-        this.getColorCount      = function()    {
+    this.getColorCount = function () {
         return this._colorCount;
     };
 
-        this.setColorCount      = function(c)   {
+    this.setColorCount = function (c) {
         this._colorCount = c;
         if (this._shader && this._shader['default']) {