aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'js/controllers')
-rwxr-xr-xjs/controllers/elements/shapes-controller.js15
1 files changed, 6 insertions, 9 deletions
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index a0d3c0d6..df6edeb0 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -882,15 +882,12 @@ exports.ShapesController = Montage.create(CanvasController, {
882 value: function(m) 882 value: function(m)
883 { 883 {
884 var css, 884 var css,
885 colorObj; 885 colorObj,
886 if(m === "Linear Gradient") 886 material;
887 { 887
888 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)))"; 888 material = MaterialsModel.getMaterial(m);
889 } 889
890 else if(m === "Radial Gradient") 890 css = material.getGradientData();
891 {
892 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%)";
893 }
894 891
895 if(css) 892 if(css)
896 { 893 {