aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-06
|\
| * Merge branch 'refs/heads/ninja-internal' into ToolOptionsNivesh Rajbhandari2012-06-05
| |\
| | * components fix: adding a first draw event to componentsValerio Virgillito2012-06-04
| | | | | | | | | | | | | | | | | | Adding a first draw allows the component to have the right element so that ninja can use it's controller to get the component instance Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | 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/NINJAmaster' into TimelineUberJonathan Duran2012-06-05
|\| | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@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>
| * | Merge branch 'Dom-Architecture' of github.com:mqg734/ninja-internal into ↵Valerio Virgillito2012-05-30
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | document-bindings-fix Conflicts: js/stage/stage-deps.js js/stage/stage.reel/stage.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | 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>
| * / document bindings phase 1Valerio Virgillito2012-05-29
| |/ | | | | | | | | | | | | | | - using array controller to bind the current document to all ninja components - removed open document event - removed references to the document controller Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-31
|\| | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/properties.reel/properties.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * fixing the color chip for the document rootValerio Virgillito2012-05-18
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Fixing the dirty document flag. Disabling the stylesheets dirty flag because ↵Valerio Virgillito2012-05-10
| | | | | | | | | | | | === true on document open. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * remove console logsValerio Virgillito2012-05-10
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Fixing the google components.Valerio Virgillito2012-05-10
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * New stage template should not distinguish between user and template body styles.Nivesh Rajbhandari2012-05-10
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-04
| |\
| * | Removed special-casing for new template workflow. Instead, we will enforce ↵Nivesh Rajbhandari2012-05-04
| | | | | | | | | | | | | | | | | | a width and height on the body in order to do 3d. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Timeline: Bug fixes for deleting elements.Jon Reid2012-05-18
| | |
* | | Timeline: Fix element insertion to use new TimelinePanel properties andJon Reid2012-05-18
| | | | | | | | | | | | | | | multiselect. Fix Property Panel so changing an ID there will actually change an ID on the element (broken by switch from id to data-montage-id change).
* | | Timeline: Multiselect improvements. New convenience methods. MultiselectJon Reid2012-05-17
| |/ |/| | | | | drag and drop.
* | 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>
* | Refactor creating elements. Removed makeNJElement and separated the model ↵Valerio Virgillito2012-05-03
| | | | | | | | | | | | creation Signed-off-by: Valerio Virgillito <valerio@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>
* Get working plane grid to draw for new stage web template workflow.Nivesh Rajbhandari2012-05-01
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Squashed commit of stage architectureValerio Virgillito2012-04-30
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
|\
| * Fixed issue with setting stroke when using the PI.Nivesh Rajbhandari2012-04-24
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@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>
| * Fixing translate handles to draw without zoom value. Also fixed some typos ↵Nivesh Rajbhandari2012-04-20
| | | | | | | | | | | | in zoom code. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Added a body controllerValerio Virgillito2012-04-24
|/ | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Adding back setProperties for canvas because width and height values need to ↵Nivesh Rajbhandari2012-04-17
| | | | | | be set as attributes instead of styles. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-04-17
|\
| * Fixing the shape borderValerio Virgillito2012-04-13
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@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>
| * | 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>
* | | IKNinja-1477 - Cannot preflight Fill color if WebGL Line shape is selected.Nivesh Rajbhandari2012-04-17
| |/ |/| | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@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>
* Grow/shrink Line, Oval and Rectangles when changing stroke size.Nivesh Rajbhandari2012-04-06
| | | | | | Other shape types will be handled separately for now. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* -webkit-transform-style needs to be set to preserve-3d for shapes regardless ↵Nivesh Rajbhandari2012-04-05
| | | | | | of whether they are 2d shapes or WebGL shapes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Fix for line tool not working because PI requests fill color for line as ↵Nivesh Rajbhandari2012-04-05
| | | | | | well and line shape doesn't have getFillColor method. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Removing fill, stroke, fillMaterial and strokeMaterial from the shapeModel ↵Nivesh Rajbhandari2012-04-05
| | | | | | cache because they can easily get out of sync with the actual colors and materials. Instead, we will always query the object for these values. Signed-off-by: Nivesh Rajbhandari <mqg734@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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 01:35:28 +0000