aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-26
|\ | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * 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
| |\
| | * 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>
| * | 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>
* | removing debuggerAnanya Sen2012-04-26
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | IKNINJA-1551 - added editor support for other file typesAnanya Sen2012-04-26
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | - use on ctrl+space for code hintingAnanya Sen2012-04-25
| | | | | | | | | | | | - use prototype in serialization for montage 0.8 Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | IKNINJA-1529 : zooming such that cursor position can be calculated accuratelyAnanya Sen2012-04-24
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | IKNINJA-1530 : turned off autocompletion and just kept the code hintingAnanya Sen2012-04-24
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | IKNINJA-1529 : zooming to fix font overlap issueAnanya Sen2012-04-23
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | set editor background color as per the selected themeAnanya Sen2012-04-20
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | - disable autocompletion option for unsupported file typeAnanya Sen2012-04-19
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | - fixed the text cursorAnanya Sen2012-04-19
| | | | | | | | | | | | - code cleanup Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | - collapse panels for code view, restore for design viewAnanya Sen2012-04-18
| | | | | | | | | | | | - apply theme selection to all code view documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-17
|\|
| * 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>
| | | * | |