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

diff --git a/js/models/materials-model.js b/js/models/materials-model.js
index 244db3c5..833eb08f 100755
--- a/js/models/materials-model.js
+++ b/js/models/materials-model.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
@@ -69,37 +70,37 @@ exports.MaterialsModel = Montage.create(Component, {
         value: false
     },
 
-        deserializedFromTemplate: {
-                value: function() {
-                        // Load all the materials
-                        this.addMaterial(new FlatMaterial());
-                        this.addMaterial(new BumpMetalMaterial());
-                        //this.addMaterial(new CloudMaterial());
-                        this.addMaterial(new DeformMaterial());
-                        this.addMaterial(new FlagMaterial());
-                        this.addMaterial(new FlyMaterial());
-                        this.addMaterial(new JuliaMaterial());
-                        this.addMaterial(new KeleidoscopeMaterial());
-                        this.addMaterial(new LinearGradientMaterial());
-                        this.addMaterial(new MandelMaterial());
-                        this.addMaterial(new ParisMaterial());
-                        this.addMaterial(new PlasmaMaterial());
-                        this.addMaterial(new PulseMaterial());
-                        this.addMaterial(new RadialBlurMaterial());
-                        this.addMaterial(new RadialGradientMaterial());
-                        this.addMaterial(new RaidersMaterial());
-                        this.addMaterial(new ReliefTunnelMaterial());
-                        this.addMaterial(new SquareTunnelMaterial());
-                        this.addMaterial(new StarMaterial());
-                        this.addMaterial(new TaperMaterial());
-                        this.addMaterial(new TunnelMaterial());
-                        this.addMaterial(new TwistMaterial());
-                        this.addMaterial(new TwistVertMaterial());
-                        this.addMaterial(new UberMaterial());
-                        this.addMaterial(new WaterMaterial());
-                        this.addMaterial(new ZInvertMaterial());
-                }
-        },
+    deserializedFromTemplate: {
+        value: function() {
+            // Load all the materials
+            this.addMaterial(new FlatMaterial());
+            this.addMaterial(new BumpMetalMaterial());
+            //this.addMaterial(new CloudMaterial());
+            this.addMaterial(new DeformMaterial());
+            this.addMaterial(new FlagMaterial());
+            this.addMaterial(new FlyMaterial());
+            this.addMaterial(new JuliaMaterial());
+            this.addMaterial(new KeleidoscopeMaterial());
+            this.addMaterial(new LinearGradientMaterial());
+            this.addMaterial(new MandelMaterial());
+            this.addMaterial(new ParisMaterial());
+            this.addMaterial(new PlasmaMaterial());
+            this.addMaterial(new PulseMaterial());
+            this.addMaterial(new RadialBlurMaterial());
+            this.addMaterial(new RadialGradientMaterial());
+            this.addMaterial(new RaidersMaterial());
+            this.addMaterial(new ReliefTunnelMaterial());
+            this.addMaterial(new SquareTunnelMaterial());
+            this.addMaterial(new StarMaterial());
+            this.addMaterial(new TaperMaterial());
+            this.addMaterial(new TunnelMaterial());
+            this.addMaterial(new TwistMaterial());
+            this.addMaterial(new TwistVertMaterial());
+            this.addMaterial(new UberMaterial());
+            this.addMaterial(new WaterMaterial());
+            this.addMaterial(new ZInvertMaterial());
+        }
+    },
 
     _materials : {
         value: AppModel.materials
@@ -110,7 +111,7 @@ exports.MaterialsModel = Montage.create(Component, {
             return this._materials;
         }
     },
-    
+
     addMaterial: {
         value: function (material) {
             this._materials.push(material);
@@ -152,16 +153,16 @@ exports.MaterialsModel = Montage.create(Component, {
             }
         }
     },
-        
-        getMaterialByShader: 
-        {
-                value: function( shaderName )
-                {
-                        var index = this.getIndexOfMaterialByShader( shaderName );
-                        if (index >= 0)
-                                return this._materials[index];
-                }
-        },              
+
+    getMaterialByShader:
+    {
+        value: function( shaderName )
+        {
+            var index = this.getIndexOfMaterialByShader( shaderName );
+            if (index >= 0)
+                return this._materials[index];
+        }
+    },
 
     getIndexOfMaterialByShader: {
         value: function (shaderName) {
@@ -191,11 +192,11 @@ exports.MaterialsModel = Montage.create(Component, {
         }
     },
 
-        clearAllMaterials: {
-                value: function() {
-                        this._materials = [];
-                }
-        },
+    clearAllMaterials: {
+        value: function() {
+            this._materials = [];
+        }
+    },
 
     exportFlatMaterial: {
         value: function() {
@@ -203,108 +204,108 @@ exports.MaterialsModel = Montage.create(Component, {
         }
     },
 
-        getDefaultMaterialName: {
-                value: function() {
-                        return "Flat";
-                }
-        },
+    getDefaultMaterialName: {
+        value: function() {
+            return "Flat";
+        }
+    },
 
-        exportMaterials: {
-                value: function()
+    exportMaterials: {
+        value: function()
         {
             var matArray = [];
-                        var nMats = this._materials.length;
-                        for (var i=0;  i<nMats;  i++) {
-                                var material = this._materials[i];
-                                var matObj = material.exportJSON();
+            var nMats = this._materials.length;
+            for (var i=0;  i<nMats;  i++) {
+                var material = this._materials[i];
+                var matObj = material.exportJSON();
                 matArray.push( matObj );
-                        }
+            }
 
-                var jObj = 
-                {
+            var jObj =
+            {
                 'materialLibrary':  1.0,
                 'materials':        matArray
             };
 
-            // prepend an identifiable string to aid parsing when the 
+            // prepend an identifiable string to aid parsing when the
             // material model is loaded.
             var jStr = "materialLibrary;" + JSON.stringify( jObj );
 
-                        return jStr;
-                }
-        },
-
-        createMaterialByShaderName:
-        {
-                value: function(shaderName)
-                {
-                        var mat;
-                        switch (shaderName)
-                        {
-                                case "flat":                            mat = new FlatMaterial();                               break;
-                                case "linearGradient":          mat = new LinearGradientMaterial();             break;
-                                case "radialGradient":          mat = new RadialGradientMaterial();             break;
+            return jStr;
+        }
+    },
+
+    createMaterialByShaderName:
+    {
+        value: function(shaderName)
+        {
+            var mat;
+            switch (shaderName)
+            {
+                case "flat":                mat = new FlatMaterial();               break;
+                case "linearGradient":      mat = new LinearGradientMaterial();     break;
+                case "radialGradient":      mat = new RadialGradientMaterial();     break;