diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/panels/Timeline/Track.reel/Track.html | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/panels/Timeline/Track.reel/Track.html')
| -rw-r--r-- | js/panels/Timeline/Track.reel/Track.html | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/js/panels/Timeline/Track.reel/Track.html b/js/panels/Timeline/Track.reel/Track.html index 6be86ef6..6c977f1a 100644 --- a/js/panels/Timeline/Track.reel/Track.html +++ b/js/panels/Timeline/Track.reel/Track.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!doctype html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
| 4 | All Rights Reserved. | 4 | All Rights Reserved. |
| @@ -29,10 +29,10 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |||
| 29 | POSSIBILITY OF SUCH DAMAGE. | 29 | POSSIBILITY OF SUCH DAMAGE. |
| 30 | </copyright> --> | 30 | </copyright> --> |
| 31 | <html lang="en"> | 31 | <html lang="en"> |
| 32 | <head> | 32 | <head> |
| 33 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 33 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
| 34 | <link rel="stylesheet" type="text/css" href="css/Track.css"> | 34 | <link rel="stylesheet" type="text/css" href="css/Track.css"> |
| 35 | <script type="text/montage-serialization"> | 35 | <script type="text/montage-serialization"> |
| 36 | { | 36 | { |
| 37 | "owner": { | 37 | "owner": { |
| 38 | "prototype": "js/panels/Timeline/Track.reel", | 38 | "prototype": "js/panels/Timeline/Track.reel", |
| @@ -58,30 +58,30 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 58 | }, | 58 | }, |
| 59 | 59 | ||
| 60 | "spanRepetition": { | 60 | "spanRepetition": { |
| 61 | "prototype": "montage/ui/repetition.reel", | 61 | "prototype": "montage/ui/repetition.reel", |
| 62 | "properties": { | 62 | "properties": { |
| 63 | "element": {"#": "track_lanes"}, | 63 | "element": {"#": "track_lanes"}, |
| 64 | "isSelectionEnabled" : true | 64 | "isSelectionEnabled" : true |
| 65 | }, | 65 | }, |
| 66 | "bindings": { | 66 | "bindings": { |
| 67 | "objects": { | 67 | "objects": { |
| 68 | "boundObject": {"@": "owner"}, | 68 | "boundObject": {"@": "owner"}, |
| 69 | "boundObjectPropertyPath": "spans", | 69 | "boundObjectPropertyPath": "spans", |
| 70 | "oneway": false | 70 | "oneway": false |
| 71 | } | 71 | } |
| 72 | } | 72 | } |
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | } | 75 | } |
| 76 | </script> | 76 | </script> |
| 77 | </head> | 77 | </head> |
| 78 | <body> | 78 | <body> |
| 79 | 79 | ||
| 80 | <div data-montage-id="track"> | 80 | <div data-montage-id="track"> |
| 81 | <div data-montage-id="track_lanes"> | 81 | <div data-montage-id="track_lanes"> |
| 82 | <div data-montage-id="track_lane" class="tracklane"></div> | 82 | <div data-montage-id="track_lane" class="tracklane"></div> |
| 83 | </div> | 83 | </div> |
| 84 | </div> | 84 | </div> |
| 85 | 85 | ||
| 86 | </body> | 86 | </body> |
| 87 | </html> | 87 | </html> |