diff options
| author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
| commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
| tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/components/tools-properties/rect-properties.reel/rect-properties.html | |
| parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
| parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
| download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz | |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.js
Diffstat (limited to 'js/components/tools-properties/rect-properties.reel/rect-properties.html')
| -rwxr-xr-x | js/components/tools-properties/rect-properties.reel/rect-properties.html | 1 |
1 files changed, 0 insertions, 1 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": [ |