aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements/element-controller.js
Commit message (Collapse)AuthorAge
* Updated ink bottle tool to support color-chip's checkbox and undo/redo for ↵Nivesh Rajbhandari2012-06-05
| | | | | | strokes/borders. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Fill and Ink-Bottle fixes.Nivesh Rajbhandari2012-06-04
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge branch 'refs/heads/master' into document-bindings-fixValerio Virgillito2012-06-01
|\
| * Attempting to track clean nodesJose Antonio Marquez2012-05-30
| | | | | | | | Need to figure out CSS overwrite issue <style>
* | IKNinja-1491 - Adding slice value to border gradients.Nivesh Rajbhandari2012-05-25
|/ | | | | | Note that using "circle cover" comes close to matching our canvas 2d/WebGL shape's stroke gradients, but still a little off. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* fixing the currentContainerValerio Virgillito2012-05-03
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
|\ | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * minor formattingValerio Virgillito2012-05-03
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Dom ManipulationKruti Shah2012-05-03
| | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | Nesting absolute element in the Tag tool. Refactoring element creation and ↵Valerio Virgillito2012-05-02
|/ | | | | | element models Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Allow users to toggle application of stroke and border settings when using ↵Nivesh Rajbhandari2012-04-24
| | | | | | the ink bottle tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* removing _undo array and _targets array and use object instead of matching ↵Valerio Virgillito2012-04-13
| | | | | | arrays to set properties Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/master' into undo-managerValerio Virgillito2012-04-12
|\ | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Borders are not factored into offset calculations by the browser, so we have ↵Nivesh Rajbhandari2012-04-12
| | | | | | | | | | | | to adjust for them. Also, we should set webkit-transform-style to preserve-3d if elements are rotated (until we also support flattened mode). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Single perspective fix.Nivesh Rajbhandari2012-04-09
| | | | | | | | | | | | Note that rotating multiple objects when the stage is rotated still doesn't work and flatten still doesn't work. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | some code cleanupValerio Virgillito2012-04-10
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | setProperties to the montage undo/redoValerio Virgillito2012-04-09
|/ | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/default_html.css js/mediators/element-mediator.js js/panels/properties.reel/properties.js js/tools/BrushTool.js js/tools/LineTool.js js/tools/PenTool.js js/tools/SelectionTool.js js/tools/ShapeTool.js js/tools/TranslateObject3DTool.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Squashed commit of Preparing for the montage undo-manager: Architecture changesValerio Virgillito2012-04-04
| | | | | | | | | | | | | | | | | | Reworked the add and remove elements into 1 function which can take 1 or more elements. Removed the _element from the selection array Many other changes related to those 2 changes Undo/Redo shortcuts are now using montage undo/redo manager. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Do not set webkit-transform styles on elements unless 3d is used on them.Nivesh Rajbhandari2012-03-21
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Get matrix and perspective distance from styles controller.Nivesh Rajbhandari2012-03-21
|/ | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Removing zoom from element's getMatrix. Zoom should only be checked on stage.Nivesh Rajbhandari2012-03-20
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Removing the name attribute from the PI. Fixing the ID and Class attribute ↵Valerio Virgillito2012-03-14
| | | | | | from the PI Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* 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>
* 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/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| |\
| * \ Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-20
| |\ \
| * | | 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/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
|\|
| * 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/NinjaInternal' into FileIOJose Antonio Marquez2012-02-02
|\| | | | | | | | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.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>
* / Merged old FileIOJose Antonio Marquez2012-01-27
|/
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 12:01:08 +0000