aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/PropertyTrack.reel
Commit message (Collapse)AuthorAge
* fixing the copyrights on the timeline branch pull request.Valerio Virgillito2012-07-18
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-17
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/DragDrop.js js/panels/Timeline/Keyframe.reel/Keyframe.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js js/panels/Timeline/Span.reel/Span.js js/panels/Timeline/Style.reel/Style.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js js/panels/Timeline/Track.reel/Track.html js/panels/Timeline/Track.reel/Track.js js/panels/Timeline/Track.reel/css/Track.css js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css js/panels/Timeline/Tween.reel/Tween.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * fixed incorrect capitalization for DOCTYPE htmlJohn Mayhew2012-07-09
| |
| * Normalize HTML DOCTYPEKris Kowal2012-07-09
| | | | | | | | | | | | | | Was lower-case. Now upper-case. Also fixed BOMs, trailing white-space, DOS line terminators. Did not expand tabs to spaces.
| * BSD LicenseKris Kowal2012-07-09
| |
| * Normalize HTML doctypeKris Kowal2012-07-06
| |
| * Remove byte order markers (BOM)Kris Kowal2012-07-06
| |
| * Remove trailing spacesKris Kowal2012-07-06
| |
| * Remove trailing spacesKris Kowal2012-07-06
| |
| * Expand tabsKris Kowal2012-07-06
| |
* | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-16
|\ \ | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js Resolved by using both; both were needed.
| * | Adding Zoom Control to Property TracksKruti Shah2012-07-10
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | Timeline: Disable drag-and-drop on subproperty keyframes. Better errorJon Reid2012-07-16
| | | | | | | | | | | | handling. Fix some minor bugs.
* | | Fix layer arrayJonathan Duran2012-07-10
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Fix more missing charJonathan Duran2012-07-10
|/ / | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | remove commas from var linesJonathan Duran2012-07-09
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Merge branch 'refs/heads/TimelineUberJD' into Timeline-RefactorCodeKruti Shah2012-07-09
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js js/panels/Timeline/Track.reel/Track.html js/panels/Timeline/Track.reel/Track.js js/panels/Timeline/Track.reel/css/Track.css js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * \ Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-07-09
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/Style.reel/Style.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | Timeline: First pass at cleaning up TimelineTrack code. Changes propagatedJon Reid2012-07-03
| | | | | | | | | | | | | | | | to PropertyTrack, TimelineTrack, and Tween classes.
| * | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-07-09
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * Update copyright boilerplateKris Kowal2012-07-06
| | |
* | | Adding commentsKruti Shah2012-07-09
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | Refactoring CodeKruti Shah2012-07-09
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | Remove CommentKruti Shah2012-07-03
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-RefactorCodeKruti Shah2012-07-03
|\| | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | Cleanup PropertyTrack.jsJonathan Duran2012-07-03
| |/ | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* / Refactoring PropertyTrack.js & Span.jsKruti Shah2012-07-03
|/ | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* Fix animation names breakingJonathan Duran2012-06-27
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Fix sub prop animationsJonathan Duran2012-06-26
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Fix end animation for style tracksJonathan Duran2012-06-26
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline Bug fixesJonathan Duran2012-06-26
| | | | | | Fix keyframe selection updating stage for sub props. Fix tween 0 for sub props on re-open. Fix repetition mismatch for styles and position tracks. Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Sub Property ADding KEyframe fixedKruti Shah2012-06-21
| | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* remove unneeded filesJonathan Duran2012-06-20
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* remove obsolete functionsJonathan Duran2012-06-19
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* prop tween splittingJonathan Duran2012-06-19
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Lock Position and Size keyframes to main track keyframesJonathan Duran2012-06-19
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Fix position tracks collapser to use unique elementJonathan Duran2012-06-19
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline: fix for IKNINJA-1676, "Timeline: Can't insert a keyframe to a CSSJon Reid2012-06-15
| | | | property after deleting one"
* remove console logsJonathan Duran2012-06-15
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Fix sub prop re-open for tweensJonathan Duran2012-06-15
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* remove some console logs and simply the prop tween retrieval conditionsJonathan Duran2012-06-12
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* changes to reopen sub property functionsJonathan Duran2012-06-11
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Fix references to documentController.activeDocument to currentDocument.modelJonathan Duran2012-06-06
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* fix doc model in prop trackJonathan Duran2012-05-31
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* fancy keyframe selectionJonathan Duran2012-05-30
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* fix to set default prop for tweenJonathan Duran2012-05-29
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* methods for setting simple ease and splitting sub prop spansJonathan Duran2012-05-16
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Remove span highlighting and start syncing pos tracks and main track keyframesJonathan Duran2012-05-16
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* CSS pixel fix for prop tracksJonathan Duran2012-05-16
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* fix keyframe splittingJonathan Duran2012-05-15
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 11:16:45 +0000