From 167298290bff45774143d605d17cb423c6397016 Mon Sep 17 00:00:00 2001 From: Tobias Hermann Date: Thu, 31 Oct 2013 14:25:22 +0100 Subject: [PATCH 1/5] type annotation of String.isEmpty: "isEmpty : String" => isEmpty : String -> Bool --- libraries/String.elm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/String.elm b/libraries/String.elm index 8c0ef71..6f58843 100644 --- a/libraries/String.elm +++ b/libraries/String.elm @@ -32,7 +32,7 @@ import Native.String import Maybe (Maybe) {-| Check if a string is empty `(isEmpty "" == True)` -} -isEmpty : String +isEmpty : String -> Bool isEmpty = Native.String.isEmpty {-| Add a character to the beginning of a string -} @@ -308,4 +308,4 @@ something. fromList ['a','b','c'] == "abc" -} fromList : String -> [Char] -fromList = Native.String.fromList \ No newline at end of file +fromList = Native.String.fromList From db7e3f618fb90859efc99b050d0c1ff544c2202d Mon Sep 17 00:00:00 2001 From: Michael Sondergaard Date: Thu, 31 Oct 2013 14:47:31 +0100 Subject: [PATCH 2/5] Fix whitespace in Init.js --- runtime/Init.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/Init.js b/runtime/Init.js index 104d31a..277a253 100644 --- a/runtime/Init.js +++ b/runtime/Init.js @@ -152,11 +152,11 @@ function initGraphics(elm, Module) { signalGraph = Signal.constant(signalGraph); } var currentScene = signalGraph.value; - + // Add the currentScene to the DOM var Render = ElmRuntime.use(ElmRuntime.Render.Element); elm.node.appendChild(Render.render(currentScene)); - + // set up updates so that the DOM is adjusted as necessary. function domUpdate(newScene, currentScene) { ElmRuntime.draw(function(_) { @@ -174,4 +174,4 @@ function initGraphics(elm, Module) { return renderer; } -}()); \ No newline at end of file +}()); From 3c5d415c771ef4325af57e6b078ada2399efa75e Mon Sep 17 00:00:00 2001 From: Michael Sondergaard Date: Thu, 31 Oct 2013 14:48:47 +0100 Subject: [PATCH 3/5] Fix whitespace and mixed indent in Collage.js --- runtime/Render/Collage.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/runtime/Render/Collage.js b/runtime/Render/Collage.js index 1037663..e0a840d 100644 --- a/runtime/Render/Collage.js +++ b/runtime/Render/Collage.js @@ -144,13 +144,13 @@ function renderForm(redo, ctx, form) { case 'FPath' : drawLine(ctx, f._0, f._1); break; case 'FImage': drawImage(redo, ctx, f); break; case 'FShape': - if (f._0.ctor === 'Left') { - f._1.closed = true; - drawLine(ctx, f._0._0, f._1); - } else { - drawShape(redo, ctx, f._0._0, f._1); - } - break; + if (f._0.ctor === 'Left') { + f._1.closed = true; + drawLine(ctx, f._0._0, f._1); + } else { + drawShape(redo, ctx, f._0._0, f._1); + } + break; } ctx.restore(); } @@ -297,7 +297,7 @@ function updateTracker(w,h,div) { container.style.overflow = 'hidden'; container.style.position = 'absolute'; addTransform(container.style, 'scaleY(-1)'); - + var kid = kids[i]; kid ? div.insertBefore(container, kid) : div.appendChild(container); From 9aa468e59a62eeb9290e6a993e4effc8fcbd6d91 Mon Sep 17 00:00:00 2001 From: Michael Sondergaard Date: Thu, 31 Oct 2013 14:50:21 +0100 Subject: [PATCH 4/5] Fix newline at EOF in Element.js --- runtime/Render/Element.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/Render/Element.js b/runtime/Render/Element.js index 528b3eb..5bb9a04 100644 --- a/runtime/Render/Element.js +++ b/runtime/Render/Element.js @@ -314,4 +314,4 @@ function updateProps(node, curr, next) { return { render:render, update:update }; -}; \ No newline at end of file +}; From d57762e3ce2014372fbaa14975ecc2fa4017cfb7 Mon Sep 17 00:00:00 2001 From: Michael Sondergaard Date: Thu, 31 Oct 2013 14:51:12 +0100 Subject: [PATCH 5/5] Fix mixed indent and whitespace in Utils.js --- runtime/Render/Utils.js | 77 ++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/runtime/Render/Utils.js b/runtime/Render/Utils.js index 26a7814..e80ff10 100644 --- a/runtime/Render/Utils.js +++ b/runtime/Render/Utils.js @@ -1,48 +1,45 @@ - ElmRuntime.Render.Utils = function() { + function newElement(elementType) { + var e = document.createElement(elementType); + e.style.padding = "0"; + e.style.margin = "0"; + return e; + } -function newElement(elementType) { - var e = document.createElement(elementType); - e.style.padding = "0"; - e.style.margin = "0"; - return e; -} + function addTo(container, elem) { + container.appendChild(elem); + } -function addTo(container, elem) { - container.appendChild(elem); -} + function extract(c) { + if (c._3 === 1) { return 'rgb(' + c._0 + ', ' + c._1 + ', ' + c._2 + ')'; } + return 'rgba(' + c._0 + ', ' + c._1 + ', ' + c._2 + ', ' + c._3 + ')'; + } -function extract(c) { - if (c._3 === 1) { return 'rgb(' + c._0 + ', ' + c._1 + ', ' + c._2 + ')'; } - return 'rgba(' + c._0 + ', ' + c._1 + ', ' + c._2 + ', ' + c._3 + ')'; -} + function addTransform(style, trans) { + style.transform = trans; + style.msTransform = trans; + style.MozTransform = trans; + style.webkitTransform = trans; + style.OTransform = trans; + } -function addTransform(style, trans) { - style.transform = trans; - style.msTransform = trans; - style.MozTransform = trans; - style.webkitTransform = trans; - style.OTransform = trans; -} + function removeTransform(style) { + style.transform = 'none'; + style.msTransform = 'none'; + style.MozTransform = 'none'; + style.webkitTransform = 'none'; + style.OTransform = 'none'; + } -function removeTransform(style) { - style.transform = 'none'; - style.msTransform = 'none'; - style.MozTransform = 'none'; - style.webkitTransform = 'none'; - style.OTransform = 'none'; -} + var List = Elm.Native.List.make({}); -var List = Elm.Native.List.make({}); - -return {addTo:addTo, - newElement:newElement, - extract : extract, - fromList: List.toArray, - fromString: function(s) { return s; }, - toString: function(s) { return s; }, - eq: Elm.Native.Utils.make({}).eq, - addTransform: addTransform, - removeTransform: removeTransform - }; + return {addTo:addTo, + newElement:newElement, + extract : extract, + fromList: List.toArray, + fromString: function(s) { return s; }, + toString: function(s) { return s; }, + eq: Elm.Native.Utils.make({}).eq, + addTransform: addTransform, + removeTransform: removeTransform}; };