diff options
author | Jonathan Duran | 2012-07-17 09:30:22 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-07-17 09:30:22 -0700 |
commit | 53051672a62208fbc96957719d8285fac6431ed6 (patch) | |
tree | 79d542ee811044e8af2ef84aa0d6662c6eb895c4 /js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | |
parent | 7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff) | |
parent | 5146f224258929415adf4a8022e492454b4e2476 (diff) | |
download | ninja-53051672a62208fbc96957719d8285fac6431ed6.tar.gz |
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Conflicts:
js/panels/Timeline/DragDrop.js
js/panels/Timeline/Keyframe.reel/Keyframe.js
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
js/panels/Timeline/Span.reel/Span.js
js/panels/Timeline/Style.reel/Style.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
js/panels/Timeline/Track.reel/Track.html
js/panels/Timeline/Track.reel/Track.js
js/panels/Timeline/Track.reel/css/Track.css
js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
js/panels/Timeline/Tween.reel/Tween.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Materials/materials-library-panel.reel/materials-library-panel.html')
-rwxr-xr-x | js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | 68 |
1 files changed, 35 insertions, 33 deletions
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html index f77d3186..ce18f30d 100755 --- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html +++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | |||
@@ -1,25 +1,26 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility LLC. |
4 | All Rights Reserved. | 4 | All Rights Reserved. |
5 | BSD License. | ||
6 | 5 | ||
7 | Redistribution and use in source and binary forms, with or without | 6 | Redistribution and use in source and binary forms, with or without |
8 | modification, are permitted provided that the following conditions are met: | 7 | modification, are permitted provided that the following conditions are met: |
9 | 8 | ||
10 | - Redistributions of source code must retain the above copyright notice, | 9 | * Redistributions of source code must retain the above copyright notice, |
11 | this list of conditions and the following disclaimer. | 10 | this list of conditions and the following disclaimer. |
12 | - Redistributions in binary form must reproduce the above copyright | 11 | |
13 | notice, this list of conditions and the following disclaimer in the | 12 | * Redistributions in binary form must reproduce the above copyright notice, |
14 | documentation and/or other materials provided with the distribution. | 13 | this list of conditions and the following disclaimer in the documentation |
15 | - Neither the name of Motorola Mobility nor the names of its contributors | 14 | and/or other materials provided with the distribution. |
16 | may be used to endorse or promote products derived from this software | 15 | |
17 | without specific prior written permission. | 16 | * Neither the name of Motorola Mobility LLC nor the names of its |
17 | contributors may be used to endorse or promote products derived from this | ||
18 | software without specific prior written permission. | ||
18 | 19 | ||
19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 20 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 21 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 22 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 23 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 24 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 25 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 26 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -29,16 +30,16 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |||
29 | POSSIBILITY OF SUCH DAMAGE. | 30 | POSSIBILITY OF SUCH DAMAGE. |
30 | </copyright> --> | 31 | </copyright> --> |
31 | <html lang="en"> | 32 | <html lang="en"> |
32 | <head> | 33 | <head> |
33 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 34 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
34 | <link rel="stylesheet" type="text/css" href="materials-library-panel.css"> | 35 | <link rel="stylesheet" type="text/css" href="materials-library-panel.css"> |
35 | <script type="text/montage-serialization"> | 36 | <script type="text/montage-serialization"> |
36 | { | 37 | { |
37 | "addButton": { | 38 | "duplicateButton": { |
38 | "prototype": "montage/ui/button.reel", | 39 | "prototype": "montage/ui/button.reel", |
39 | "properties": { | 40 | "properties": { |
40 | "element": {"#": "ml_add_btn"}, | 41 | "element": {"#": "ml_duplicate_btn"}, |
41 | "enabled": false | 42 | "enabled": true |
42 | }, | 43 | }, |
43 | "listeners": [ | 44 | "listeners": [ |
44 | { | 45 | { |
@@ -47,11 +48,10 @@ POSSIBILITY OF SUCH DAMAGE. | |||
47 | } | 48 | } |
48 | ] | 49 | ] |
49 | }, | 50 | }, |
50 | "copyButton": { | 51 | "editButton": { |
51 | "prototype": "montage/ui/button.reel", | 52 | "prototype": "montage/ui/button.reel", |
52 | "properties": { | 53 | "properties": { |
53 | "element": {"#": "ml_copy_btn"}, | 54 | "element": {"#": "ml_edit_btn"} |
54 | "enabled": false | ||
55 | }, | 55 | }, |
56 | "listeners": [ | 56 | "listeners": [ |
57 | { | 57 | { |
@@ -64,7 +64,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
64 | "prototype": "montage/ui/button.reel", | 64 | "prototype": "montage/ui/button.reel", |
65 | "properties": { | 65 | "properties": { |
66 | "element": {"#": "ml_delete_btn"}, | 66 | "element": {"#": "ml_delete_btn"}, |
67 | "enabled": false | 67 | "enabled": false |
68 | }, | 68 | }, |
69 | "listeners": [ | 69 | "listeners": [ |
70 | { | 70 | { |
@@ -106,26 +106,28 @@ POSSIBILITY OF SUCH DAMAGE. | |||
106 | "prototype": "js/panels/Materials/materials-library-panel.reel[MaterialsLibraryPanels]", | 106 | "prototype": "js/panels/Materials/materials-library-panel.reel[MaterialsLibraryPanels]", |
107 | "properties": { | 107 | "properties": { |
108 | "element": {"#": "materials_library_panel"}, | 108 | "element": {"#": "materials_library_panel"}, |
109 | "_materialInfo": {"@": "materialInfo"} | 109 | "_materialInfo": {"@": "materialInfo"}, |
110 | "materialsController": {"@": "materialsController"}, | ||
111 | "deleteButton": {"@": "deleteButton"} | ||
110 | } | 112 | } |
111 | } | 113 | } |
112 | } | 114 | } |
113 | </script> | 115 | </script> |
114 | 116 | ||
115 | </head> | 117 | </head> |
116 | <body> | 118 | <body> |
117 | 119 | ||
118 | <div data-montage-id="materials_library_panel" class="materials_library_panel"> | 120 | <div data-montage-id="materials_library_panel" class="materials_library_panel"> |
119 | <section data-montage-id="ml_tree_holder" class="animationsLibrary"> | 121 | <section data-montage-id="ml_tree_holder" class="ml_tree_holder"> |
120 | <div data-montage-id="materials_library_tree"></div> | 122 | <div data-montage-id="materials_library_tree"></div> |
121 | </section> | 123 | </section> |
122 | <hr /> | 124 | <hr /> |
123 | <div data-montage-id="ml_buttons" class="ml_buttons"> | 125 | <div data-montage-id="ml_buttons" class="ml_buttons"> |
124 | <button data-montage-id="ml_add_btn" class="nj-skinned">Add</button> | 126 | <button data-montage-id="ml_duplicate_btn" class="nj-skinned ml_duplicate_btn">Duplicate</button> |
125 | <button data-montage-id="ml_copy_btn" class="nj-skinned">Copy</button> | 127 | <button data-montage-id="ml_edit_btn" class="nj-skinned ml_edit_btn">Edit</button> |
126 | <button data-montage-id="ml_delete_btn" class="nj-skinned">Delete</button> | 128 | <button data-montage-id="ml_delete_btn" class="nj-skinned ml_delete_btn">Delete</button> |
127 | </div> | 129 | </div> |
128 | </div> | 130 | </div> |
129 | 131 | ||
130 | </body> | 132 | </body> |
131 | </html> | 133 | </html> |