aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel
diff options
context:
space:
mode:
authorKruti Shah2012-07-17 12:40:00 -0700
committerKruti Shah2012-07-17 12:40:00 -0700
commitbf2d7bdb22c28089dc1067bc9094ebc590daac87 (patch)
tree2156d9920ea1b7db49ed6460545fea7cda121bae /js/panels/properties.reel
parent7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff)
parentb4b3e45d6684e77d361b4f8ca5be4889428320c5 (diff)
downloadninja-bf2d7bdb22c28089dc1067bc9094ebc590daac87.tar.gz
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/panels/properties.reel')
-rwxr-xr-xjs/panels/properties.reel/properties.css33
-rwxr-xr-xjs/panels/properties.reel/properties.html29
-rwxr-xr-xjs/panels/properties.reel/properties.js93
-rwxr-xr-xjs/panels/properties.reel/section.reel/section.html23
-rwxr-xr-xjs/panels/properties.reel/section.reel/section.js23
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html23
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.js23
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html25
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.js23
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html25
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.js23
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.html25
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.js55
-rwxr-xr-xjs/panels/properties.reel/sections/position-size.reel/position-size.css23
-rwxr-xr-xjs/panels/properties.reel/sections/position-size.reel/position-size.html23
-rwxr-xr-xjs/panels/properties.reel/sections/position-size.reel/position-size.js23
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.html23
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.js25
18 files changed, 279 insertions, 261 deletions
diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css
index 3c6b1a61..a8cb3f06 100755
--- a/js/panels/properties.reel/properties.css
+++ b/js/panels/properties.reel/properties.css
@@ -1,24 +1,25 @@
1/* <copyright> 1/* <copyright>
2Copyright (c) 2012, Motorola Mobility, Inc 2Copyright (c) 2012, Motorola Mobility LLC.
3All Rights Reserved. 3All Rights Reserved.
4BSD License.
5 4
6Redistribution and use in source and binary forms, with or without 5Redistribution and use in source and binary forms, with or without
7modification, are permitted provided that the following conditions are met: 6modification, are permitted provided that the following conditions are met:
8 7
9 - Redistributions of source code must retain the above copyright notice, 8* Redistributions of source code must retain the above copyright notice,
10 this list of conditions and the following disclaimer. 9 this list of conditions and the following disclaimer.
11 - Redistributions in binary form must reproduce the above copyright 10
12 notice, this list of conditions and the following disclaimer in the 11* Redistributions in binary form must reproduce the above copyright notice,
13 documentation and/or other materials provided with the distribution. 12 this list of conditions and the following disclaimer in the documentation
14 - Neither the name of Motorola Mobility nor the names of its contributors 13 and/or other materials provided with the distribution.
15 may be used to endorse or promote products derived from this software 14
16 without specific prior written permission. 15* Neither the name of Motorola Mobility LLC nor the names of its
16 contributors may be used to endorse or promote products derived from this
17 software without specific prior written permission.
17 18
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
22LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -121,7 +122,7 @@ padding-right:6px;
121.propertiesPanel .fieldRow.twoCol label { 122.propertiesPanel .fieldRow.twoCol label {
122 width:74px; 123 width:74px;
123 display: inline-block; 124 display: inline-block;
124 125
125} 126}
126 127
127.propertiesPanel .fieldRow.oneCol label { 128.propertiesPanel .fieldRow.oneCol label {
@@ -276,10 +277,10 @@ padding-right:6px;
276} 277}
277 278
278.propertiesPanel .colortoolbar .chipContainer { 279.propertiesPanel .colortoolbar .chipContainer {
279 margin-top: 2px; 280 margin-top: 2px;
280 background: url(../../../../../images/colorpanel/transparent.png) repeat; 281 background: url(../../../../../images/colorpanel/transparent.png) repeat;
281 width: 40px; 282 width: 40px;
282 height: 20px; 283 height: 20px;
283} 284}
284 285
285.propertiesPanel .button:active { 286.propertiesPanel .button:active {
diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html
index 5ec78c05..6b6ff828 100755
--- a/js/panels/properties.reel/properties.html
+++ b/js/panels/properties.reel/properties.html
@@ -1,25 +1,26 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility LLC.
4All Rights Reserved. 4All Rights Reserved.
5BSD License.
6 5
7Redistribution and use in source and binary forms, with or without 6Redistribution and use in source and binary forms, with or without
8modification, are permitted provided that the following conditions are met: 7modification, 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
19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 20THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 21AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 22IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 23ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 24LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 25CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 26SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -30,7 +31,7 @@ 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" href="properties.css" type="text/css"> 35 <link rel="stylesheet" href="properties.css" type="text/css">
35 <script type="text/montage-serialization"> 36 <script type="text/montage-serialization">
36 { 37 {
@@ -127,8 +128,8 @@ POSSIBILITY OF SUCH DAMAGE.
127 "threeD": {"@": "threeDProperties"} 128 "threeD": {"@": "threeDProperties"}
128 } 129 }
129 } 130 }
130 } 131 }
131 </script> 132 </script>
132</head> 133</head>
133<body> 134<body>
134 <section data-montage-id="propertiesPanel" class="propertiesPanel"> 135 <section data-montage-id="propertiesPanel" class="propertiesPanel">
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index b83ae170..43a1f675 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -1,24 +1,25 @@
1/* <copyright> 1/* <copyright>
2Copyright (c) 2012, Motorola Mobility, Inc 2Copyright (c) 2012, Motorola Mobility LLC.
3All Rights Reserved. 3All Rights Reserved.
4BSD License.
5 4
6Redistribution and use in source and binary forms, with or without 5Redistribution and use in source and binary forms, with or without
7modification, are permitted provided that the following conditions are met: 6modification, are permitted provided that the following conditions are met:
8 7
9 - Redistributions of source code must retain the above copyright notice, 8* Redistributions of source code must retain the above copyright notice,
10 this list of conditions and the following disclaimer. 9 this list of conditions and the following disclaimer.
11 - Redistributions in binary form must reproduce the above copyright 10
12 notice, this list of conditions and the following disclaimer in the 11* Redistributions in binary form must reproduce the above copyright notice,
13 documentation and/or other materials provided with the distribution. 12 this list of conditions and the following disclaimer in the documentation
14 - Neither the name of Motorola Mobility nor the names of its contributors 13 and/or other materials provided with the distribution.
15 may be used to endorse or promote products derived from this software 14
16 without specific prior written permission. 15* Neither the name of Motorola Mobility LLC nor the names of its
16 contributors may be used to endorse or promote products derived from this
17 software without specific prior written permission.
17 18
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
22LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -163,12 +164,12 @@ exports.Properties = Montage.create(Component, {
163 NJevent("updatedID",this.application.ninja.selectedElements[0]); 164 NJevent("updatedID",this.application.ninja.selectedElements[0]);
164 }