diff options
author | Jonathan Duran | 2012-06-11 10:12:08 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-11 10:12:08 -0700 |
commit | 6a3b09433b8d5894a0f2a6c00748825727c2d991 (patch) | |
tree | 377cd68e0580172bc234059dbd4482c964d49bd4 /js/components/converter | |
parent | 79cbc26904a7fbd7a846f48da6c026a91221ba93 (diff) | |
parent | bad5a44824ba35cbc7f4f4d245e32b90208f00c1 (diff) | |
download | ninja-6a3b09433b8d5894a0f2a6c00748825727c2d991.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/components/converter')
-rw-r--r-- | js/components/converter/string-units-converter.js | 2 | ||||
-rw-r--r-- | js/components/converter/string-value-converter.js | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/js/components/converter/string-units-converter.js b/js/components/converter/string-units-converter.js index 6b97d5c5..9f6e4112 100644 --- a/js/components/converter/string-units-converter.js +++ b/js/components/converter/string-units-converter.js | |||
@@ -9,7 +9,6 @@ var Montage = require("montage").Montage, | |||
9 | 9 | ||
10 | exports.StringUnitsConverter = Montage.create(Converter, { | 10 | exports.StringUnitsConverter = Montage.create(Converter, { |
11 | 11 | ||
12 | // convert fahrenheit to celsius (showing our non-metric heritage here) | ||
13 | convert: { | 12 | convert: { |
14 | value: function(value) { | 13 | value: function(value) { |
15 | if(value) { | 14 | if(value) { |
@@ -20,7 +19,6 @@ exports.StringUnitsConverter = Montage.create(Converter, { | |||
20 | } | 19 | } |
21 | }, | 20 | }, |
22 | 21 | ||
23 | // revert celsius to fahrenheit | ||
24 | revert: { | 22 | revert: { |
25 | value: function(value) { | 23 | value: function(value) { |
26 | console.log("revert string to unit ", value); | 24 | console.log("revert string to unit ", value); |
diff --git a/js/components/converter/string-value-converter.js b/js/components/converter/string-value-converter.js index 28d7dd29..f397f731 100644 --- a/js/components/converter/string-value-converter.js +++ b/js/components/converter/string-value-converter.js | |||
@@ -9,7 +9,6 @@ var Montage = require("montage").Montage, | |||
9 | 9 | ||
10 | exports.StringValueConverter = Montage.create(Converter, { | 10 | exports.StringValueConverter = Montage.create(Converter, { |
11 | 11 | ||
12 | // convert fahrenheit to celsius (showing our non-metric heritage here) | ||
13 | convert: { | 12 | convert: { |
14 | value: function(value) { | 13 | value: function(value) { |
15 | console.log(value); | 14 | console.log(value); |
@@ -18,7 +17,6 @@ exports.StringValueConverter = Montage.create(Converter, { | |||
18 | } | 17 | } |
19 | }, | 18 | }, |
20 | 19 | ||
21 | // revert celsius to fahrenheit | ||
22 | revert: { | 20 | revert: { |
23 | value: function(value) { | 21 | value: function(value) { |
24 | console.log("revert string to value ", value); | 22 | console.log("revert string to value ", value); |