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/Style.reel/Style.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/Style.reel/Style.html')
| -rw-r--r-- | js/panels/Timeline/Style.reel/Style.html | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/js/panels/Timeline/Style.reel/Style.html b/js/panels/Timeline/Style.reel/Style.html index 48714432..5be159c3 100644 --- a/js/panels/Timeline/Style.reel/Style.html +++ b/js/panels/Timeline/Style.reel/Style.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/Style.reel", | 14 | "prototype": "js/panels/Timeline/Style.reel", |
| 15 | "name": "Style", | ||
| 16 | "properties": { | 15 | "properties": { |
| 17 | "element": {"#": "style-container"}, | 16 | "element": {"#": "style-container"}, |
| 18 | "styleContainer" : {"#" : "style-container"}, | 17 | "styleContainer" : {"#" : "style-container"}, |
| @@ -24,8 +23,7 @@ | |||
| 24 | } | 23 | } |
| 25 | }, | 24 | }, |
| 26 | "dtext1" : { | 25 | "dtext1" : { |
| 27 | "module" : "montage/ui/dynamic-text.reel", | 26 | "prototype" : "montage/ui/dynamic-text.reel", |
| 28 | "name" : "DynamicText", | ||
| 29 | "properties" : { | 27 | "properties" : { |
| 30 | "element" : {"#" : "container-property"} | 28 | "element" : {"#" : "container-property"} |
| 31 | }, | 29 | }, |
| @@ -38,8 +36,7 @@ | |||
| 38 | } | 36 | } |
| 39 | }, | 37 | }, |
| 40 | "hottextunit" : { | 38 | "hottextunit" : { |
| 41 | "module" : "js/components/hottextunit.reel", | 39 | "prototype" : "js/components/hottextunit.reel[HotTextUnit]", |
| 42 | "name" : "HotTextUnit", | ||
| 43 | "properties" : { | 40 | "properties" : { |
| 44 | "element" : {"#":"value-editor-hottext"} | 41 | "element" : {"#":"value-editor-hottext"} |
| 45 | }, | 42 | }, |
| @@ -52,8 +49,7 @@ | |||
| 52 | } | 49 | } |
| 53 | }, | 50 | }, |
| 54 | "hintable" : { | 51 | "hintable" : { |
| 55 | "module" : "js/components/hintable.reel", | 52 | "prototype" : "js/components/hintable.reel", |
| 56 | "name" : "Hintable", | ||
| 57 | "properties" : { | 53 | "properties" : { |
| 58 | "element" : {"#":"style-hintable"} | 54 | "element" : {"#":"style-hintable"} |
| 59 | }, | 55 | }, |
| @@ -69,23 +65,23 @@ | |||
| 69 | </script> | 65 | </script> |
| 70 | </head> | 66 | </head> |
| 71 | <body> | 67 | <body> |
| 72 | <div id="style-container"> | 68 | <div data-montage-id="style-container"> |
| 73 | <div class="style-padding"> | 69 | <div class="style-padding"> |
| 74 | <div class="row-hintable hidden"> | 70 | <div class="row-hintable hidden"> |
| 75 | <div id="style-hintable"></div> | 71 | <div data-montage-id="style-hintable"></div> |
| 76 | </div> | 72 | </div> |
| 77 | <div class="container-propvals hidden"> | 73 | <div class="container-propvals hidden"> |
| 78 | <div class="cell-property"> | 74 | <div class="cell-property"> |
| 79 | <div id="container-property">property</div> | 75 | <div data-montage-id="container-property">property</div> |
| 80 | </div> | 76 | </div> |
| 81 | <div class="cell-value value-editor editor-hottext hidden"> | 77 | <div class="cell-value value-editor editor-hottext hidden"> |
| 82 | <div id="value-editor-hottext"></div> | 78 | <div data-montage-id="value-editor-hottext"></div> |
| 83 | </div> | 79 | </div> |
| 84 | <div class="cell-value value-editor editor-color hidden"> | 80 | <div class="cell-value value-editor editor-color hidden"> |
| 85 | <div id="value-editor-color">[ ]</div> | 81 | <div data-montage-id="value-editor-color">[ ]</div> |
| 86 | </div> | 82 | </div> |
| 87 | <div class="cell-value value-editor editor-input hidden"> | 83 | <div class="cell-value value-editor editor-input hidden"> |
| 88 | <!-- <div id="value-editor-input"></div> --> | 84 | <!-- <div data-montage-id="value-editor-input"></div> --> |
| 89 | <input type="text" class="nj-skinned" value="" /> | 85 | <input type="text" class="nj-skinned" value="" /> |
| 90 | </div> | 86 | </div> |
| 91 | </div> | 87 | </div> |