aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/properties.html
diff options
context:
space:
mode:
authorJon Reid2012-06-20 15:05:26 -0700
committerJon Reid2012-06-20 15:05:26 -0700
commit6e6c146f6e59c3942076b5d2f46b2962cc709926 (patch)
treeaa6becc1e97aecbe6fb43aa33770def3c3de227d /js/panels/properties.reel/properties.html
parentf887a74a7d03a2008a2c43d455a2b3e9223028af (diff)
parentc9852665eadc1acb9c1c881d207c4bd9ef88805f (diff)
downloadninja-6e6c146f6e59c3942076b5d2f46b2962cc709926.tar.gz
Merge remote-tracking branch 'ninja-internal/master' into timeline-local
Diffstat (limited to 'js/panels/properties.reel/properties.html')
-rwxr-xr-xjs/panels/properties.reel/properties.html6
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 }