git.iko.soy/elk
on master help sign in
Factor out a commonly used expression
b4e0196Evan Czaplicki
libraries/Native/Show.js+8−7
compare with master
unifiedsplit
@@ -14,16 +14,17 @@ Elm.Native.Show = function(elm) {
14 var Tuple2 = Elm.Native.Utils(elm).Tuple2;
14 var Tuple2 = Elm.Native.Utils(elm).Tuple2;
15
15
16 var toString = function(v) {
16 var toString = function(v) {
17+ var type = typeof v;
17− if (typeof v === "function") {
18+ if (type === "function") {
18 var name = v.func ? v.func.name : v.name;
19 var name = v.func ? v.func.name : v.name;
19 return '<function' + (name === '' ? '' : ': ') + name + '>';
20 return '<function' + (name === '' ? '' : ': ') + name + '>';
20− } else if (typeof v === "boolean") {
21+ } else if (type === "boolean") {
21 return v ? "True" : "False";
22 return v ? "True" : "False";
22− } else if (typeof v === "number") {
23+ } else if (type === "number") {
23 return v+"";
24 return v+"";
24− } else if (typeof v === "string" && v.length < 2) {
25+ } else if (type === "string" && v.length < 2) {
25 return "'" + showChar(v) + "'";
26 return "'" + showChar(v) + "'";
26− } else if (typeof v === "object" && '_' in v) {
27+ } else if (type === "object" && '_' in v) {
27 var output = [];
28 var output = [];
28 for (var k in v._) {
29 for (var k in v._) {
29 for (var i = v._[k].length; i--; ) {
30 for (var i = v._[k].length; i--; ) {
@@ -36,7 +37,7 @@ Elm.Native.Show = function(elm) {
36 }
37 }
37 if (output.length === 0) return "{}";
38 if (output.length === 0) return "{}";
38 return "{ " + output.join(", ") + " }";
39 return "{ " + output.join(", ") + " }";
39− } else if (typeof v === "object" && 'ctor' in v) {
40+ } else if (type === "object" && 'ctor' in v) {
40 if (v.ctor.substring(0,6) === "_Tuple") {
41 if (v.ctor.substring(0,6) === "_Tuple") {
41 var output = [];
42 var output = [];
42 for (var k in v) {
43 for (var k in v) {
@@ -79,7 +80,7 @@ Elm.Native.Show = function(elm) {
79 return v.ctor + output;
80 return v.ctor + output;
80 }
81 }
81 }
82 }
82− if (typeof v === 'object' && 'recv' in v) return '<signal>';
83+ if (type === 'object' && 'recv' in v) return '<signal>';
83 return "<internal structure>";
84 return "<internal structure>";
84 };
85 };
85 function show(v) { return NList.fromArray(toString(v)); }
86 function show(v) { return NList.fromArray(toString(v)); }