aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements/element-controller.js
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-02
|\ | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js js/data/pi/pi-data.js js/panels/properties/content.reel/content.js
| * 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>
* | 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>
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>