e52ece9 · elk · git.iko.soy

git.iko.soy/elk

Get rid of `Graphics` module prefix.

commite52ece9b731cc22557846d03f78a843b7941dc0b authorevancz <info@elm-lang.org> dateMon 22 Oct 2012, 00:17 (14 years ago) parentcb12567

11 files changed+21−38

compare with master

unifiedsplit

core-js/Automaton.js+2−7 core-js/Dict.js+2−6 core-js/Graphics/Collage.js+3−3 core-js/Graphics/Color.js+1−2 core-js/Graphics/Element.js+1−2 core-js/Graphics/Render.js+2−2 core-js/Prelude.js+3−3 core-js/Set.js+2−6 core-js/Signal/Input.js+1−1 core-js/Text.js+3−5 core-js/cat.bat+1−1

core-js/Automaton.js+2−7

@@ -1,10 +1,7 @@

1−

2−try{

1+(function() {

43for(var i in Elm) { this[i] = Elm[i]; }

5−if (Elm.Automaton) throw "Module name collision, 'Automaton' is already defined.";

64Elm.Automaton=function(){

7− try{if (!(Elm.Prelude instanceof Object)) throw 'module not found'; } catch(e) {throw "Module 'Prelude' is missing. Compile with --make flag or load missing module in a separate JavaScript file.";}

85 var hiddenVars=[];

96 for(var i in Elm.Prelude){

107 if (hiddenVars.indexOf(i) >= 0) continue;

@@ -184,6 +181,4 @@ Elm.Automaton=function(){

184181 function draggable_14(form_93){

185182 return init__7(["Tuple2",Listen_9,form_93])(stepDrag_13);};

186183 return {Automaton:Automaton_0,run:run_1,step:step_2,composeAuto:composeAuto_3,combine:combine_4,pure:pure_5,init:init_6,init_:init__7,count:count_8,Listen:Listen_9,Ignore:Ignore_10,DragFrom:DragFrom_11,vecSub:vecSub_12,stepDrag:stepDrag_13,draggable:draggable_14};}();

187−Elm.main=function(){

188− return Elm.Automaton.main;};

189−} catch (e) {Elm.main=function() {var msg = ('<br/><h2>Your browser may not be supported. Are you using a modern browser?</h2>' + '<br/><span style="color:grey">Runtime Error in Automaton module:<br/>' + e + '</span>');document.body.innerHTML = Text.monospace(msg);throw e;};}

184+}());

core-js/Dict.js+2−6

@@ -1,15 +1,13 @@

2−try{

2+(function() {

44for(var i in Elm) { this[i] = Elm[i]; }

55if (Elm.Dict) throw "Module name collision, 'Dict' is already defined.";

66Elm.Dict=function(){

87 var hiddenVars=[];

98 for(var i in Elm.Prelude){

109 if (hiddenVars.indexOf(i) >= 0) continue;

1110 this[i]=Elm.Prelude[i];}

12− try{if (!(Elm.Maybe instanceof Object)) throw 'module not found'; } catch(e) {throw "Module 'Maybe' is missing. Compile with --make flag or load missing module in a separate JavaScript file.";}

1311 var isJust=Elm.Maybe.isJust;

1412 var Red_0=["Red"];

1513 var Black_1=["Black"];

@@ -478,6 +476,4 @@ Elm.Dict=function(){

478476 function fromList_42(assocs_235){

479477 return List.foldl(uncurry(insert_20))(empty_4)(assocs_235);};

480478 return {empty:empty_4,lookup:lookup_7,findWithDefault:findWithDefault_8,member:member_10,insert:insert_20,singleton:singleton_21,remove:remove_32,map:map_33,foldl:foldl_34,foldr:foldr_35,union:union_36,intersect:intersect_37,diff:diff_38,keys:keys_39,values:values_40,toList:toList_41,fromList:fromList_42};}();

481−Elm.main=function(){

482− return Elm.Dict.main;};

483−} catch (e) {Elm.main=function() {var msg = ('<br/><h2>Your browser may not be supported. Are you using a modern browser?</h2>' + '<br/><span style="color:grey">Runtime Error in Dict module:<br/>' + e + '</span>');document.body.innerHTML = Text.monospace(msg);throw e;};}

479+}());

core-js/Graphics/Collage.js+3−3

@@ -12,13 +12,13 @@ function tracePoints(ctx,points) {

1212

1313function solid(ctx,color,points) {

1414 tracePoints(ctx,points);

15− ctx.strokeStyle = Elm.Graphics.Color.extract(color);

15+ ctx.strokeStyle = Elm.Color.extract(color);

1616 ctx.stroke();

1717};

1818

1919function filled(ctx,color,points) {

2020 tracePoints(ctx,points);

21− ctx.fillStyle = Elm.Graphics.Color.extract(color);

21+ ctx.fillStyle = Elm.Color.extract(color);

2222 ctx.fill();

2323}

2424

@@ -35,7 +35,7 @@ function textured(redo,ctx,src,points) {

3535function customLine(pattern,ctx,color,points) {

3636 if (pattern.length === 0) { pattern = [8,4]; }

3737 customLineHelp(ctx, pattern, points);

38− ctx.strokeStyle = Elm.Graphics.Color.extract(color);

38+ ctx.strokeStyle = Elm.Color.extract(color);

3939 ctx.stroke();

4040};

4141

core-js/Graphics/Color.js+1−2

@@ -1,6 +1,5 @@

11var Elm = Elm || {};

2−Elm.Graphics = Elm.Graphics || {};

3−Elm.Graphics.Color = function() {

2+Elm.Color = function() {

43 function Color_0(a1) {

54 return function(a2) {

65 return function(a3) {

core-js/Graphics/Element.js+1−2

@@ -1,6 +1,5 @@

11var Elm = Elm || {};

2−Elm.Graphics = Elm.Graphics || {};

3−Elm.Graphics.Element = function() {

2+Elm.Graphics = function() {

43 var JS = Elm.JavaScript;

54 var DLeft_0 = ["DLeft"];

65 var DRight_1 = ["DRight"];

core-js/Graphics/Render.js+2−2

@@ -177,7 +177,7 @@ function render(elem) {

177177 e.style.height = (~~elem[4]) + 'px';

178178 if (elem[5] !== 1) { e.style.opacity = elem[5]; }

179179 if (elem[6][0] === "Just") {

180− e.style.backgroundColor = Elm.Graphics.Color.extract(elem[6][1]);

180+ e.style.backgroundColor = Elm.Color.extract(elem[6][1]);

181181 }

182182 if (elem[7][0] === "Just") {

183183 var a = newElement('a');

@@ -263,7 +263,7 @@ function update(node,curr,next) {

263263 if (next[4] !== curr[4]) node.style.height = (~~next[4]) + 'px';

264264 if (next[5] !== curr[5]) node.style.opacity = next[5];

265265 if (next[6].length === 2) {

266− var clr = Elm.Graphics.Color.extract(next[6][1]);

266+ var clr = Elm.Color.extract(next[6][1]);

267267 if (clr !== node.style.backgroundColor) node.style.backgroundColor = clr;

268268 }

269269 if (next[7].length === 2) {

core-js/Prelude.js+3−3

@@ -163,9 +163,9 @@ Elm.Prelude = function() {

163163 Elm.Prelude[i] = library[i];

164164 }

165165 };

166− include (Elm.Graphics.Color);

167− include (Elm.Graphics.Text);

168− include (Elm.Graphics.Element);

166+ include (Elm.Color);

167+ include (Elm.Text);

168+ include (Elm.Graphics);

169169

170170 show = Value.show;

171171

core-js/Set.js+2−6

@@ -1,10 +1,8 @@

2−try{

2+(function() {

44for(var i in Elm) { this[i] = Elm[i]; }

5−if (Elm.Set) throw "Module name collision, 'Set' is already defined.";

65Elm.Set=function(){

86 var hiddenVars=[];

97 for(var i in Elm.Prelude){

108 if (hiddenVars.indexOf(i) >= 0) continue;

@@ -38,6 +36,4 @@ Elm.Set=function(){

3836 return function(x){

3937 return fromList_9(List.map(f_25)(x));}(toList_8(t_26));};};

4038 return {empty:empty_0,singleton:singleton_1,insert:insert_2,remove:remove_3,member:member_4,union:union_5,intersect:intersect_6,diff:diff_7,toList:toList_8,fromList:fromList_9,foldl:foldl_10,foldr:foldr_11,map:map_12};}();

41−Elm.main=function(){

42− return Elm.Set.main;};

43−} catch (e) {Elm.main=function() {var msg = ('<br/><h2>Your browser may not be supported. Are you using a modern browser?</h2>' + '<br/><span style="color:grey">Runtime Error in Set module:<br/>' + e + '</span>');document.body.innerHTML = Text.monospace(msg);throw e;};}

39+}());

core-js/Signal/Input.js+1−1

@@ -50,7 +50,7 @@ Elm.Input = function() {

5050 var opts = [];

5151 while (options[0] === "Cons") {

5252 var opt = newElement('option');

53− var str = Text.toText(options[1][1]);

53+ var str = Value.toText(options[1][1]);

5454 opt.value = str;

5555 opt.innerHTML = str;

5656 slct.appendChild(opt);

core-js/Text.js+3−5

@@ -1,5 +1,6 @@

2−var Text = function() {

2+var Elm = Elm || {};

3+Elm.Text = function() {

34 function fromString(s) { return Value.toText(s); }

56 var addTag = function(tag) { return function(text) {

@@ -23,7 +24,7 @@ var Text = function() {

2324 var italic = addStyle('font-style', 'italic');

2425 var bold = addTag('b');

2526 var color = function(c) {

26− return addStyle('color', Elm.Graphics.Color.extract(c));

27+ return addStyle('color', Elm.Color.extract(c));

2728 };

2829 var underline = addStyle('text-decoration', 'underline');

2930 var overline = addStyle('text-decoration', 'overline');

@@ -47,6 +48,3 @@ var Text = function() {

4748 color : color,

4849 link : link };

4950}();

50−

51−var Elm = Elm || {};

52−Elm.Graphics.Text = Text;

core-js/cat.bat+1−1

@@ -1,4 +1,4 @@

1−copy /B Guid.js+foreign\JavaScript.js+foreign\JSON.js+Value.js+List.js+Dict.js+Set.js+Char.js+Maybe.js+String.js+Graphics\Color.js+Graphics\Collage.js+Graphics\Element.js+Text.js+Graphics\Render.js+runtime\Signal.js+runtime\Dispatcher.js+Signal\HTTP.js+Signal\Input.js+Signal\Keyboard.js+Signal\Mouse.js+Signal\Random.js+Signal\Time.js+Signal\Window.js+Prelude.js+Automaton.js ..\elm-mini.js

1+copy /B Guid.js+foreign\JavaScript.js+foreign\JSON.js+Value.js+List.js+Maybe.js+Dict.js+Set.js+Char.js+String.js+Graphics\Color.js+Graphics\Collage.js+Graphics\Element.js+Text.js+Graphics\Render.js+runtime\Signal.js+runtime\Dispatcher.js+Signal\HTTP.js+Signal\Input.js+Signal\Keyboard.js+Signal\Mouse.js+Signal\Random.js+Signal\Time.js+Signal\Window.js+Prelude.js+Automaton.js ..\elm-mini.js

33cd ..\elm