aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/rect-properties.reel
diff options
context:
space:
mode:
authorJon Reid2012-06-15 10:10:41 -0700
committerJon Reid2012-06-15 10:10:41 -0700
commit526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch)
tree65939e59615aaa10a7db77211e71616ad531bd0e /js/components/tools-properties/rect-properties.reel
parentb5b760ee82e5cc4da176914983a6002cbf86c11a (diff)
parent5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff)
downloadninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'js/components/tools-properties/rect-properties.reel')
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html1
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.js20
2 files changed, 14 insertions, 7 deletions
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.html b/js/components/tools-properties/rect-properties.reel/rect-properties.html
index a7bf6a7c..41606a45 100755
--- a/js/components/tools-properties/rect-properties.reel/rect-properties.html
+++ b/js/components/tools-properties/rect-properties.reel/rect-properties.html
@@ -80,7 +80,6 @@
80 "element": {"#": "lockButton"}, 80 "element": {"#": "lockButton"},
81 "pressed": true, 81 "pressed": true,
82 "pressedClass": "lockUp", 82 "pressedClass": "lockUp",
83 "preventFocus": true,
84 "identifier": "lockButton" 83 "identifier": "lockButton"
85 }, 84 },
86 "listeners": [ 85 "listeners": [
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.js b/js/components/tools-properties/rect-properties.reel/rect-properties.js
index 2f8ea4dd..94c674a2 100755
--- a/js/components/tools-properties/rect-properties.reel/rect-properties.js
+++ b/js/components/tools-properties/rect-properties.reel/rect-properties.js
@@ -8,12 +8,20 @@ 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.RectProperties = Montage.create(ToolProperties, { 10exports.RectProperties = Montage.create(ToolProperties, {
11 base: { value: null }, 11 base: {
12 lockButton: { value: null, enumerable: false}, 12 value: null,
13 TLRadiusControl: { value: null, enumerable: false }, 13 serializable: true
14 TRRadiusControl: { value: null, enumerable: false }, 14 },
15 BLRadiusControl: { value: null, enumerable: false }, 15
16 BRRadiusControl: { value: null, enumerable: false }, 16 lockButton: {
17 value: null,
18 serializable: true
19 },
20
21 TLRadiusControl: { value: null, serializable: true },
22 TRRadiusControl: { value: null, serializable: true },
23 BLRadiusControl: { value: null, serializable: true },
24 BRRadiusControl: { value: null, serializable: true },
17 25
18 _unlocked: { value: false, enumerable: false}, 26 _unlocked: { value: false, enumerable: false},
19 27