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/color/colorpanelpopup.reel/colorpanelpopup.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/color/colorpanelpopup.reel/colorpanelpopup.html')
| -rwxr-xr-x | js/panels/color/colorpanelpopup.reel/colorpanelpopup.html | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html index feebb45c..f65d5bc0 100755 --- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html +++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.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/> |
| @@ -14,8 +14,7 @@ | |||
| 14 | <script type="text/montage-serialization"> | 14 | <script type="text/montage-serialization"> |
| 15 | { | 15 | { |
| 16 | "owner": { | 16 | "owner": { |
| 17 | "module": "js/panels/Color/colorpanelpopup.reel", | 17 | "prototype": "js/panels/Color/colorpanelpopup.reel[ColorPanelPopup]", |
| 18 | "name": "ColorPanelPopup", | ||
| 19 | "properties": { | 18 | "properties": { |
| 20 | "element": {"#": "cpp_popup"} | 19 | "element": {"#": "cpp_popup"} |
| 21 | } | 20 | } |
| @@ -27,7 +26,7 @@ | |||
| 27 | 26 | ||
| 28 | <body> | 27 | <body> |
| 29 | 28 | ||
| 30 | <div id="cpp_popup" class="cpp_popup"> | 29 | <div data-montage-id="cpp_popup" class="cpp_popup"> |
| 31 | <div class="cp_pu_options"> | 30 | <div class="cp_pu_options"> |
| 32 | 31 | ||
| 33 | <div class="cp_pu_history"> | 32 | <div class="cp_pu_history"> |