aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
Commit message (Collapse)AuthorAge
* Timeline: Replace currentSelectedContainer with new model.domContainer.Jon Reid2012-06-15
|
* Merge remote-tracking branch 'ninja-internal/master' into test-mergeJon Reid2012-06-15
|\ | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
| * montage v10 serialization updates for timelineJonathan Duran2012-06-12
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | remove unneeded serializationJonathan Duran2012-06-12
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | montage v10 serialization updates for timelineJonathan Duran2012-06-12
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | repetition fixJonathan Duran2012-05-11
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Merge branch 'refs/heads/TimelineUber' into TimelinePropsJonathan Duran2012-05-11
|\ \
| * | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-09
| |\| | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * Removing unused components referencesValerio Virgillito2012-05-03
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | sub property additionsJonathan Duran2012-05-09
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Change sub property track arraysJonathan Duran2012-05-08
| | | | | | | | | | | | | | | | | | Remove transform section and move width and height into Position section. rename position section Position and Size. additional support for generic prop tweens Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Merge branch 'refs/heads/TimelineUber' into TimelinePropsJonathan Duran2012-05-04
|\| | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | Timeline: Initial keyframe drag-and-drop interaction.Jon Reid2012-05-01
| |/
* | property track additions to serialization data objectJonathan Duran2012-05-04
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | update data bindings for subproperty tracksJonathan Duran2012-05-04
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | apply old stash to new branchJonathan Duran2012-05-03
|/ | | | | | initial work and stubs for sub property support. serialization for property track components and classes Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Merge branch 'refs/heads/serialization'Valerio Virgillito2012-04-27
|\
| * Removing all "module" declarations and replaced with "prototype" in ↵John Mayhew2012-04-26
| | | | | | | | preparation for montage converting to the new "prototype" format fully
* | Timeline: fix layer and style select problems.Jon Reid2012-03-20
|/
* Optimize serialization bindings for Tween componentJonathan Duran2012-03-07
| | | | | | Move all serialized properties of Tween component into on data object with one binding instead of multiple properties with individual bindings Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline: Serialization of all Collapser componentsJon Reid2012-03-02
|
* Timeline: Successfully unbind event listeners in tweens when clearing timeline.Jon Reid2012-02-27
|
* Adding some missing copyrightsValerio Virgillito2012-02-24
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Timeline: Create new PropertyTrack subcomponent, and use it in the ↵Jonathan Duran2012-02-23
| | | | | | | | TimelineTrack component. Cherry pick commit from jreid/Timeline-jreid Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline Reset to clean Master branch. Code scrub.Jonathan Duran2012-02-23
| | | | | | Fresh copy of ninja-internal/master with Timeline folder copied in to resolved merge issues. Signed-off-by: Jonathan Duran <jduran@motorola.com>
* merge new timelineJonathan Duran2012-02-06
Signed-off-by: Jonathan Duran <jduran@motorola.com>