diff options
| author | Kruti Shah | 2012-07-09 11:27:16 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-07-09 11:27:16 -0700 |
| commit | 5ad509e46add1b45d15d1c493e18a5c52a462654 (patch) | |
| tree | 93cd416cd7060e3688f33545f70956f787f6886f /js/components/tools-properties | |
| parent | 6e29c88846e12757f127f0ce8e8cbb737ab8c880 (diff) | |
| parent | 39aa69624e1e3b8598b0242ee6ec436862b67280 (diff) | |
| download | ninja-5ad509e46add1b45d15d1c493e18a5c52a462654.tar.gz | |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-RefactorCode
Conflicts:
js/panels/Timeline/PropertyTrack.reel/PropertyTrack.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
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/components/tools-properties')
54 files changed, 1530 insertions, 234 deletions
diff --git a/js/components/tools-properties/binding-properties.reel/binding-properties.css b/js/components/tools-properties/binding-properties.reel/binding-properties.css index 19d2b6c6..6e59954a 100755 --- a/js/components/tools-properties/binding-properties.reel/binding-properties.css +++ b/js/components/tools-properties/binding-properties.reel/binding-properties.css | |||
| @@ -1,8 +1,32 @@ | |||
| 1 | /* <copyright> | 1 | /* <copyright> |
| 2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 2 | Copyright (c) 2012, Motorola Mobility, Inc |
| 3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 3 | All Rights Reserved. |
| 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | BSD License. |
| 5 | </copyright> */ | 5 | |
| 6 | Redistribution and use in source and binary forms, with or without | ||
| 7 | modification, are permitted provided that the following conditions are met: | ||
| 8 | |||
| 9 | - Redistributions of source code must retain the above copyright notice, | ||
| 10 | this list of conditions and the following disclaimer. | ||
| 11 | - Redistributions in binary form must reproduce the above copyright | ||
| 12 | notice, this list of conditions and the following disclaimer in the | ||
| 13 | documentation and/or other materials provided with the distribution. | ||
| 14 | - Neither the name of Motorola Mobility nor the names of its contributors | ||
| 15 | may be used to endorse or promote products derived from this software | ||
| 16 | without specific prior written permission. | ||
| 17 | |||
| 18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| 19 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 20 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 21 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | ||
| 22 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| 23 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| 24 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| 25 | INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| 26 | CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| 27 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
| 28 | POSSIBILITY OF SUCH DAMAGE. | ||
| 29 | </copyright> */ | ||
| 6 | 30 | ||
| 7 | .bindingSubTools { | 31 | .bindingSubTools { |
| 8 | padding:9px; | 32 | padding:9px; |
| @@ -14,4 +38,4 @@ | |||
| 14 | } | 38 | } |
| 15 | .bindingSubTools input[type=checkbox] { | 39 | .bindingSubTools input[type=checkbox] { |
| 16 | margin: 0px 3px; | 40 | margin: 0px 3px; |
| 17 | } \ No newline at end of file | 41 | } |
diff --git a/js/components/tools-properties/binding-properties.reel/binding-properties.html b/js/components/tools-properties/binding-properties.reel/binding-properties.html index cd0e0a50..8271ff20 100755 --- a/js/components/tools-properties/binding-properties.reel/binding-properties.html +++ b/js/components/tools-properties/binding-properties.reel/binding-properties.html | |||
| @@ -1,9 +1,33 @@ | |||
| 1 | <!DOCTYPE HTML> | 1 | <!DOCTYPE HTML> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | All Rights Reserved. |
| 5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 5 | BSD License. |
| 6 | </copyright> --> | 6 | |
| 7 | Redistribution and use in source and binary forms, with or without | ||
| 8 | modification, are permitted provided that the following conditions are met: | ||
| 9 | |||
| 10 | - Redistributions of source code must retain the above copyright notice, | ||
| 11 | this list of conditions and the following disclaimer. | ||
| 12 | - Redistributions in binary form must reproduce the above copyright | ||
| 13 | notice, this list of conditions and the following disclaimer in the | ||
| 14 | documentation and/or other materials provided with the distribution. | ||
| 15 | - Neither the name of Motorola Mobility nor the names of its contributors | ||
| 16 | may be used to endorse or promote products derived from this software | ||
| 17 | without specific prior written permission. | ||
| 18 | |||
| 19 | 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 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | ||
| 23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| 24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| 25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| 26 | INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| 27 | CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| 28 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
| 29 | POSSIBILITY OF SUCH DAMAGE. | ||
| 30 | </copyright> --> | ||
| 7 | <html> | 31 | <html> |
| 8 | <head> | 32 | <head> |
| 9 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 33 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
| @@ -32,4 +56,4 @@ | |||
| 32 | 56 | ||
| 33 | </html> | 57 | </html> |
| 34 | 58 | ||
| 35 | \ No newline at end of file | 59 | |
diff --git a/js/components/tools-properties/binding-properties.reel/binding-properties.js b/js/components/tools-properties/binding-properties.reel/binding-properties.js index 8d30d855..5d7138b4 100755 --- a/js/components/tools-properties/binding-properties.reel/binding-properties.js +++ b/js/components/tools-properties/binding-properties.reel/binding-properties.js | |||
| @@ -1,7 +1,31 @@ | |||
| 1 | /* <copyright> | 1 | /* <copyright> |
| 2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 2 | Copyright ( |