diff options
author | Pushkar Joshi | 2012-03-27 09:10:58 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-03-27 09:10:58 -0700 |
commit | 0c26aff9c19c2b39fca06fa6b3bc76b672204065 (patch) | |
tree | e778f2b9d5d525aa364360d5996536a0a06379bd /js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html | |
parent | 753244b4713243ab19ca246be674f0b45fb85b72 (diff) | |
parent | 309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff) | |
download | ninja-0c26aff9c19c2b39fca06fa6b3bc76b672204065.tar.gz |
Merge branch 'master' into brushtool
Conflicts:
js/controllers/elements/shapes-controller.js
Diffstat (limited to 'js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html')
-rwxr-xr-x | js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html b/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html index 6e355f31..f50724c5 100755 --- a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html +++ b/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html | |||
@@ -85,13 +85,12 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
85 | } | 85 | } |
86 | }, | 86 | }, |
87 | "bindButton": { | 87 | "bindButton": { |
88 | "module": "js/components/button.reel", | 88 | "prototype": "montage/ui/toggle-button.reel", |
89 | "name": "Button", | ||
90 | "properties": { | 89 | "properties": { |
91 | "element": {"#" :"posBound"}, | 90 | "element": {"#": "posBound"}, |
92 | "isToggleButton": true, | 91 | "pressedClass": "lockUp", |
93 | "onState": "LockToolUp", | 92 | "preventFocus": true, |
94 | "offState": "UnLockToolUp" | 93 | "identifier": "ratio" |
95 | } | 94 | } |
96 | } | 95 | } |
97 | } | 96 | } |
@@ -119,7 +118,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
119 | </section> | 118 | </section> |
120 | <hr /> | 119 | <hr /> |
121 | <section class="fieldCol"> | 120 | <section class="fieldCol"> |
122 | <button id="posBound"></button> | 121 | <button id="posBound" class="unlock"></button> |
123 | <label>Width:</label> | 122 | <label>Width:</label> |
124 | <article class="fieldRow twoCol"> | 123 | <article class="fieldRow twoCol"> |
125 | <div> | 124 | <div> |