aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/oval-properties.reel
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-22 13:22:26 -0700
committerPushkar Joshi2012-05-22 13:22:26 -0700
commit01dbc1f329a95bc7e3b93224543d88ad5bdbd315 (patch)
treeceb527713554f506c537168e36a10452cd09ad10 /js/components/tools-properties/oval-properties.reel
parentb9262c831952e77135b79c2de7c455d5e7ff0589 (diff)
parentc37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff)
downloadninja-01dbc1f329a95bc7e3b93224543d88ad5bdbd315.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'js/components/tools-properties/oval-properties.reel')
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.css11
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.html6
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.js8
3 files changed, 22 insertions, 3 deletions
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.css b/js/components/tools-properties/oval-properties.reel/oval-properties.css
index 7f1b0f7f..ea0d92fc 100755
--- a/js/components/tools-properties/oval-properties.reel/oval-properties.css
+++ b/js/components/tools-properties/oval-properties.reel/oval-properties.css
@@ -4,3 +4,14 @@
4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5 </copyright> */ 5 </copyright> */
6 6
7.ovalProperties{
8}
9
10.ovalProperties hottextunit {
11 width: 22px;
12}
13
14.ovalProperties label {
15 margin-left: 6px;
16 margin-right: 6px;
17}
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.html b/js/components/tools-properties/oval-properties.reel/oval-properties.html
index e460f7ea..21308be6 100755
--- a/js/components/tools-properties/oval-properties.reel/oval-properties.html
+++ b/js/components/tools-properties/oval-properties.reel/oval-properties.html
@@ -35,9 +35,9 @@
35 </head> 35 </head>
36 36
37 <body> 37 <body>
38 <div id="ovalProperties"> 38 <div data-montage-id="ovalProperties" class="ovalProperties toolOptionsFloatChildren">
39 <label class="label">Inner Radius:</label> 39 <label>Inner Radius:</label>
40 <div id="innerRadiusControl" class="label"></div> 40 <div data-montage-id="innerRadiusControl"></div>
41 </div> 41 </div>
42 </body> 42 </body>
43 43
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 ddeb64ee..3edd9214 100755
--- a/js/components/tools-properties/oval-properties.reel/oval-properties.js
+++ b/js/components/tools-properties/oval-properties.reel/oval-properties.js
@@ -24,6 +24,14 @@ exports.OvalProperties = Montage.create(ToolProperties, {
24 }, 24 },
25 25
26 // Public API 26 // Public API
27 fill: {
28 get: function () { return this.base.fill; }
29 },
30
31 stroke: {
32 get: function () { return this.base.stroke; }
33 },
34
27 use3D: { 35 use3D: {
28 get: function() { return this.base._use3D; } 36 get: function() { return this.base._use3D; }
29 }, 37 },