diff options
| author | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
| commit | 263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch) | |
| tree | 7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/components/tools-properties/rect-properties.reel/rect-properties.html | |
| parent | 1bb2778224982aea7b9781c6559bb659983a400f (diff) | |
| parent | a827f2769d75848c0ba0bff03a927c1f2706322b (diff) | |
| download | ninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts:
js/panels/properties.reel/sections/position-size.reel/position-size.html
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
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": [ |