aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/oval-properties.reel
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-06-13 13:51:39 -0700
committerNivesh Rajbhandari2012-06-13 13:51:39 -0700
commit263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch)
tree7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/components/tools-properties/oval-properties.reel
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 'js/components/tools-properties/oval-properties.reel')
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.js11
1 files changed, 9 insertions, 2 deletions
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.js b/js/components/tools-properties/oval-properties.reel/oval-properties.js
index 3edd9214..d371193f 100755
--- a/js/components/tools-properties/oval-properties.reel/oval-properties.js
+++ b/js/components/tools-properties/oval-properties.reel/oval-properties.js
@@ -8,8 +8,15 @@ var Montage = require("montage/core/core").Montage,
8 ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties; 8 ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties;
9 9
10exports.OvalProperties = Montage.create(ToolProperties, { 10exports.OvalProperties = Montage.create(ToolProperties, {
11 base: { value: null }, 11 base: {
12 innerRadius: { value: null }, 12 value: null,
13 serializable: true
14 },
15
16 innerRadius: {
17 value: null,
18 serializable: true
19 },
13 20
14 _subPrepare: { 21 _subPrepare: {
15 value: function() { 22 value: function() {