aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/rect-properties.reel/rect-properties.html
diff options
context:
space:
mode:
authorhwc4872012-03-23 13:49:03 -0700
committerhwc4872012-03-23 13:49:03 -0700
commit51478dbad8290f55eeab9efdfb8c2cbe24b12b10 (patch)
tree1524c53d027d1f2f8cbb759f61e4d73b52b00481 /js/components/tools-properties/rect-properties.reel/rect-properties.html
parent31e924e1b8b8da8342b3ff2341c8284915486c0b (diff)
parentbc8b0c17023ddea6d77150694a777e104ef99cbc (diff)
downloadninja-51478dbad8290f55eeab9efdfb8c2cbe24b12b10.tar.gz
Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-internal into integration
Conflicts: js/io/system/ninjalibrary.json
Diffstat (limited to 'js/components/tools-properties/rect-properties.reel/rect-properties.html')
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html16
1 files changed, 14 insertions, 2 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 214ff1d5..ceb761b9 100755
--- a/js/components/tools-properties/rect-properties.reel/rect-properties.html
+++ b/js/components/tools-properties/rect-properties.reel/rect-properties.html
@@ -50,12 +50,23 @@
50 } 50 }
51 }, 51 },
52 52
53 "lockButton": {
54 "prototype": "montage/ui/toggle-button.reel",
55 "properties": {
56 "element": {"#": "lockButton"},
57 "pressed": true,
58 "pressedClass": "lockUp",
59 "preventFocus": true,
60 "identifier": "ratio"
61 }
62 },
63
53 "owner": { 64 "owner": {
54 "module": "js/components/tools-properties/rect-properties.reel", 65 "module": "js/components/tools-properties/rect-properties.reel",
55 "name": "RectProperties", 66 "name": "RectProperties",
56 "properties": { 67 "properties": {
57 "element": {"#": "rectProperties"}, 68 "element": {"#": "rectProperties"},
58 "lockButton": {"#": "lockButton"}, 69 "lockButton": {"@": "lockButton"},
59 "TLRadiusControl": {"@": "hottext1"}, 70 "TLRadiusControl": {"@": "hottext1"},
60 "TRRadiusControl": {"@": "hottext2"}, 71 "TRRadiusControl": {"@": "hottext2"},
61 "BLRadiusControl": {"@": "hottext3"}, 72 "BLRadiusControl": {"@": "hottext3"},
@@ -69,7 +80,8 @@
69 80
70 <body> 81 <body>
71 <div id="rectProperties" class="rectProperties"> 82 <div id="rectProperties" class="rectProperties">
72 <button id="lockButton" class="unselectable subToolButton button LockToolUp" style=" margin-left:20px"></button> 83 <!--<button id="lockButton" class="unselectable subToolButton button LockToolUp" style=" margin-left:20px"></button>-->
84 <button id="lockButton" class="unlock" style="margin-left:20px"></button>
73 <div id="TLRadiusLabel" class="unselectable subToolButton cornerRadius topLeft"></div> 85 <div id="TLRadiusLabel" class="unselectable subToolButton cornerRadius topLeft"></div>
74 <div id="TLRadiusControl" class="label"></div> 86 <div id="TLRadiusControl" class="label"></div>
75 <div id="TRRadiusLabel" class="unselectable subToolButton cornerRadius topRight"></div> 87 <div id="TRRadiusLabel" class="unselectable subToolButton cornerRadius topRight"></div>