aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
* Merge branch 'NiveshColor' of https://github.com/mqg734/ninja-internal into ↵Valerio Virgillito2012-02-29
|\ | | | | | | integration-candidate
| * We need to remove color buttons from the color model when updating the PI ↵Nivesh Rajbhandari2012-02-28
| | | | | | | | | | | | for selection change. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | putting the color panel on top when opening ninjaValerio Virgillito2012-02-28
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | minor fix for handling selections on switch documentAnanya Sen2012-02-28
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | persist selections while switching documentsAnanya Sen2012-02-28
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-02-28
|\|
| * Fix for double clicking in the resizerValerio Virgillito2012-02-27
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | 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
| |
* | 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: 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
| |\
| | * removing the old settings class and disabling panel settings until the new ↵Valerio Virgillito2012-02-24
| | | | | | | | | | | | | | | | | | panels are in Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * 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>
| | * prefixing the local storage and using the new local-storage object.Valerio Virgillito2012-02-24
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * Merge branch 'refs/heads/master' into local-storage-versionValerio Virgillito2012-02-24
| | |\
| | * \ Merge branch 'refs/heads/master' into local-storage-versionValerio Virgillito2012-02-23
| | |\ \
| | * | | local storage integration and versioningValerio Virgillito2012-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed the splitters 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: 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: Add grids to property tracks. First take on clearTimeline method ↵Jon Reid2012-02-24
| | | | | | | | | | | | | | | | on TimelinePanel class.
* | | | 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
| * | Merge pull request #67 from ntfx47/PullRequest-TimelineValerio Virgillito2012-02-23
| |\ \ | | | | | | | | Timeline : Fix for the split and element model error
| | * | Timeline : Fix for the split and element model errorKruti Shah2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | Timeline Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | Fix to read back colors when re-opening files.Nivesh Rajbhandari2012-02-23
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@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>
* | 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>
* | New DocJonathan Duran2012-02-23
| | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> 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: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>
* | 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>