aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel
diff options
context:
space:
mode:
authorJonathan Duran2012-07-09 08:58:33 -0700
committerJonathan Duran2012-07-09 08:58:33 -0700
commitf20b1985dd672d36db1dc61fa30c53d9af6aacef (patch)
tree2086c531d8f884471a2ff33574a93f1d8b40b487 /js/panels/Timeline/Layer.reel
parentd01efeb5918622783f1315136ccdb38f82ad33bb (diff)
parentaedd14b18695d031f695d27dfbd94df5614495bb (diff)
downloadninja-f20b1985dd672d36db1dc61fa30c53d9af6aacef.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Layer.reel')
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.html34
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js2747
-rw-r--r--js/panels/Timeline/Layer.reel/css/Layer.css32
-rw-r--r--js/panels/Timeline/Layer.reel/scss/Layer.scss32
4 files changed, 1494 insertions, 1351 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index 5ee50491..3c471952 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.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" />
@@ -307,4 +331,4 @@
307 </div> 331 </div>
308 </div> 332 </div>
309 </body> 333 </body>
310</html> \ No newline at end of file 334</html>
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index f7b66a39..291e3416 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -1,1339 +1,1410 @@
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
6 6Redistribution and use in source and binary forms, with or without
7var Montage = require("montage/core/core").Montage; 7modification, are permitted provided that the following conditions are met:
8var Component = require("montage/ui/component").Component; 8
9var Hintable = require("js/components/hintable.reel").Hintable; 9 - Redistributions of source code must retain the above copyright notice,
10var nj = require("js/lib/NJUtils").NJUtils; 10 this list of conditions and the following disclaimer.
11var ElementsMediator = require("js/mediators/element-mediator").ElementMediator; 11 - Redistributions in binary form must reproduce the above copyright
12 12 notice, this list of conditions and the following disclaimer in the
13var Layer = exports.Layer = Montage.create(Component, { 13 documentation and/or other materials provided with the distribution.
14 14 - Neither the name of Motorola Mobility nor the names of its contributors
15 /* Begin: Models */ 15 may be used to endorse or promote products derived from this software
16 16 without specific prior written permission.
17 _dynamicLayerTag: { 17
18 value: null 18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19 }, 19AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20 dynamicLayerTag: { 20IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21 serializable: true, 21ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
22 get: function() { 22LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23 return this._dynamicLayerTag; 23CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24 }, 24SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
25 set: function(newVal) { 25INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
26 this._dynamicLayerTag = newVal; 26CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27 } 27ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28 }, 28POSSIBILITY OF SUCH DAMAGE.
29 29</copyright> */
30 _positionCollapser: { 30
31 value: null 31var Montage = require("montage/core/core").Montage;
32 }, 32var Component = require("montage/ui/component").Component;
33 positionCollapser: { 33var Collapser = require("js/panels/Timeline/Collapser").Collapser;
34 serializable: true, 34var Hintable = require("js/components/hintable.reel").Hintable;
35 get: function() { 35var LayerStyle = require("js/panels/Timeline/Style.reel").LayerStyle;
36 return this._positionCollapser; 36var DynamicText = require("montage/ui/dynamic-text.reel").DynamicText;
37 }, 37var defaultEventManager = require("montage/core/event/event-manager").defaultEventManager;
38 set: function(newVal) { 38var nj = require("js/lib/NJUtils").NJUtils;
39 this._positionCollapser = newVal; 39var ElementsMediator = require("js/mediators/element-mediator").ElementMediator;
40 } 40
41 }, 41var Layer = exports.Layer = Montage.create(Component, {
42 42
43 _transformCollapser: { 43 dynamicLayerTag: {
44 value: null 44 value: null,
45 }, 45 serializable: true
46 transformCollapser: { 46 },
47 serializable: true, 47
48 get: function() { 48 positionCollapser: {
49 return this._transformCollapser; 49 value: null,
50 }, 50 serializable: true
51 set: function(newVal) { 51 },
52 this._transformCollapser = newVal; 52
53 } 53 transformCollapser: {
54 }, 54 value: null,
55 55 serializable: true
56 _styleCollapser: { 56 },
57 value: null 57
58 }, 58 styleCollapser: {
59 styleCollapser: { 59 value: null,
60 serializable: true, 60 serializable: true
61 get: function() { 61 },
62 return this._styleCollapser; 62
63 }, 63 clickerMain: {
64 set: function(newVal) { 64 value: null,
65 this._styleCollapser = newVal; 65 serializable: true
66 } 66 },
67 }, 67
68 68 myLabel: {
69 _clickerMain: { 69 value: null,
70 value: null 70 serializable: true
71 }, 71 },
72 clickerMain: { 72
73 serializable: true, 73 /* Begin: Models */
74 get: function() { 74
75 return this._clickerMain; 75 /* Main collapser model: the main collapser for the layer */
76 }, 76 _mainCollapser : {
77 set: function(newVal) { 77 value: false
78 this._clickerMain = newVal; 78 },
79 } 79 mainCollapser: {
80 }, 80 get: function() {
81 81 return this._mainCollapser;
82 _myLabel: { 82 },
83 value: null 83 set: function(newVal) {
84 }, 84 this._mainCollapser = newVal;
85 myLabel: { 85 },
86 serializable: true, 86 serializable: true
87 get: function() { 87 },
88 return this._myLabel; 88
89 }, 89 /* Style models: the array of styles, and the repetition that uses them */
90 set: function(newVal) { 90 _arrLayerStyles : {
91 this._myLabel = newVal; 91 value: []
92 } 92 },
93 }, 93 arrLayerStyles : {
94 94 serializable: true,
95 _mainCollapser : { 95 get: function() {
96 value: false 96 return this._arrLayerStyles;
97 }, 97 },
98 mainCollapser: { 98 set: function(newVal) {
99 get: function() { 99 this._arrLayerStyles = newVal;
100 return this._mainCollapser; 100 }
101 }, 101 },
102 set: function(newVal) { 102 _styleRepetition : {
103 this._mainCollapser = newVal; 103 value: false
104 }, 104 },
105 serializable: true 105 styleRepetition : {
106 }, 106 serializable: true,
107 107 get: function() {
108 _arrLayerStyles : { 108 return this._styleRepetition;
109 value: [] 109 },