aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Collapse)AuthorAge
* Updated hard-coded linear and radial gradients to use the color values in ↵Nivesh Rajbhandari2012-05-03
| | | | | | Linear/RadialGradientMaterials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Material editorhwc4872012-05-02
|
* 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>
| * Merge branch 'refs/heads/ninja-internal' into AllFixesNivesh Rajbhandari2012-04-24
| |\
| * | 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>
* | Temporary fix for the PI and Stage when opening the new template.Valerio Virgillito2012-04-23
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | reverting old template to current working status. New template work.Valerio Virgillito2012-04-20
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | typo fixValerio Virgillito2012-04-19
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | initial stage web templateValerio Virgillito2012-04-18
|/ | | | 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>
* | Merge branch 'refs/heads/ninja-internal' into AllFixesNivesh Rajbhandari2012-04-09
|\|
| * Merge pull request #159 from mqg734/WebGLMaterialsValerio Virgillito2012-04-09
| |\ | | | | | | 3D tools, eyedropper, fill, ink-bucket, gradients and shape fixes.
| * \ Merge pull request #155 from ericguzman/PresetsPIValerio Virgillito2012-04-05
| |\ \ | | | | | | | | Presets controller - update for "_element" removal in selection objects
| | * | Presets Controller - Update to not use "_element" property of selection.Eric Guzman2012-04-04
| | | |
| * | | Merge pull request #153 from mencio/componentsValerio Virgillito2012-04-05
| |\ \ \ | | | | | | | | | | Components panel cleanup and displaying only simple properties.
| | * | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-04-04
| | |\| |
| | * | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-03-30
| | |\ \ \
| | * \ \ \ Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-03-28
| | |\ \ \ \
| | * | | | | removed trace statementValerio Virgillito2012-03-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | [CR] Keep Save related menu items always enabled, if there is an open documentAnanya Sen2012-04-04
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@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>
| * \ \ \ \ Merge branch 'refs/heads/WebGLFileIO' into ToolFixesNivesh Rajbhandari2012-04-04
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: assets/canvas-runtime.js js/controllers/elements/shapes-controller.js js/lib/drawing/world.js js/lib/geom/geom-obj.js js/lib/geom/line.js js/mediators/element-mediator.js js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | Adjusting line's width and height when changing stroke size.Nivesh Rajbhandari2012-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | Switching to Linear/RadialGradient materials will set the corresponding ↵Nivesh Rajbhandari2012-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | color. Also, dispatching an addElement event when toggling shape from WebGL/canvas2d so timeline can draw correctly. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | IKNinna-1409 - Should dirty document when changing shape properties. ↵Nivesh Rajbhandari2012-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNinja-1391 - Shapes need to support no-color. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFileIONivesh Rajbhandari2012-03-30
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | Updated shapes to always check for its stroke and fill colors and materials ↵Nivesh Rajbhandari2012-03-29
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | instead of relying on the shapeModel cache because it can get out of sync. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Adding replaceElement routine and event so Timeline can avoid removing and ↵Nivesh Rajbhandari2012-04-04
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | adding layers and PI and SelectionController can avoid deselecting and reselecting the element. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-04-04
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/presets-controller.js
| | * | | | 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>
| * | | | Animation Presets - Only combine animations if pre-existing animations existEric Guzman2012-04-02
| | | | |
| * | | | Presets Controller - Remove unused method callEric Guzman2012-03-30
| | | | |
| * | | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-29
| |\| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 04:04:25 +0000