aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/Timeline' into Timeline_updatedKruti Shah2012-02-08
|\
| * Merge branch 'refs/heads/Timeline_updated' into TimelineJonathan Duran2012-02-08
| |\ | |/ |/| | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Timeline : Adding functionality to unable deletion when a single layer ↵Kruti Shah2012-02-07
| | | | | | | | | | | | remaining & when track is animated Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | Timeline : Layers & DOM enchancementKruti Shah2012-02-07
| | | | | | | | | | | | | | | | - Undo & Redo of Layers within same container - Undo & Redo of Layers between different containers - Adding the element on the layer selected else default is the last layer drawn Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | Timeline : Change in the Hooking up of DOM/LayersKruti Shah2012-02-06
| | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * Layer Undo enhancementsJonathan Duran2012-02-07
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Add Span color highlight for animated spans and restyle keyframesJonathan Duran2012-02-07
| | | | | | | | 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>
| * Fix timeline time markersJonathan Duran2012-02-07
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Change DOM/layer handling workflowJonathan Duran2012-02-07
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Fix resized going off screen by giving layer gutter a max width of 500Jonathan Duran2012-02-06
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Fix Timeline height so it appears correctly on loadJonathan Duran2012-02-06
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Jonathan Duran2012-02-06
| |\ | | | | | | | | | Timeline
| | * Merge pull request #18 from ericguzman/StylesControllerUpdatesValerio Virgillito2012-02-06
| | |\ | | | | | | | | Styles controller updates
| | | * Merge branch 'refs/heads/master' into StylesControllerUpdatesEric Guzman2012-02-06
| | | |\ | | | |/ | | |/|
| | * | Merge pull request #17 from joseeight/SnapFixValerio Virgillito2012-02-06
| | |\ \ | | | | | | | | | | Attempt to fix initialization bug for snap-manager
| | | * | Attempt to fix initialization bug for snap-managerJose Antonio Marquez2012-02-06
| | |/ /
| | * | Merge pull request #16 from ericguzman/TreeComponentsValerio Virgillito2012-02-06
| | |\ \ | | | | | | | | | | Tree components
| | | * | TreeController - moving the tree controller to the components directoryEric Guzman2012-02-06
| | | | |
| | | * | Tree Components - Adding the tree componentsEric Guzman2012-02-06
| | | | |
| | | * | Tree Controller - Clean out unused codeEric Guzman2012-02-06
| | | | |
| | | * | Tree Controller - Initial addEric Guzman2012-02-06
| | | | |
| | | | * Attempt to fix initialization bug for snap-managerJose Antonio Marquez2012-02-06
| | | | |
| | | | * TreeController - moving the tree controller to the components directoryEric Guzman2012-02-06
| | | | |
| | | | * Tree Components - Adding the tree componentsEric Guzman2012-02-06
| | | | |
| | | | * Tree Controller - Clean out unused codeEric Guzman2012-02-06
| | | | |
| | | | * Tree Controller - Initial addEric Guzman2012-02-06
| | | | |
| | | | * Styles Controller - Add some methods for modifying css keyframe rulesEric Guzman2012-02-06
| | | | |
| | | | * Styles Controller - Correct author attribution for specificity calculationEric Guzman2012-02-06
| | | | |
| | | | * Styles Controller - Add code to remove cache items from history (not just ↵Eric Guzman2012-02-06
| | | | | | | | | | | | | | | | | | | | nullifying them)
| | | | * Styles Controller - First stab at group stylingEric Guzman2012-02-06
| | | |/ | | |/| | | | | | | | | Split "createOverrideRule" into two methods --> now has createOverrideSelector. Also took first stab at creating a group style.
| * | | Change keyframe to use element mediator when repositioning animated elements ↵Jonathan Duran2012-02-06
| | | | | | | | | | | | | | | | | | | | | | | | on stage Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | Fix Timeline layer resizer from being inversedJonathan Duran2012-02-06
| | | | | | | | | | | | | | | | | | | | | | | | layer resizer now works in the correct direction when dragging Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | Timeline: add new layers to top of stack instead of bottom.Jonathan Duran2012-02-06
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | Fix problem with resizer set to capture all webkitTransitionEnd events. ↵Jonathan Duran2012-02-06
|/ / / | | | | | | | | | | | | | | | Update collapser to use namespaced webkitTransitionEnd events for forward compatibility. Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Add back keyframe selection codeJonathan Duran2012-02-06
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Integrate breadcrumb component and layer handling codeJonathan Duran2012-02-06
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | CSS for timelineJonathan Duran2012-02-06
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | style controller update for CSS animationsJonathan Duran2012-02-06
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | merge new timelineJonathan Duran2012-02-06
|/ / | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Merge pull request #15 from mqg734/ToolFixesValerio Virgillito2012-02-06
|\ \ | | | | | | Adding, deleting and modifying elements now keep the element planes and PI in sync.
| * | Fixing format of for loop.Nivesh Rajbhandari2012-02-06
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-06
| |\|
| * | We were only updating the first custom section in the PI.Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Update element planes after shapes are created so stage grid updates.Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Handle delete of multiple objects. Also, have deletion go through the ↵Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | | | | | | | mediator so elementDeleted event is fired for SnapManager, DrawUtils, etc. to clean up after deleted element(s). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Update grid and planes when elementChange event signifies the "matrix", ↵Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | | | | | | | "left", "top", "width" or "height" properties have changed. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Update grid and planes when elementChange event signifies the "matrix", ↵Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | | | | | | | "left", "top", "width" or "height" properties have changed. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge branch 'refs/heads/NiveshColor' into ToolFixesNivesh Rajbhandari2012-02-03
| |\ \ | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Removed border special-casing from PI since the mediator now handles this ↵Nivesh Rajbhandari2012-02-01
| | | | | | | | | | | | | | | | | | | | | | | | generically. Updated mediator's set stroke routine to use the setColor routine. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>