aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements/element-controller.js
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-22
|\
| * enabling nested selectionValerio Virgillito2012-02-20
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-20
|\|
| * Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
| |\
| * \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-02
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js
| * | | Merged old FileIOJose Antonio Marquez2012-01-27
| | | |
* | | | Updated ink bottle tool to use new setColor routine in the mediator and ↵Nivesh Rajbhandari2012-02-13
| |_|/ |/| | | | | | | | | | | | | | controllers. 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>
* | Fixing 3d section of the PI.Nivesh Rajbhandari2012-01-31
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Fixed issue with elements not drawing in the correct plane.Nivesh Rajbhandari2012-01-30
|/ | | | | | When first adding an element, force the 3d model to update with the element's webkit transform values. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>