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/panels/Timeline/Span.reel/Span.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/panels/Timeline/Span.reel/Span.html')
| -rw-r--r-- | js/panels/Timeline/Span.reel/Span.html | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/js/panels/Timeline/Span.reel/Span.html b/js/panels/Timeline/Span.reel/Span.html index f7e05982..8baa141a 100644 --- a/js/panels/Timeline/Span.reel/Span.html +++ b/js/panels/Timeline/Span.reel/Span.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
| @@ -11,8 +11,7 @@ | |||
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "owner": { | 13 | "owner": { |
| 14 | "module": "js/panels/Timeline/Span.reel", | 14 | "prototype": "js/panels/Timeline/Span.reel", |
| 15 | "name": "Span", | ||
| 16 | "properties": { | 15 | "properties": { |
| 17 | "element": {"#": "spanspace"} | 16 | "element": {"#": "spanspace"} |
| 18 | } | 17 | } |
| @@ -23,7 +22,7 @@ | |||
| 23 | </head> | 22 | </head> |
| 24 | <body> | 23 | <body> |
| 25 | 24 | ||
| 26 | <div id="spanspace" class="tween_span"> | 25 | <div data-montage-id="spanspace" class="tween_span"> |
| 27 | </div> | 26 | </div> |
| 28 | 27 | ||
| 29 | </body> | 28 | </body> |