diff options
author | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
commit | c6ae80c488621d4ac189cb63309b6258115f823a (patch) | |
tree | dfa26112e1830972fcb212bbb5b17c9a901c645f /js/panels/properties.reel/properties.html | |
parent | 022e714cb5d10cd8575ab9907eddfb184a990b66 (diff) | |
parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
download | ninja-c6ae80c488621d4ac189cb63309b6258115f823a.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate
Diffstat (limited to 'js/panels/properties.reel/properties.html')
-rwxr-xr-x | js/panels/properties.reel/properties.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html index a737bd39..72984c17 100755 --- a/js/panels/properties.reel/properties.html +++ b/js/panels/properties.reel/properties.html | |||
@@ -11,21 +11,21 @@ | |||
11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
12 | { | 12 | { |
13 | "elementName": { | 13 | "elementName": { |
14 | "prototype": "montage/ui/textfield.reel", | 14 | "prototype": "montage/ui/native/input-text.reel", |
15 | "properties": { | 15 | "properties": { |
16 | "element": {"#": "elementName"} | 16 | "element": {"#": "elementName"} |
17 | } | 17 | } |
18 | }, | 18 | }, |
19 | 19 | ||
20 | "elementId": { | 20 | "elementId": { |
21 | "prototype": "montage/ui/textfield.reel", | 21 | "prototype": "montage/ui/native/input-text.reel", |
22 | "properties": { | 22 | "properties": { |
23 | "element": {"#": "elementId"} | 23 | "element": {"#": "elementId"} |
24 | } | 24 | } |
25 | }, | 25 | }, |
26 | 26 | ||
27 | "elementClass": { | 27 | "elementClass": { |
28 | "prototype": "montage/ui/textfield.reel", | 28 | "prototype": "montage/ui/native/input-text.reel", |
29 | "properties": { | 29 | "properties": { |
30 | "element": {"#": "elementClass"} | 30 | "element": {"#": "elementClass"} |
31 | } | 31 | } |