aboutsummaryrefslogtreecommitdiff
path: root/js/tools
Commit message (Collapse)AuthorAge
* 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>
| * 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
| | * | | | some code cleanupValerio Virgillito2012-05-09
| | | |_|/ | | |/| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | 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.
* | | | | 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
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fixed a snapping issue on the mouse down in drawing tools.hwc4872012-05-08
| | | | |
| * | | | fixes for 2D and 3D translation.hwc4872012-05-07
| | |/ / | |/| |
* | | | 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
|\| | |
| * | | 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
| |\ \ \ | | | |/ | | |/|
| * | | 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>
* | | | 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>
* | | 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>
* | 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
| * added a console.log to show the working plane during a draghwc4872012-04-27
| |
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-27
| |\ | | | | | | | | | Canvas-interaction
| * | Creating shapes in a containerhwc4872012-04-27
| | |
| * | canvas interactionhwc4872012-04-26
| | |
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-25
| |\ \ | | | | | | | | | | | | Canvas-interaction
| * \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-25
| |\ \ \ | | | | | | | | | | | | | | | Canvas-interaction
| * | | | canvas interactionhwc4872012-04-23
| | | | |
| * | | | limitshwc4872012-04-23
| | | | |
* | | | | Merge cleanupValerio Virgillito2012-04-27
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Merge branch 'refs/heads/serialization'Valerio Virgillito2012-04-27
|\ \ \ \ \
| * | | | | Simplifying the getElement method from stage and adding an exclusion list to ↵Valerio Virgillito2012-04-26
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | the new template Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Refix brush tool elementAdded eventJonathan Duran2012-04-27
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-27
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge pull request #176 from pushkarjoshi/brushtoolValerio Virgillito2012-04-27
| |\ \ \ \ | | |/ / / | |/| | | Brushtool
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 15:58:49 +0000