diff options
| author | Pushkar Joshi | 2012-06-11 14:07:13 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-06-11 14:07:13 -0700 |
| commit | 71bc93ad0d53a77d70c688b2b3aacf694dd1de91 (patch) | |
| tree | a432a4652bf7c96aea72a22bf27946eeee8fc4a5 /js/components | |
| parent | 76db3eb0aa4ffe9e75812db570c793e9f852f853 (diff) | |
| parent | 756cbfad2b98b300af8db3793aa21718b88dd950 (diff) | |
| download | ninja-71bc93ad0d53a77d70c688b2b3aacf694dd1de91.tar.gz | |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/components')
| -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); |