aboutsummaryrefslogtreecommitdiff
path: root/js/tools
Commit message (Collapse)AuthorAge
* Merge branch 'master' into pentoolPushkar Joshi2012-05-31
|\
| * Merge pull request #256 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-24
| |\ | | | | | | IKNinja-1621 - 3D stage does not reset correctly when the rotation point is set elsewhere on stage.
| | * IKNinja-1621 - 3D stage does not reset correctly when the rotation point is ↵Nivesh Rajbhandari2012-05-24
| | | | | | | | | | | | | | | | | | set elsewhere on stage. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Cleaning up referencing to 'documentRoot' and '_document'Jose Antonio Marquez2012-05-24
| |/ | | | | | | Moved to reference new model in DOM architecture rework. This should not affect anything, just moving the references, and also the setting to the render methods in the design view.
| * removing all stageDeps for drawing classes.Valerio Virgillito2012-05-17
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * IKNinja-1628 - Can't draw shapes inside canvas after double-clicking into ↵Nivesh Rajbhandari2012-05-17
| | | | | | | | | | | | canvas. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-16
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/package.json js/io/system/ninjalibrary.json node_modules/descriptor.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Squashed master into dom-architectureValerio Virgillito2012-05-16
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Fixing scrollbar syncing, including pan tool, for banner templates.Nivesh Rajbhandari2012-05-15
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-08
| |\ \
| * | | Stage should update scroll offsets when scrolled. Note that this is not ↵Nivesh Rajbhandari2012-05-08
| | | | | | | | | | | | | | | | | | | | | | | | always correct because we don't get a scroll end event. Updating Pan Tool to update scroll bars. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Fixing references to iframe's styles in new template.Nivesh Rajbhandari2012-05-04
| | | | | | | | | | | | | | | | 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>
| * | | | Fixing selection and layout code to exclude SCRIPT and STYLE tags.Nivesh Rajbhandari2012-05-04
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | 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
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Add color to tag toolValerio Virgillito2012-05-15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-05-15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | WorkingBranch
| | * \ \ \ Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-10
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * \ \ \ \ Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-08
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-07
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Converting geom-obj to object literal notation.Nivesh Rajbhandari2012-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | Converting line, circle and rectangle shapes to object literal notation.Nivesh Rajbhandari2012-05-02
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-05-10
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | WorkingBranch
| * | | | | put color chips in the inkbottle and fill toolJohn Mayhew2012-05-10
| | | | | |
| * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-05-07
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
| * | | | | More implementation of moving color chips to the individual subtools.John Mayhew2012-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the tool color bar Added new icons for inkbottle Removed Pencil tool Removed Inkbottle tool Added chips to the pen, brush and tag tools Aligned controls in several subtools
| * | | | | First round of moving color chips into the sub tools. Shape and Pen tool now ↵John Mayhew2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | have chips in the sub tool bar. Still need to complete adding chips to the Brush tool and finalizing the subtool bar layout to our spec for all of the subtools.
* | | | | | 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
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | some code cleanupValerio Virgillito2012-05-09
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Fixed a snapping issue on the mouse down in drawing tools.hwc4872012-05-08
| | | | |
| * | | | fixes for 2D and 3D translation.hwc4872012-05-07
| | |/ / | |/| |
* | | | code cleanup and starting the subtool functionalityPushkar Joshi2012-05-11
| | | |
* | | | Merge branch 'master' into pentoolPushkar Joshi2012-05-07
|\| | |
| * | | Refactor creating elements. Removed makeNJElement and separated the model ↵Valerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | creation Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| |\ \ \ | | | |/ | | |/|
| | * | Support drawing in side and top view. Also, adding back support for drawing ↵Nivesh Rajbhandari2012-05-01
| | | | | | | | | | | | | | | | | | | | | | | | shapes inside canvas when double-clicked into canvas or when moused over canvas. Signed-off-by: Nivesh Rajbhandari <mqg734@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>
| * | webTemplate var gets reset to false, so must check for new stage template ↵Nivesh Rajbhandari2012-05-01
| | | | | | | | | | | | | | | | | | differently. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge branch 'refs/heads/ninja-internal' into StageWebTemplateNivesh Rajbhandari2012-05-01
| |\ \
| | * | Removing some console logsValerio Virgillito2012-04-30
| | | | | | | | | | | | | | | | 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 pull request #182 from ericmueller/Canvas-interactionValerio Virgillito2012-04-30
| |\ | | | | | | Canvas interaction
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-04 06:42:07 +0000