aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* 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>
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Jonathan Duran2012-02-06
|\ | | | | | | Timeline
| * 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>
* | 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>
| * 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>
| | * Updated color code in the PI to go through element mediator.Nivesh Rajbhandari2012-02-01
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Updated color code to handle shapes.Nivesh Rajbhandari2012-01-31
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Merge branch 'refs/heads/Jose-Color' into NiveshColorNivesh Rajbhandari2012-01-31
| | |\
| | | * IKNINJA-1083Jose Antonio Marquez2012-01-30
| | | | | | | | | | | | | | | | Fixing minor bug with no color breaking on null alpha value.
| * | | Merge branch 'refs/heads/master' into ToolFixesNivesh Rajbhandari2012-02-03
| |\ \ \
| * | | | Update PI when element is changed by one of the tools.Nivesh Rajbhandari2012-02-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Fixing keyboard shortcut and tooltip for hand and 3d tools.Nivesh Rajbhandari2012-02-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | IKNINJA-854 - removed cons and replaced it with varValerio Virgillito2012-02-03
| |/ / / |/| | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge branch 'montage-integration' into stagingValerio Virgillito2012-02-02
|\ \ \ \
| * | | | Fixed the color popups to work with m-js v6Jose Antonio Marquez2012-02-02
| | | | | | | | | | | | | | | | | | | | Removed the wrapper DIV, now it's more direct to create and insert the content in the popups. Changes created DOM exceptions, so it had to be modified.
| * | | | upgrading to Montage v0.6Valerio Virgillito2012-02-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Revert "Adding njUtils as a component and adding it to the application object"Valerio Virgillito2012-02-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f07bbfaa60c3fb7c2412c5aa97b49d114d6a88ea. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Fixes for montage integrationValerio Virgillito2012-02-01
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Adding njUtils as a component and adding it to the application objectValerio Virgillito2012-02-01
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | upgrading to Montage v0.6Valerio Virgillito2012-02-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Revert "Adding njUtils as a component and adding it to the application object"Valerio Virgillito2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f07bbfaa60c3fb7c2412c5aa97b49d114d6a88ea. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Fixes for montage integrationValerio Virgillito2012-02-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Adding njUtils as a component and adding it to the application objectValerio Virgillito2012-02-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Merge branch 'issue-codeattribution' of github.com:mencio/ninja-internal ↵Valerio Virgillito2012-02-02
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into staging Conflicts: _scss/compass_app_log.txt _scss/imports/scss/_Base.scss css/ninja.css Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | Switching to alternate dashed line function. Adding code attributions.Valerio Virgillito2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | IKNINJA-1083Jose Antonio Marquez2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | Fixing minor bug with no color breaking on null alpha value.