diff options
author | John Mayhew | 2012-07-09 17:28:24 -0700 |
---|---|---|
committer | John Mayhew | 2012-07-09 17:28:24 -0700 |
commit | 770bcb52422742ff741a88a75ecefbeb90bc9247 (patch) | |
tree | 64cb3e09a8daeb340261dd7f3869c73f7b90b643 /js/panels/Timeline/Keyframe.reel/Keyframe.js | |
parent | 8c5ecaf90062f9e030386f338bdc19fd62b826c8 (diff) | |
parent | 2b2b5fbb4b6a786daa4e9d4ee9eba9ac78924842 (diff) | |
download | ninja-770bcb52422742ff741a88a75ecefbeb90bc9247.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Conflicts:
manifest.json
Diffstat (limited to 'js/panels/Timeline/Keyframe.reel/Keyframe.js')
-rw-r--r-- | js/panels/Timeline/Keyframe.reel/Keyframe.js | 91 |
1 files changed, 46 insertions, 45 deletions
diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.js b/js/panels/Timeline/Keyframe.reel/Keyframe.js index 9ded9c76..e261f926 100644 --- a/js/panels/Timeline/Keyframe.reel/Keyframe.js +++ b/js/panels/Timeline/Keyframe.reel/Keyframe.js | |||
@@ -1,24 +1,25 @@ | |||
1 | /* <copyright> | 1 | /* <copyright> |
2 | Copyright (c) 2012, Motorola Mobility, Inc | 2 | Copyright (c) 2012, Motorola Mobility LLC. |
3 | All Rights Reserved. | 3 | All Rights Reserved. |
4 | BSD License. | ||
5 | 4 | ||
6 | Redistribution and use in source and binary forms, with or without | 5 | Redistribution and use in source and binary forms, with or without |
7 | modification, are permitted provided that the following conditions are met: | 6 | modification, 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 | ||
18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 19 | 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 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
20 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
21 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
22 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
23 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
24 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -70,12 +71,12 @@ var Keyframe = exports.Keyframe = Montage.create(Component, { | |||
70 | prepareForDraw:{ | 71 | prepareForDraw:{ |
71 | value:function(){ | 72 | value:function(){ |
72 | this.element.addEventListener("click", this, false); | 73 | this.element.addEventListener("click", this, false); |
73 | 74 | ||
74 | // Drag and drop event handlers | 75 | // Drag and drop event handlers |
75 | this.element.addEventListener("mouseover", this.handleMouseover.bind(this), false); | 76 | this.element.addEventListener("mouseover", this.handleMouseover.bind(this), false); |
76 | this.element.addEventListener("mouseout", this.handleMouseout.bind(this), false); | 77 | this.element.addEventListener("mouseout", this.handleMouseout.bind(this), false); |
77 | this.element.addEventListener("dragstart", this.handleDragstart.bind(this), false); | 78 | this.element.addEventListener("dragstart", this.handleDragstart.bind(this), false); |
78 | this.element.addEventListener("dragend", this.handleDragend.bind(this), false); | 79 | this.element.addEventListener("dragend", this.handleDragend.bind(this), false); |
79 | } | 80 | } |
80 | }, | 81 | }, |
81 | 82 | ||
@@ -124,39 +125,39 @@ var Keyframe = exports.Keyframe = Montage.create(Component, { | |||
124 | ev.stopPropagation(); | 125 | ev.stopPropagation(); |
125 | } | 126 | } |
126 | }, | 127 | }, |
127 | 128 | ||
128 | handleMouseover: { | 129 | handleMouseover: { |
129 | value: function(event) { | 130 | value: function(event) { |
130 | this.element.draggable = true; | 131 | this.element.draggable = true; |
131 | } | 132 | } |
132 | }, | 133 | }, |
133 | handleMouseout: { | 134 | handleMouseout: { |
134 | value: function(event) { | 135 | value: function(event) { |
135 | this.element.draggable = false; | 136 | this.element.draggable = false; |
136 | } | 137 | } |
137 | }, | 138 | }, |
138 | handleDragstart: { | 139 | handleDragstart: { |
139 | value: function(event) { | 140 | value: function(event) { |
140 | //this.parentComponent.parentComponent.dragLayerID = this.layerID; | 141 | //this.parentComponent.parentComponent.dragLayerID = this.layerID; |
141 | event.dataTransfer.setData('Text', 'Keyframe'); | 142 | event.dataTransfer.setData('Text', 'Keyframe'); |
142 | 143 | ||
143 | // Get my index in my track's tween array | 144 | // Get my index in my track's tween array |
144 | var i = 0, | 145 | var i = 0, |
145 | tweenRepetitionLength = this.parentComponent.parentComponent.parentComponent.tweenRepetition.childComponents.length, | 146 | tweenRepetitionLength = this.parentComponent.parentComponent.parentComponent.tweenRepetition.childComponents.length, |
146 | myIndex = null; | 147 | myIndex = null; |
147 | for (i = 0; i < tweenRepetitionLength; i++) { | 148 | for (i = 0; i < tweenRepetitionLength; i++) { |
148 | if (this.parentComponent.parentComponent.parentComponent.tweenRepetition.childComponents[i].uuid === this.parentComponent.uuid) { | 149 | if (this.parentComponent.parentComponent.parentComponent.tweenRepetition.childComponents[i].uuid === this.parentComponent.uuid) { |
149 | myIndex = i; | 150 | myIndex = i; |
150 | } | 151 | } |
151 | } | 152 | } |
152 | this.parentComponent.parentComponent.parentComponent.draggingIndex = myIndex; | 153 | this.parentComponent.parentComponent.parentComponent.draggingIndex = myIndex; |
153 | this.selectKeyframe(); | 154 | this.selectKeyframe(); |
154 | } | 155 | } |
155 | }, | 156 | }, |
156 | handleDragend: { | 157 | handleDragend: { |
157 | value: function(event) { | 158 | value: function(event) { |
158 | this.parentComponent.isDragging = false; | 159 | this.parentComponent.isDragging = false; |
159 | } | 160 | } |
160 | } | 161 | } |
161 | 162 | ||
162 | }); | 163 | }); |