Merge branch 'refs/heads/TimelineUberjd' into TimelineUber

Conflicts:
	js/panels/Timeline/Layer.reel/Layer.js

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

1 files changed, 29 insertions, 0 deletions

diff --git a/js/components/converter/string-value-converter.js b/js/components/converter/string-value-converter.js
new file mode 100644
index 00000000..28d7dd29
--- /dev/null
+++ b/js/components/converter/string-value-converter.js
@@ -0,0 +1,29 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+var Montage = require("montage").Montage,
+    Converter = require("montage/core/converter/converter").Converter,
+    NJUtils = require("js/lib/NJUtils").NJUtils;
+
+exports.StringValueConverter = Montage.create(Converter, {
+
+    // convert fahrenheit to celsius (showing our non-metric heritage here)
+    convert: {
+        value: function(value) {
+            console.log(value);
+            console.log(parseInt(value));
+                return parseInt(value);
+        }
+    },
+
+    // revert celsius to fahrenheit
+    revert: {
+        value: function(value) {
+            console.log("revert string to value ", value);
+            return value;
+        }
+    }
+
+});