diff options
author | John Mayhew | 2012-04-02 16:28:39 -0700 |
---|---|---|
committer | John Mayhew | 2012-04-02 16:28:39 -0700 |
commit | b4155fb4c33675a8a7cd37473513718043fdf0ba (patch) | |
tree | 3d8c802473f2395d53d599ec9d8b70b60a4db50c /js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html | |
parent | 5ba9aeac94c86049423fd5d4b37b277263939c13 (diff) | |
parent | c6de22bf42be90b403491b5f87b1818d9020310c (diff) | |
download | ninja-b4155fb4c33675a8a7cd37473513718043fdf0ba.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/helper-classes/RDGE/rdge-compiled.js
js/helper-classes/RDGE/runtime/GLRuntime.js
js/helper-classes/RDGE/src/core/script/MeshManager.js
js/helper-classes/RDGE/src/core/script/engine.js
js/helper-classes/RDGE/src/core/script/fx/ssao.js
js/helper-classes/RDGE/src/core/script/init_state.js
js/helper-classes/RDGE/src/core/script/run_state.js
js/helper-classes/RDGE/src/core/script/scenegraphNodes.js
js/helper-classes/RDGE/src/core/script/utilities.js
js/helper-classes/RDGE/src/tools/compile-rdge-core.bat
js/helper-classes/RDGE/src/tools/compile-rdge-core.sh
js/helper-classes/RDGE/src/tools/rdge-compiled.js
js/lib/drawing/world.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/deform-material.js
js/lib/rdge/materials/flat-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/linear-gradient-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-blur-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/relief-tunnel-material.js
js/lib/rdge/materials/square-tunnel-material.js
js/lib/rdge/materials/star-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/tunnel-material.js
js/lib/rdge/materials/twist-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/uber-material.js
js/lib/rdge/materials/water-material.js
js/lib/rdge/materials/z-invert-material.js
js/preloader/Preloader.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> |