aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements
Commit message (Collapse)AuthorAge
* Fixed element mediator, PI, and eye-dropper to handle different borders ↵Nivesh Rajbhandari2012-03-12
| | | | | | sides and gradients. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* gradient support for canvas-2d shapes.Nivesh Rajbhandari2012-03-07
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Gradient support for canvas-2d rectangle.Nivesh Rajbhandari2012-03-07
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* preliminary support for setting gradients on webgl shapes.Nivesh Rajbhandari2012-03-07
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Squashed commit of preload-fix into MasterValerio Virgillito2012-03-06
| | | | | | | - Requiring all the previously pre-loaded files - RDGE, Codemirror and gl-matrix are not included via a script tag. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* stage and elements fixesValerio Virgillito2012-03-01
| | | | | | | | - Resizing the iframe container when resizing the stage - Removing 3d rules from elements when adding them - Adding a name property in the pi Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Fix for performance issue when moving shapes. We don't need to call render ↵Nivesh Rajbhandari2012-02-29
| | | | | | | | except if the geometry and materials change. This is more easy to see with shapes like the brush tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-23
|\ | | | | | | | | | | | | | | Conflicts: js/document/html-document.js js/helper-classes/3D/snap-manager.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| |\
| | * Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-22
| | |\
| | * | Fixing eyedropper tool to get color from image data. This required us to ↵Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | | | | | | | | | workaround having inconsistent color object. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Do not use color object for stage's border since we don't allow users to ↵Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | | | | | | | | | modify the stage's border; we only need the border-width. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Color chips expect a color object, not a css value.Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| |\ \ \ | | |/ / | |/| / | | |/
| * | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-20
| |\ \
| * \ \ Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-14
| |\ \ \
| * \ \ \ Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-14
| |\ \ \ \
| * | | | | Working around inconsistent color object when getting/setting WebGL values.Nivesh Rajbhandari2012-02-13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | 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>
* | | | | | switch html document - re-initialize draw-utils and snap-manager on opening ↵Ananya Sen2012-02-23
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | a document and while switching documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | enabling nested selectionValerio Virgillito2012-02-20
| |_|_|/ |/| | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-16
|\ \ \ \
| * | | | Adding a data-RDGE-id attribute to each canvas to save/load canvas dataValerio Virgillito2012-02-16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-15
|\| | | |
| * | | | Merge branch 'live-preview-fix' of https://github.com/mencio/ninja-internal ↵Valerio Virgillito2012-02-14
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | into integration
| * | | | Merge branch 'components' of https://github.com/mencio/ninja-internal into ↵Valerio Virgillito2012-02-14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration Conflicts: js/io/document/html-document.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-11
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html
| * | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
| |\ \ \ \ \ \
| * \ \ \ \ \ \ 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
| * | | | | | | | | Updated canvas controller to override setProperties so we don't set styles ↵Nivesh Rajbhandari2012-01-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when updating width and height. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | Merged old FileIOJose Antonio Marquez2012-01-27
| | | | | | | | | |
* | | | | | | | | | Adding more components piValerio Virgillito2012-02-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added rest of the components pi. Missing text-input and select Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | fixing the controller to handle all propertiesValerio Virgillito2012-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-14
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Fixing the live preview background issue.Valerio Virgillito2012-02-14
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/treeview/ninja-leaf.reel/ninja-leaf.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | Cleaning up the stage background color chip.Valerio Virgillito2012-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Valerio Virgillito2012-02-12
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | stage-color
| | * | | | | | Support export/import of GLLine data.Nivesh Rajbhandari2012-02-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | Fixed switching between webGL and canvas 2d modes.Nivesh Rajbhandari2012-02-09
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * / | | | | initial color chip for the stageValerio Virgillito2012-02-10
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | Setting defaults and more cleanupValerio Virgillito2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-09
|\| | | | |
| * | | | | Fixed sever