aboutsummaryrefslogtreecommitdiff
path: root/js/tools
Commit message (Collapse)AuthorAge
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-14
|\ | | | | | | Textures
| * Merge branch 'master' into brushtoolPushkar Joshi2012-06-13
| |\
| * | fix bug #1718 (trying to delete a non-existent canvas)Pushkar Joshi2012-06-13
| | |
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-13
|\ \ \ | | |/ | |/| | | | Textures
| * | fixed document switching issuesValerio Virgillito2012-06-12
| |/ | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-13
|\| | | | | | | | | | | | | Textures Conflicts: js/io/system/ninjalibrary.json
| * correct mouse cursor on mousemovePushkar Joshi2012-06-12
| |
| * allow the addition of anchor points to a closed path (the mouse move cursor ↵Pushkar Joshi2012-06-12
| | | | | | | | still needs to be updated)
* | Removed references to NJUtilshwc4872012-06-12
| |
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-12
|\| | | | | | | | | | | | | | | | | Textures Conflicts: assets/canvas-runtime.js js/io/system/ninjalibrary.json js/mediators/element-mediator.js
| * Merge branch 'refs/heads/master' into dom-containerValerio Virgillito2012-06-11
| |\
| | * Merge pull request #280 from pushkarjoshi/brushtoolValerio Virgillito2012-06-08
| | |\ | | | | | | | | Brushtool
| | | * Merge branch 'master' into brushtoolPushkar Joshi2012-06-07
| | | |\
| | | * | change the PI to make it look like the fill color affects the brush stroke colorPushkar Joshi2012-06-07
| | | | |
| * | | | rewrite: currentSelectedContainer -> domContainerValerio Virgillito2012-06-08
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Fixed the currentSelectedContainer by removing bindings and using property change on the current document added the red outline back. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-06
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/LineTool.js js/tools/ShapeTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Merge pull request #276 from mqg734/DrawingToolsValerio Virgillito2012-06-06
| | |\ \ | | | | | | | | | | Do not create any tags or shapes with width or height of 0.
| | | * | Do not create any tags or shapes with width or height of 0.Nivesh Rajbhandari2012-06-06
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-06
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | Merge pull request #272 from pushkarjoshi/pentoolValerio Virgillito2012-06-06
| | |\ \ \ | | | |/ / | | |/| / | | | |/ Pentool
| | | * handle switching between multiple documents for Pen tool by having its own ↵Pushkar Joshi2012-06-05
| | | | | | | | | | | | | | | | selection change handler
| | | * Merge branch 'master' into pentoolPushkar Joshi2012-06-04
| | | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/PenTool.js
| | | * | change the behavior of what happens when alt is pressed while moving anchor ↵Pushkar Joshi2012-05-31
| | | | | | | | | | | | | | | | | | | | handles (the behavior now matches the design)
| | | * | somewhat working version of the canvas runtime for pen paths (the runtime ↵Pushkar Joshi2012-05-31
| | | | | | | | | | | | | | | | | | | | renders properly if we go through debugger)...also removed calls to getStageElement from pen tool
| | | * | Merge branch 'master' into pentoolPushkar Joshi2012-05-31
| | | |\ \
| | | * | | working version of the pen plus subtoolPushkar Joshi2012-05-30
| | | | | |
| | | * | | working version of Pen minus subtoolPushkar Joshi2012-05-30
| | | | | |
| | | * | | More consistent local and global mouse coords which solves a bug with the ↵Pushkar Joshi2012-05-29
| | | | | | | | | | | | | | | | | | | | | | | | Pen minus subtool not removing 1 anchor paths
| | | * | | rename dragging plane to dragPlane (for consistency with ShapeTool)Pushkar Joshi2012-05-29
| | | | | |
| | | * | | allow changes in the pen subtool in options to be seen by the pen tool code ↵Pushkar Joshi2012-05-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (can now select the pen plus, pen minus subtools) AND add keyboard shortcut for brush tool
| | | * | | Merge branch 'master' into pentoolPushkar Joshi2012-05-21
| | | |\ \ \
| | | * | | | handle anchor point deletion correctly (does not yet fully work for ↵Pushkar Joshi2012-05-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PEN-MINUS subtool)
| | | * | | | Merge branch 'master' into pentoolPushkar Joshi2012-05-11
| | | |\ \ \ \
| | | * | | | | code cleanup and starting the subtool functionalityPushkar Joshi2012-05-11
| | | | | | | |
| | | * | | | | Merge branch 'master' into pentoolPushkar Joshi2012-05-07
| | | |\ \ \ \ \
| | | * | | | | | handle delete more correctly than before (selected subpaths are ↵Pushkar Joshi2012-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deleted)....this is buggy when the second anchor of a two-anchor subpath is deleted (since the first anchor needs to be converted back into stage world coords)
| | | * | | | | | flip the action of the alt key when modifying anchor handles (this ↵Pushkar Joshi2012-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | essentially forces the need for a keyboard...must be addressed by a fix later on)
| | | * | | | | | handle left button up correctly for the brush toolPushkar Joshi2012-05-01
| | | | | | | | |
| | | * | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-27
| | | |\ \ \ \ \ \
| | | * | | | | | | Fix for 1524 Pen: Unable to add anchor to a closed pathPushkar Joshi2012-04-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ---behavior is unchanged, but the realtime feedback for the tool (i.e. mouse cursor) will correctly reflect that a click after closing a path will start a new path, not add to that path
| | | * | | | | | | add event handlers for open, close, and switch document to pen tool, fixes:Pushkar Joshi2012-04-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1532 Pen: Anchor points get carried over to the new document
| | | * | | | | | | Fix for 1525 Pen: "Uncaught RangeError: Maximum call stack size exceeded".Pushkar Joshi2012-04-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (check if the second mouse click actually selects the existing first anchor point)
| * | | | | | | | | Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-05
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/mediators/element-mediator.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | Merge pull request #273 from mqg734/TransformToolValerio Virgillito2012-06-05
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Free Transform tool's handle should stop when it reaches the other end.
| | | * | | | | | | | Free Transform tool's handle should stop when it reaches the other end.Nivesh Rajbhandari2012-06-05
| | | | |_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1335 - Free Transform tool: When one of the handles reaches the other end, the tool should stop. IKNINJA-1261 - [WebGL] [Shape] [Selection] Material shows in the middle of Canvas area if the shape is transformed toward negative coordinate. (This was happening because setting a canvas' width to 0 resets the canvas' width to 300.) Signed-off-by: Nivesh Rajbhandari <mqg734@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>
| * / / / / / / / removing all model creators.Valerio Virgillito2012-06-05
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |