3 files changed, 24 insertions, 27 deletions

diff --git a/js/controllers/elements/controller-factory.js b/js/controllers/elements/controller-factory.js
index 2bf3eae0..eb8e977c 100755
--- a/js/controllers/elements/controller-factory.js
+++ b/js/controllers/elements/controller-factory.js
@@ -33,7 +33,7 @@ var Montage         = require("montage/core/core").Montage;
 var BodyController = require("js/controllers/elements/body-controller").BodyController,
     BlockController = require("js/controllers/elements/block-controller").BlockController,
     ShapesController = require("js/controllers/elements/shapes-controller").ShapesController,
-        ImageController = require("js/controllers/elements/image-controller").ImageController,
+    ImageController = require("js/controllers/elements/image-controller").ImageController,
     VideoController = require("js/controllers/elements/video-controller").VideoController,
     ComponentController = require("js/controllers/elements/component-controller").ComponentController,
     CanvasController = require("js/controllers/elements/canvas-controller").CanvasController;
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index 39efcf0c..59ac238c 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -36,22 +36,22 @@ exports.ElementController = Montage.create(Component, {
 
     addElement: {
         value: function(el, styles) {
-        
-                if (el.getAttribute) el.setAttribute('data-ninja-node', 'true');
-                
-                // Updated to use new methods in TimelinePanel. JR.
-                var insertionIndex = this.application.ninja.timeline.getInsertionIndex();
-                if (insertionIndex === false) {
-                        this.application.ninja.currentDocument.model.domContainer.appendChild(el);
-                } else {
-                        if (insertionIndex === 0) {
-                                this.application.ninja.currentDocument.model.domContainer.appendChild(el);
-                        } else {
+
+            if (el.getAttribute) el.setAttribute('data-ninja-node', 'true');
+
+            // Updated to use new methods in TimelinePanel. JR.
+            var insertionIndex = this.application.ninja.timeline.getInsertionIndex();
+            if (insertionIndex === false) {
+                this.application.ninja.currentDocument.model.domContainer.appendChild(el);
+            } else {
+                if (insertionIndex === 0) {
+                    this.application.ninja.currentDocument.model.domContainer.appendChild(el);
+                } else {
                     var element = this.application.ninja.timeline.arrLayers[insertionIndex].layerData.stageElement;
                     element.parentNode.insertBefore(el, element.nextSibling);
-                        }
-                }
-                
+                }
+            }
+
             if(styles) {
                 this.application.ninja.stylesController.setElementStyles(el, styles);
             }
@@ -67,7 +67,7 @@ exports.ElementController = Montage.create(Component, {
             el.parentNode.removeChild(el);
         }
     },
-    
+
     getProperty: {
         value: function(el, prop, fallbackOnComputed, isStageElement) {
             if(el.nodeType !== 3){
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index a0d3c0d6..f3ea5c2b 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -28,7 +28,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 
-var Montage =                   require("montage/core/core").Montage,
+var Montage =           require("montage/core/core").Montage,
     CanvasController = require("js/controllers/elements/canvas-controller").CanvasController,
     njModule = require("js/lib/NJUtils"),
     World = require("js/lib/drawing/world").World,
@@ -300,7 +300,7 @@ exports.ShapesController = Montage.create(CanvasController, {
                         return null;
                     }
                     break;
-                
+
 
                 case "strokeMaterial":
                     var sm = el.elementModel.shapeModel.GLGeomObj.getStrokeMaterial();
@@ -882,15 +882,12 @@ exports.ShapesController = Montage.create(CanvasController, {
         value: function(m)
         {
             var css,
-                colorObj;
-            if(m === "Linear Gradient")
-            {
-                css = "-webkit-gradient(linear, left top, right top, from(rgb(255, 0, 0)), color-stop(0.3, rgb(0, 255, 0)), color-stop(0.6, rgb(0, 0, 255)), to(rgb(0, 255, 255)))";
-            }
-            else if(m === "Radial Gradient")
-            {
-                css = "-webkit-radial-gradient(50% 50%, ellipse cover, rgb(255, 0, 0) 0%, rgb(0, 255, 0) 30%, rgb(0, 0, 255) 60%, rgb(0, 255, 255) 100%)";
-            }
+                colorObj,
+                material;
+
+            material = MaterialsModel.getMaterial(m);
+
+            css = material.getGradientData();
 
             if(css)
             {