aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-07-09 11:52:02 -0700
committerNivesh Rajbhandari2012-07-09 11:52:02 -0700
commitfebfdb18042d1c73ac58ee4e35c5f176428dee00 (patch)
tree516a29ca99d4aae0d5228223fff438c1a3c4e0d3 /js/panels/Timeline
parentac27d538af33ca8d67d3d88729f49c05793afda7 (diff)
parentaedd14b18695d031f695d27dfbd94df5614495bb (diff)
downloadninja-febfdb18042d1c73ac58ee4e35c5f176428dee00.tar.gz
Merge branch 'refs/heads/ninja-internal' into MaterialsUI
Conflicts: js/panels/Materials/materials-library-panel.reel/materials-library-panel.css js/panels/Materials/materials-popup.reel/materials-popup.css Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r--js/panels/Timeline/Collapser.js34
-rw-r--r--js/panels/Timeline/DragDrop.js32
-rw-r--r--js/panels/Timeline/EasingMenu.reel/EasingMenu.html34
-rw-r--r--js/panels/Timeline/EasingMenu.reel/EasingMenu.js32
-rw-r--r--js/panels/Timeline/EasingMenu.reel/css/EasingMenu.css32
-rw-r--r--js/panels/Timeline/EasingMenu.reel/scss/EasingMenu.scss34
-rw-r--r--js/panels/Timeline/Keyframe.reel/Keyframe.html34
-rw-r--r--js/panels/Timeline/Keyframe.reel/Keyframe.js32
-rw-r--r--js/panels/Timeline/Keyframe.reel/css/Keyframe.css34
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.html34
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js32
-rw-r--r--js/panels/Timeline/Layer.reel/css/Layer.css32
-rw-r--r--js/panels/Timeline/Layer.reel/scss/Layer.scss32
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html34
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js32
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css32
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss34
-rw-r--r--js/panels/Timeline/Span.reel/Span.html34
-rw-r--r--js/panels/Timeline/Span.reel/Span.js32
-rw-r--r--js/panels/Timeline/Span.reel/css/Span.css32
-rw-r--r--js/panels/Timeline/Span.reel/scss/Span.scss32
-rw-r--r--js/panels/Timeline/Style.reel/Style.html34
-rw-r--r--js/panels/Timeline/Style.reel/Style.js34
-rw-r--r--js/panels/Timeline/Style.reel/css/Style.css32
-rw-r--r--js/panels/Timeline/Style.reel/scss/Style.scss32
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html32
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js34
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css30
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss32
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html34
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js32
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css32
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss32
-rw-r--r--js/panels/Timeline/Track.reel/Track.html34
-rw-r--r--js/panels/Timeline/Track.reel/Track.js34
-rw-r--r--js/panels/Timeline/Track.reel/css/Track.css34
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html34
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js32
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css34
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.html34
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js32
-rw-r--r--js/panels/Timeline/Tween.reel/css/Tween.css34
42 files changed, 1197 insertions, 185 deletions
diff --git a/js/panels/Timeline/Collapser.js b/js/panels/Timeline/Collapser.js
index 42bbbb86..41aa8f39 100644
--- a/js/panels/Timeline/Collapser.js
+++ b/js/panels/Timeline/Collapser.js
@@ -1,8 +1,32 @@
1/* <copyright> 1/* <copyright>
2 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 2Copyright (c) 2012, Motorola Mobility, Inc
3 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 3All Rights Reserved.
4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 4BSD License.
5 </copyright> */ 5
6Redistribution and use in source and binary forms, with or without
7modification, 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
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
22LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
25INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
26CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28POSSIBILITY OF SUCH DAMAGE.
29</copyright> */
6 30
7/* 31/*
8 * Collapser: Takes two elements and creates a visual "expando:" clicking on one element expands/collapses the other. 32 * Collapser: Takes two elements and creates a visual "expando:" clicking on one element expands/collapses the other.
@@ -352,4 +376,4 @@ var Montage = require("montage/core/core").Montage,
352 } 376 }
353 377
354 /* === END: Event handlers === */ 378 /* === END: Event handlers === */
355}); \ No newline at end of file 379});
diff --git a/js/panels/Timeline/DragDrop.js b/js/panels/Timeline/DragDrop.js
index 55ee3ab4..739eac93 100644
--- a/js/panels/Timeline/DragDrop.js
+++ b/js/panels/Timeline/DragDrop.js
@@ -1,7 +1,31 @@
1/* <copyright> 1/* <copyright>
2This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 2Copyright (c) 2012, Motorola Mobility, Inc
3No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 3All Rights Reserved.
4(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 4BSD License.
5
6Redistribution and use in source and binary forms, with or without
7modification, 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
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
22LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
25INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
26CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28POSSIBILITY OF SUCH DAMAGE.
5</copyright> */ 29</copyright> */
6 30
7var Montage = require("montage/core/core").Montage; 31var Montage = require("montage/core/core").Montage;
@@ -133,4 +157,4 @@ exports.DragDropComposer = Montage.create(Composer, {
133 } 157 }
134 } 158 }
135 159
136}); \ No newline at end of file 160});
diff --git a/js/panels/Timeline/EasingMenu.reel/EasingMenu.html b/js/panels/Timeline/EasingMenu.reel/EasingMenu.html
index 1c8f808f..dcf35d8f 100644
--- a/js/panels/Timeline/EasingMenu.reel/EasingMenu.html
+++ b/js/panels/Timeline/EasingMenu.reel/EasingMenu.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/> 3Copyright (c) 2012, Motorola Mobility, Inc
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4All Rights Reserved.
5 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 5BSD License.
6 </copyright> --> 6
7Redistribution and use in source and binary forms, with or without
8modification, 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
19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29POSSIBILITY OF SUCH DAMAGE.
30</copyright> -->
7<html lang="en"> 31<html lang="en">
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 </ul> 56 </ul>
33 </div> 57 </div>
34 </body> 58 </body>
35</html> \ No newline at end of file 59</html>
diff --git a/js/panels/Timeline/EasingMenu.reel/EasingMenu.js b/js/panels/Timeline/EasingMenu.reel/EasingMenu.js
index ced3ae6a..6d41afb0 100644
--- a/js/panels/Timeline/EasingMenu.reel/EasingMenu.js
+++ b/js/panels/Timeline/EasingMenu.reel/EasingMenu.js
@@ -1,8 +1,32 @@
1/* <copyright> 1/* <copyright>
2 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 2Copyright (c) 2012, Motorola Mobility, Inc