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/panels/properties.reel/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/panels/properties.reel/properties.html')
-rwxr-xr-x | js/panels/properties.reel/properties.html | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html index b9aa206b..a737bd39 100755 --- a/js/panels/properties.reel/properties.html +++ b/js/panels/properties.reel/properties.html | |||
@@ -13,24 +13,21 @@ | |||
13 | "elementName": { | 13 | "elementName": { |
14 | "prototype": "montage/ui/textfield.reel", | 14 | "prototype": "montage/ui/textfield.reel", |
15 | "properties": { | 15 | "properties": { |
16 | "element": {"#": "elementName"}, | 16 | "element": {"#": "elementName"} |
17 | "readOnly": true | ||
18 | } | 17 | } |
19 | }, | 18 | }, |
20 | 19 | ||
21 | "elementId": { | 20 | "elementId": { |
22 | "prototype": "montage/ui/textfield.reel", | 21 | "prototype": "montage/ui/textfield.reel", |
23 | "properties": { | 22 | "properties": { |
24 | "element": {"#": "elementId"}, | 23 | "element": {"#": "elementId"} |
25 | "readOnly": false | ||
26 | } | 24 | } |
27 | }, | 25 | }, |
28 | 26 | ||
29 | "elementClass": { | 27 | "elementClass": { |
30 | "prototype": "montage/ui/textfield.reel", | 28 | "prototype": "montage/ui/textfield.reel", |
31 | "properties": { | 29 | "properties": { |
32 | "element": {"#": "elementClass"}, | 30 | "element": {"#": "elementClass"} |
33 | "readOnly": false | ||
34 | } | 31 | } |
35 | }, | 32 | }, |
36 | 33 | ||