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>
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-popup.reel/materials-popup.html
parent: 7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff)
parent: 5146f224258929415adf4a8022e492454b4e2476 (diff)
download: ninja-53051672a62208fbc96957719d8285fac6431ed6.tar.gz
1 files changed, 45 insertions, 22 deletions
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html
index b377fa2d..cd6a50fd 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.html
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.html
@@ -1,25 +1,26 @@
 <!DOCTYPE html>
 <!-- <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
+Copyright (c) 2012, Motorola Mobility LLC.
 All Rights Reserved.
-BSD License.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
-  - Redistributions of source code must retain the above copyright notice,
+* Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
+  this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
+* Redistributions in binary form must reproduce the above copyright notice,
-    documentation and/or other materials provided with the distribution.
+  this list of conditions and the following disclaimer in the documentation
-  - Neither the name of Motorola Mobility nor the names of its contributors
+  and/or other materials provided with the distribution.
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
+* Neither the name of Motorola Mobility LLC nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -29,13 +30,13 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> -->
 <html lang="en">
-        <head>
+    <head>
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        <link rel="stylesheet" type="text/css" href="materials-popup.css">
+        <link rel="stylesheet" type="text/css" href="materials-popup.css">
-                <script type="text/montage-serialization">
+        <script type="text/montage-serialization">
        {
            "okButton": {
                "prototype": "montage/ui/button.reel",
@@ -51,6 +52,21 @@ POSSIBILITY OF SUCH DAMAGE.
                    "label": "Cancel"
                }
            },
+            "saveAsButton": {
+                "prototype": "montage/ui/button.reel",
+                "properties": {
+                    "element": {"#": "mp_saveAs_btn"},
+                    "label": "Save As..."
+                }
+            },
+            "resetButton": {
+                "prototype": "montage/ui/button.reel",
+                "properties": {
+                    "element": {"#": "mp_reset_btn"},
+                    "label": "Reset",
+                    "enabled": false
+                }
+            },
            "eventDelegator": {
                "prototype": "montage/core/event/action-event-listener",
                "properties": {
@@ -103,28 +119,35 @@ POSSIBILITY OF SUCH DAMAGE.
                    "element": {"#": "materials_popup"},
                    "okButton": {"@": "okButton"},
                    "cancelButton": {"@": "cancelButton"},
-                    "materialTitle": {"#": "mp_title"}
+                    "saveAsButton": {"@": "saveAsButton"},
+                    "resetButton": {"@": "resetButton"},
+                    "materialTitle": {"#": "mp_title"},
+                    "previewCanvas": {"#": "mp_preview_canvas"}
                }
            }
        }
    </script>
-        </head>
+    </head>
-        <body>
+    <body>
-        <div data-montage-id="materials_popup" class="materials_popup">
+        <div data-montage-id="materials_popup" class="materials_popup">
            <div data-montage-id="mp_title" class="mp_title">Material Name</div>
            <hr />
-                <div data-montage-id="mp_preview" class="mp_preview">Preview Pane</div>
+                <div data-montage-id="mp_preview" class="mp_preview">
+                <canvas data-montage-id="mp_preview_canvas" width="200" height="100"/>
+            </div>
            <hr />
            <div data-montage-id="mp_properties_list" class="mp_properties_list">
                <div data-montage-id="mp_property" class="mp_property"></div>
            </div>
+            <button data-montage-id="mp_reset_btn" class="mp_reset_btn nj-skinned"></button>
            <hr />
            <div data-montage-id="mp_buttons" class="mp_buttons">
                <button data-montage-id="mp_cancel_btn" class="mp_cancel_btn nj-skinned"></button>
                <button data-montage-id="mp_ok_btn" class="mp_ok_btn nj-skinned"></button>
+                <button data-montage-id="mp_saveAs_btn" class="mp_saveAs_btn nj-skinned"></button>
            </div>
-        </div>
+        </div>
-        </body>
+    </body>
 </html>
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-popup.reel/materials-popup.html
parent	7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff)
parent	5146f224258929415adf4a8022e492454b4e2476 (diff)
download	ninja-53051672a62208fbc96957719d8285fac6431ed6.tar.gz

diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html index b377fa2d..cd6a50fd 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.html +++ b/js/panels/Materials/materials-popup.reel/materials-popup.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,13 +30,13 @@ 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		34
34	<meta http-equiv="content-type" content="text/html; charset=utf-8" />	35	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
35		36
36	<link rel="stylesheet" type="text/css" href="materials-popup.css">	37	<link rel="stylesheet" type="text/css" href="materials-popup.css">
37		38
38	<script type="text/montage-serialization">	39	<script type="text/montage-serialization">
39	{	40	{
40	"okButton": {	41	"okButton": {
41	"prototype": "montage/ui/button.reel",	42	"prototype": "montage/ui/button.reel",
@@ -51,6 +52,21 @@ POSSIBILITY OF SUCH DAMAGE.
51	"label": "Cancel"	52	"label": "Cancel"
52	}	53	}
53	},	54	},
		55	"saveAsButton": {
		56	"prototype": "montage/ui/button.reel",
		57	"properties": {
		58	"element": {"#": "mp_saveAs_btn"},
		59	"label": "Save As..."
		60	}
		61	},
		62	"resetButton": {
		63	"prototype": "montage/ui/button.reel",
		64	"properties": {
		65	"element": {"#": "mp_reset_btn"},
		66	"label": "Reset",
		67	"enabled": false
		68	}
		69	},
54	"eventDelegator": {	70	"eventDelegator": {
55	"prototype": "montage/core/event/action-event-listener",	71	"prototype": "montage/core/event/action-event-listener",
56	"properties": {	72	"properties": {
@@ -103,28 +119,35 @@ POSSIBILITY OF SUCH DAMAGE.
103	"element": {"#": "materials_popup"},	119	"element": {"#": "materials_popup"},
104	"okButton": {"@": "okButton"},	120	"okButton": {"@": "okButton"},
105	"cancelButton": {"@": "cancelButton"},	121	"cancelButton": {"@": "cancelButton"},
106	"materialTitle": {"#": "mp_title"}	122	"saveAsButton": {"@": "saveAsButton"},
		123	"resetButton": {"@": "resetButton"},
		124	"materialTitle": {"#": "mp_title"},
		125	"previewCanvas": {"#": "mp_preview_canvas"}
107	}	126	}
108	}	127	}
109	}	128	}
110	</script>	129	</script>
111		130
112	</head>	131	</head>
113		132
114	<body>	133	<body>
115	<div data-montage-id="materials_popup" class="materials_popup">	134	<div data-montage-id="materials_popup" class="materials_popup">
116	<div data-montage-id="mp_title" class="mp_title">Material Name</div>	135	<div data-montage-id="mp_title" class="mp_title">Material Name</div>
117	<hr />	136	<hr />
118	<div data-montage-id="mp_preview" class="mp_preview">Preview Pane</div>	137	<div data-montage-id="mp_preview" class="mp_preview">
		138	<canvas data-montage-id="mp_preview_canvas" width="200" height="100"/>
		139	</div>
119	<hr />	140	<hr />
120	<div data-montage-id="mp_properties_list" class="mp_properties_list">	141	<div data-montage-id="mp_properties_list" class="mp_properties_list">
121	<div data-montage-id="mp_property" class="mp_property"></div>	142	<div data-montage-id="mp_property" class="mp_property"></div>
122	</div>	143	</div>
		144	<button data-montage-id="mp_reset_btn" class="mp_reset_btn nj-skinned"></button>
123	<hr />	145	<hr />
124	<div data-montage-id="mp_buttons" class="mp_buttons">	146	<div data-montage-id="mp_buttons" class="mp_buttons">
125	<button data-montage-id="mp_cancel_btn" class="mp_cancel_btn nj-skinned"></button>	147	<button data-montage-id="mp_cancel_btn" class="mp_cancel_btn nj-skinned"></button>
126	<button data-montage-id="mp_ok_btn" class="mp_ok_btn nj-skinned"></button>	148	<button data-montage-id="mp_ok_btn" class="mp_ok_btn nj-skinned"></button>
		149	<button data-montage-id="mp_saveAs_btn" class="mp_saveAs_btn nj-skinned"></button>
127	</div>	150	</div>
128	</div>	151	</div>
129	</body>	152	</body>
130	</html>	153	</html>