0ec0314 · elk · git.iko.soy

git.iko.soy/elk

Merge pull request #317 from Sheeo/dev-patch

[Cosmetic] Whitespace/indentation fixes in JS runtime

commit0ec031440adcdc0bfe1e01896348ae68166f87c2 authorEvan Czaplicki <info@elm-lang.org> dateThu 31 Oct 2013, 07:31 (13 years ago) parent65509d7 d57762e

4 files changed+55−58

compare with master

unifiedsplit

runtime/Init.js+3−3 runtime/Render/Collage.js+8−8 runtime/Render/Element.js+1−1 runtime/Render/Utils.js+43−46

runtime/Init.js+3−3

@@ -152,11 +152,11 @@ function initGraphics(elm, Module) {

152152 signalGraph = Signal.constant(signalGraph);

153153 }

154154 var currentScene = signalGraph.value;

155−

155+

156156 // Add the currentScene to the DOM

157157 var Render = ElmRuntime.use(ElmRuntime.Render.Element);

158158 elm.node.appendChild(Render.render(currentScene));

159−

159+

160160 // set up updates so that the DOM is adjusted as necessary.

161161 function domUpdate(newScene, currentScene) {

162162 ElmRuntime.draw(function(_) {

@@ -174,4 +174,4 @@ function initGraphics(elm, Module) {

174174 return renderer;

175175}

176176

177−}());

177+}());

runtime/Render/Collage.js+8−8

@@ -144,13 +144,13 @@ function renderForm(redo, ctx, form) {

144144 case 'FPath' : drawLine(ctx, f._0, f._1); break;

145145 case 'FImage': drawImage(redo, ctx, f); break;

146146 case 'FShape':

147− if (f._0.ctor === 'Left') {

148− f._1.closed = true;

149− drawLine(ctx, f._0._0, f._1);

150− } else {

151− drawShape(redo, ctx, f._0._0, f._1);

152− }

153− break;

147+ if (f._0.ctor === 'Left') {

148+ f._1.closed = true;

149+ drawLine(ctx, f._0._0, f._1);

150+ } else {

151+ drawShape(redo, ctx, f._0._0, f._1);

152+ }

153+ break;

154154 }

155155 ctx.restore();

156156}

@@ -297,7 +297,7 @@ function updateTracker(w,h,div) {

297297 container.style.overflow = 'hidden';

298298 container.style.position = 'absolute';

299299 addTransform(container.style, 'scaleY(-1)');

300−

300+

301301 var kid = kids[i];

302302 kid ? div.insertBefore(container, kid)

303303 : div.appendChild(container);

runtime/Render/Element.js+1−1

@@ -314,4 +314,4 @@ function updateProps(node, curr, next) {

314314

315315return { render:render, update:update };

316316

317−};

317+};

runtime/Render/Utils.js+43−46

@@ -1,48 +1,45 @@

1−

21ElmRuntime.Render.Utils = function() {

3−

4−function newElement(elementType) {

5− var e = document.createElement(elementType);

6− e.style.padding = "0";

7− e.style.margin = "0";

8− return e;

9−}

10−

11−function addTo(container, elem) {

12− container.appendChild(elem);

13−}

14−

15−function extract(c) {

16− if (c._3 === 1) { return 'rgb(' + c._0 + ', ' + c._1 + ', ' + c._2 + ')'; }

17− return 'rgba(' + c._0 + ', ' + c._1 + ', ' + c._2 + ', ' + c._3 + ')';

18−}

19−

20−function addTransform(style, trans) {

21− style.transform = trans;

22− style.msTransform = trans;

23− style.MozTransform = trans;

24− style.webkitTransform = trans;

25− style.OTransform = trans;

26−}

27−

28−function removeTransform(style) {

29− style.transform = 'none';

30− style.msTransform = 'none';

31− style.MozTransform = 'none';

32− style.webkitTransform = 'none';

33− style.OTransform = 'none';

34−}

35−

36−var List = Elm.Native.List.make({});

37−

38−return {addTo:addTo,

39− newElement:newElement,

40− extract : extract,

41− fromList: List.toArray,

42− fromString: function(s) { return s; },

43− toString: function(s) { return s; },

44− eq: Elm.Native.Utils.make({}).eq,

45− addTransform: addTransform,

46− removeTransform: removeTransform

47− };

2+ function newElement(elementType) {

3+ var e = document.createElement(elementType);

4+ e.style.padding = "0";

5+ e.style.margin = "0";

6+ return e;

7+ }

9+ function addTo(container, elem) {

10+ container.appendChild(elem);

11+ }

12+

13+ function extract(c) {

14+ if (c._3 === 1) { return 'rgb(' + c._0 + ', ' + c._1 + ', ' + c._2 + ')'; }

15+ return 'rgba(' + c._0 + ', ' + c._1 + ', ' + c._2 + ', ' + c._3 + ')';

16+ }

17+

18+ function addTransform(style, trans) {

19+ style.transform = trans;

20+ style.msTransform = trans;

21+ style.MozTransform = trans;

22+ style.webkitTransform = trans;

23+ style.OTransform = trans;

24+ }

25+

26+ function removeTransform(style) {

27+ style.transform = 'none';

28+ style.msTransform = 'none';

29+ style.MozTransform = 'none';

30+ style.webkitTransform = 'none';

31+ style.OTransform = 'none';

32+ }

33+

34+ var List = Elm.Native.List.make({});

35+

36+ return {addTo:addTo,

37+ newElement:newElement,

38+ extract : extract,

39+ fromList: List.toArray,

40+ fromString: function(s) { return s; },

41+ toString: function(s) { return s; },

42+ eq: Elm.Native.Utils.make({}).eq,

43+ addTransform: addTransform,

44+ removeTransform: removeTransform};

4845};