diff options
author | Jonathan Duran | 2012-05-04 22:32:38 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-04 22:32:38 -0700 |
commit | 9f71f7804bd649dbfb9078cc0bef562530738e6f (patch) | |
tree | da5d4aa2f894e840dd044d890e0d0cae6c7c2843 /js/panels/Timeline/Tween.reel/Tween.js | |
parent | eaef072648eb539e648aabf7bc1aea8d02c21085 (diff) | |
parent | 2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff) | |
download | ninja-9f71f7804bd649dbfb9078cc0bef562530738e6f.tar.gz |
Merge branch 'refs/heads/TimelineUber' into TimelineProps
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Tween.reel/Tween.js')
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index 45714079..c733b8d7 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js | |||
@@ -132,6 +132,20 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
132 | this._isTweenAnimated = value; | 132 | this._isTweenAnimated = value; |
133 | } | 133 | } |
134 | }, | 134 | }, |
135 | |||
136 | _isDragging: { | ||
137 | value: false | ||
138 | }, | ||
139 | isDragging: { | ||
140 | serializable: true, | ||
141 | get:function () { | ||
142 | return this._isDragging; | ||
143 | }, | ||
144 | set:function (newVal) { | ||
145 | this._isDragging = newVal; | ||
146 | } | ||
147 | |||
148 | }, | ||
135 | 149 | ||
136 | 150 | ||
137 | draw:{ | 151 | draw:{ |