diff options
author | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
commit | 263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch) | |
tree | 7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /node_modules/montage/ui/dynamic-text.reel | |
parent | 1bb2778224982aea7b9781c6559bb659983a400f (diff) | |
parent | a827f2769d75848c0ba0bff03a927c1f2706322b (diff) | |
download | ninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz |
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts:
js/panels/properties.reel/sections/position-size.reel/position-size.html
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/dynamic-text.reel')
-rwxr-xr-x | node_modules/montage/ui/dynamic-text.reel/dynamic-text.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/node_modules/montage/ui/dynamic-text.reel/dynamic-text.js b/node_modules/montage/ui/dynamic-text.reel/dynamic-text.js index 8562fdae..c10d63b5 100755 --- a/node_modules/montage/ui/dynamic-text.reel/dynamic-text.js +++ b/node_modules/montage/ui/dynamic-text.reel/dynamic-text.js | |||
@@ -49,7 +49,8 @@ exports.DynamicText = Montage.create(Component, /** @lends module:"montage/ui/dy | |||
49 | @default null | 49 | @default null |
50 | */ | 50 | */ |
51 | converter: { | 51 | converter: { |
52 | value: null | 52 | value: null, |
53 | serializable: true | ||
53 | }, | 54 | }, |
54 | 55 | ||
55 | /** | 56 | /** |
@@ -58,7 +59,8 @@ exports.DynamicText = Montage.create(Component, /** @lends module:"montage/ui/dy | |||
58 | @default {String} "" | 59 | @default {String} "" |
59 | */ | 60 | */ |
60 | defaultValue: { | 61 | defaultValue: { |
61 | value: "" | 62 | value: "", |
63 | serializable: true | ||
62 | }, | 64 | }, |
63 | 65 | ||
64 | _valueNode: { | 66 | _valueNode: { |