aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel
Commit message (Collapse)AuthorAge
* Timeline: Fix TODOs for consolidating repetition objects.Jon Reid2012-03-02
|
* 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>
* Fix for selection change event handlerJonathan Duran2012-03-01
| | | | | | event handler wasn't being executed because of incorrect handler function name 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.
* Timeline: Merge. Set collapser heights.Jon Reid2012-03-01
|
* Merge branch 'Timeline-main' into Timeline-newdocJon Reid2012-03-01
|\
| * 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: Document switching and code restructuring.Jon Reid2012-03-01
| |
* | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-newdocJon Reid2012-02-29
|\| | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
| * 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>
* | Timeline: document switching + new document.Jon Reid2012-02-29
|/
* Timeline : Deleting Layer deletes the element, Deleting Layer selects ↵Jonathan Duran2012-02-28
| | | | | | | another layer Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Fix element selection on open docJonathan Duran2012-02-28
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline: Basic document switching.Jon Reid2012-02-28
|
* Timeline: Successfully unbind event listeners in tweens when clearing timeline.Jon Reid2012-02-27
|
* Timeline: try to clean up bogus events manually.Jon Reid2012-02-27
|
* Timeline: More work on clear timeline method.Jon Reid2012-02-27
|
* Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-localJon Reid2012-02-27
|\
| * Timeline : Reopening Doc has layer 1 default fixJonathan Duran2012-02-27
| | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> 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>
| * Merge branch 'refs/heads/integration-candidate' into TimelineJonathan Duran2012-02-27
| |\
| | * clearing the old local setting and using the new version/prefix local settings.Valerio Virgillito2012-02-24
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Timeline : Selection FixJonathan Duran2012-02-27
| | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Timeline: further work on clearTimeline method.Jon Reid2012-02-27
|/ /
* | Timeline: Add grids to property tracks. First take on clearTimeline method ↵Jon Reid2012-02-24
| | | | | | | | on TimelinePanel class.
* | 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>
* | Timeline: Add hottext fields to layers and serialize them throughout.Jon Reid2012-02-23
| |
* | add back layer selectionJonathan Duran2012-02-23
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Remove unneeded selection codeJonathan Duran2012-02-23
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Move element selection to click handlerJonathan Duran2012-02-23
|/ | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Remove selection calls from timelinepanel.jsJonathan 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>
* New DocJonathan Duran2012-02-23
| | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline:Open Doc in TimelinePanel.jsJonathan Duran2012-02-23
| | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Unterminated linesJonathan Duran2012-02-23
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Redo timeline resize codeJonathan Duran2012-02-23
| | | | 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>
* Removing the timeline selection code.Valerio Virgillito2012-02-20
| | | | | | Timeline selection code is now handled by the selection controller and current container change Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-10
|\ | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html
| * Fix layer/element selection on first click selectJonathan Duran2012-02-09
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Squashed commit of the following:Jonathan Duran2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit fe0d1578305db78eb5a744c354dbbb3cec67be2a Author: Kruti Shah <kruti.shah@motorola.com> Date: Thu Feb 9 11:43:53 2012 -0800 Removing a flag Signed-off-by: Kruti Shah <kruti.shah@motorola.com> commit 7a7e5d9a07c85a9a35297efe74f8b45bc4bd3c62 Author: Kruti Shah <kruti.shah@motorola.com> Date: Thu Feb 9 11:42:39 2012 -0800 Timeline : Selection Handling depending on layer selected Signed-off-by: Kruti Shah <kruti.shah@motorola.com> commit d0a4d88ddef2f1690da490cf8f3d167f1eb01945 Merge: ad214f9 f6ad57e Author: Kruti Shah <kruti.shah@motorola.com> Date: Thu Feb 9 09:54:42 2012 -0800 Merge branch 'refs/heads/Timeline' into Timeline_updated Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com> commit ad214f9b5bc19c43eac39e4c9d93cd9645aed2ea Author: Kruti Shah <kruti.shah@motorola.com> Date: Thu Feb 9 09:40:14 2012 -0800 Timeline : When element selected the corresponding layer highlights Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * CleanupJonathan 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>
| * Merge branch 'refs/heads/Timeline_updated' into TimelineJonathan Duran2012-02-08
| |\
| | * Numbering of layers between different selectedContainers starts from 1Kruti Shah2012-02-08
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@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>
| * Merge branch 'refs/heads/Timeline-jreid' into TimelineJonathan Duran2012-02-08
| |\
| | * Timeline: restore method incorrectly removed in last commit.Jon Reid2012-02-08
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 06:00:15 +0000