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/io/ui/cloudpopup.reel/cloudpopup.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/io/ui/cloudpopup.reel/cloudpopup.html')
| -rwxr-xr-x | js/io/ui/cloudpopup.reel/cloudpopup.html | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.html b/js/io/ui/cloudpopup.reel/cloudpopup.html index e58041ec..753597e7 100755 --- a/js/io/ui/cloudpopup.reel/cloudpopup.html +++ b/js/io/ui/cloudpopup.reel/cloudpopup.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2 | 2 | ||
| 3 | <!-- <copyright> | 3 | <!-- <copyright> |
| 4 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 4 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
| @@ -16,8 +16,7 @@ | |||
| 16 | <script type="text/montage-serialization"> | 16 | <script type="text/montage-serialization"> |
| 17 | { | 17 | { |
| 18 | "owner": { | 18 | "owner": { |
| 19 | "module": "js/io/ui/cloudpopup.reel", | 19 | "prototype": "js/io/ui/cloudpopup.reel[cloudpopup]", |
| 20 | "name": "cloudpopup", | ||
| 21 | "properties": { | 20 | "properties": { |
| 22 | "element": {"#": "cloud_popup"} | 21 | "element": {"#": "cloud_popup"} |
| 23 | } | 22 | } |
| @@ -29,7 +28,7 @@ | |||
| 29 | 28 | ||
| 30 | <body> | 29 | <body> |
| 31 | 30 | ||
| 32 | <div id="cloud_popup" class="cloud_popup"> | 31 | <div data-montage-id="cloud_popup" class="cloud_popup"> |
| 33 | <div class="content"> | 32 | <div class="content"> |
| 34 | 33 | ||
| 35 | <h3>Cloud Service Dialog</h3> | 34 | <h3>Cloud Service Dialog</h3> |