@@ -5,7 +5,7 @@ var Render = ElmRuntime.use(ElmRuntime.Render.Element);
5var Transform = Elm.Transform2D.make({});
5var Transform = Elm.Transform2D.make({});
6var Utils = ElmRuntime.use(ElmRuntime.Render.Utils);
6var Utils = ElmRuntime.use(ElmRuntime.Render.Utils);
7var newElement = Utils.newElement,
7var newElement = Utils.newElement,
8− extract = Utils.extract, fromList = Utils.fromList,
8+ colorToCss = Utils.colorToCss, fromList = Utils.fromList,
9 fromString = Utils.fromString, addTransform = Utils.addTransform;
9 fromString = Utils.fromString, addTransform = Utils.addTransform;
11function trace(ctx, path) {
11function trace(ctx, path) {
@@ -70,7 +70,7 @@ function drawLine(ctx, style, path) {
70 ctx.lineJoin = join === 'Smooth' ? 'round' :
70 ctx.lineJoin = join === 'Smooth' ? 'round' :
71 join === 'Sharp' ? 'miter' : 'bevel';
71 join === 'Sharp' ? 'miter' : 'bevel';
72 ctx.miterLimit = style.join._0 || 10;
72 ctx.miterLimit = style.join._0 || 10;
73− ctx.strokeStyle = extract(style.color);
73+ ctx.strokeStyle = colorToCss(style.color);
74 return line(ctx, style, path);
74 return line(ctx, style, path);
@@ -96,7 +96,7 @@ function gradient(ctx, grad) {
96 var len = stops.length;
96 var len = stops.length;
97 for (var i = 0; i < len; ++i) {
97 for (var i = 0; i < len; ++i) {
98 var stop = stops[i];
98 var stop = stops[i];
99− g.addColorStop(stop._0, extract(stop._1));
99+ g.addColorStop(stop._0, colorToCss(stop._1));
101 return g;
101 return g;
@@ -105,7 +105,7 @@ function drawShape(redo, ctx, style, path) {
105 trace(ctx, path);
105 trace(ctx, path);
106 var sty = style.ctor;
106 var sty = style.ctor;
107 ctx.fillStyle =
107 ctx.fillStyle =
108− sty === 'Solid' ? extract(style._0) :
108+ sty === 'Solid' ? colorToCss(style._0) :
109 sty === 'Texture' ? texture(redo, ctx, style._0) : gradient(ctx, style._0);
109 sty === 'Texture' ? texture(redo, ctx, style._0) : gradient(ctx, style._0);
110 ctx.scale(1,-1);
110 ctx.scale(1,-1);
111 ctx.fill();
111 ctx.fill();