aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/core/converter/bytes-converter.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-06-13 13:51:39 -0700
committerNivesh Rajbhandari2012-06-13 13:51:39 -0700
commit263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch)
tree7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /node_modules/montage/core/converter/bytes-converter.js
parent1bb2778224982aea7b9781c6559bb659983a400f (diff)
parenta827f2769d75848c0ba0bff03a927c1f2706322b (diff)
downloadninja-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/core/converter/bytes-converter.js')
-rwxr-xr-xnode_modules/montage/core/converter/bytes-converter.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/node_modules/montage/core/converter/bytes-converter.js b/node_modules/montage/core/converter/bytes-converter.js
index 1626f352..605d8546 100755
--- a/node_modules/montage/core/converter/bytes-converter.js
+++ b/node_modules/montage/core/converter/bytes-converter.js
@@ -78,7 +78,8 @@ exports.BytesConverter = Montage.create(Converter, /** @lends module:montage/cor
78 @default {Number} 2 78 @default {Number} 2
79 */ 79 */
80 decimals: { 80 decimals: {
81 value: 2 81 value: 2,
82 serializable: true
82 }, 83 },
83 /** 84 /**
84 Converts the specified value to byte format. 85 Converts the specified value to byte format.