aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/oval-properties.reel/oval-properties.js
diff options
context:
space:
mode:
authorEric Guzman2012-06-19 01:20:36 -0700
committerEric Guzman2012-06-19 01:20:36 -0700
commit2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch)
treef69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/components/tools-properties/oval-properties.reel/oval-properties.js
parent5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff)
parent1007cbf983ad0f2460a4122a492a96023fdb4439 (diff)
downloadninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts: js/stage/binding-view.reel/binding-view.js
Diffstat (limited to 'js/components/tools-properties/oval-properties.reel/oval-properties.js')
-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() {