diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components/textfield.reel/textfield.html | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'js/components/textfield.reel/textfield.html')
| -rwxr-xr-x | js/components/textfield.reel/textfield.html | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/js/components/textfield.reel/textfield.html b/js/components/textfield.reel/textfield.html index 89adf776..f3f8ac53 100755 --- a/js/components/textfield.reel/textfield.html +++ b/js/components/textfield.reel/textfield.html | |||
| @@ -9,8 +9,7 @@ | |||
| 9 | <script type="text/montage-serialization"> | 9 | <script type="text/montage-serialization"> |
| 10 | { | 10 | { |
| 11 | "owner": { | 11 | "owner": { |
| 12 | "module": "js/components/textfield.reel", | 12 | "prototype": "js/components/textfield.reel[TextField]", |
| 13 | "name": "TextField", | ||
| 14 | "properties": { | 13 | "properties": { |
| 15 | "element": {"#": "textfield"} | 14 | "element": {"#": "textfield"} |
| 16 | } | 15 | } |
| @@ -19,6 +18,6 @@ | |||
| 19 | </script> | 18 | </script> |
| 20 | </head> | 19 | </head> |
| 21 | <body> | 20 | <body> |
| 22 | <input id="textfield" class="nj-skinned" type="text"> | 21 | <input data-montage-id="textfield" class="nj-skinned" type="text"> |
| 23 | </body> | 22 | </body> |
| 24 | </html> \ No newline at end of file | 23 | </html> \ No newline at end of file |