aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Commit message (Collapse)AuthorAge
...
* Timeline bug fixes and cleanupJonathan Duran2012-03-01
| | | | | | Deselect tweens on every selection change. Replace JS alerts with console logs. Cleanup obsolete models and references. Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline: Merge arrlayers and arrtracks into one object.Jon Reid2012-03-01
| | | | Redefine collapser to use property binding instead of events.
* Merge branch 'Timeline-main' into Timeline-localJon Reid2012-03-01
|\
| * Set doc dirty flag when adding tweens or modifying animationsJonathan Duran2012-03-01
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Update master track on duration change instead of tween add.Jonathan Duran2012-03-01
| | | | | | | | | | | | Adds support for updating the master track duration on file open as well as when adding tweens to already opened files. Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Timeline: Track Duration FixJonathan Duran2012-03-01
| | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Timeline: efficiency improvements to collapser. Document switching.Jon Reid2012-03-01
| |
* | Timeline: Merge. Set collapser heights.Jon Reid2012-03-01
|/
* Timeline:Revert back to earlier codeKruti Shah2012-02-29
| | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* TImeline: CleanupKruti Shah2012-02-29
| | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* Timeline: Changed the variables names to resolve issues.And removed the alert.Kruti Shah2012-02-29
| | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* Timeline: Fix Selection , Partially Fix adding element to an already ↵Kruti Shah2012-02-28
| | | | | | animated track with one element Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* Fix to animation names to support multiclassed elementsJonathan Duran2012-02-28
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* remove commentJonathan Duran2012-02-28
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* todo noteJonathan Duran2012-02-28
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Fix re-reopened animation duration and millisecondsJonathan Duran2012-02-28
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline: RetrieveStoredTweens calling fixedJonathan Duran2012-02-27
| | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline: Order of tweens and corresponding layers taken care overJonathan Duran2012-02-25
| | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline : Adding Tweens PropertiesJonathan Duran2012-02-25
| | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline: Bug fixes: Delete corresponding track when a style is deleted from ↵Jon Reid2012-02-24
| | | | a layer, and fix serialization variable problem.
* Merge remote-tracking branch 'ninja-internal/master' into Timeline-localJon Reid2012-02-24
|\
| * Adding some missing copyrightsValerio Virgillito2012-02-24
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge remote-tracking branch 'ninja-internal/master' into Timeline-localJon Reid2012-02-23
|\| | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
| * Timeline : Fix for the split and element model errorKruti Shah2012-02-23
| | | | | | | | | | | | Timeline Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | Timeline: Add hottext fields to layers and serialize them throughout.Jon Reid2012-02-23
|/
* Fix for tween repetition arrays getting overwritten on file openJonathan Duran2012-02-23
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline: Reopen Doc Restore TimeLineJonathan Duran2012-02-23
| | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline Track Open docJonathan Duran2012-02-23
| | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@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>
* Fixes for animation element assignmentJonathan Duran2012-02-09
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Cleaning up more code and adding more models for timelineJonathan Duran2012-02-09
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Display time reading above layers and code clean upJonathan Duran2012-02-08
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Squashed commit of the following:Jonathan Duran2012-02-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 46292bddbfbe7415c6852142dd10fd02a276722a Author: Jon Reid <tjh487@motorola.com> Date: Wed Feb 8 14:32:22 2012 -0800 Timeline: turn off console logging. commit b8de88393182bc6e819c3d6a290ade2f804236ac Merge: e651344 37b952c Author: Jon Reid <tjh487@motorola.com> Date: Wed Feb 8 14:10:06 2012 -0800 Merge branch 'Timeline-jduran' into Timeline-jreid commit e651344d5d6c2911b31a54510c65a349c4d52db2 Author: Jon Reid <tjh487@motorola.com> Date: Wed Feb 8 14:08:25 2012 -0800 Timeline: Bug fixes IKNINJA-947: Weird behavior with adding layers with an empty layer name selected IKNINJA-990: Multiple styles can be highlighted at the same time even when they are under different layers IKNINJA-1063: Styles can be added while style column is collapsed IKNINJA-970: When there is no style added yet, the arrow sign should be in a collapsed mode Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Hookup track animations to layer elementJonathan Duran2012-02-07
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* merge new timelineJonathan Duran2012-02-06
Signed-off-by: Jonathan Duran <jduran@motorola.com>