aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* fixed bug with keyboard shortcut for fill/ink toolJohn Mayhew2012-05-16
|
* -added new images for the text tool optionsJohn Mayhew2012-05-15
| | | | | -simplified text options CSS -fixed styling to accommodate new images
* updated object 3D options bar to use the new radio stylesJohn Mayhew2012-05-15
| | | | removed its use of the sprite sheet
* 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 pull request #219 from mqg734/TreeFixValerio Virgillito2012-05-11
| |\ | | | | | | Removing outdated references in tree code.
| | * Removing obsolete treeList reference in preset templates.Nivesh Rajbhandari2012-05-11
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Removing outdated tree-controller.Nivesh Rajbhandari2012-05-11
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | 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
| |\ \ \
| * \ \ \ Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-03
| |\ \ \ \
| * | | | | Converting canvas runtime to use prototypes for geom obj, rectangle, oval ↵Nivesh Rajbhandari2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and line. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-03
| |\ \ \ \ \
| * | | | | | 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>
* | | | | | | -fixed spacing problem in the tag toolJohn Mayhew2012-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | -implemented the new mode radio buttons for the pen tool
* | | | | | | -changed tool options radio button class to match the styling of the shape ↵John Mayhew2012-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | options tool buttons -fixed bug injected in the tag tool caused by accidental removal of the value element attribute -moved color chip in the tag tool to the right of the element radio button group
* | | | | | | -updated images for tag and zoom toolJohn Mayhew2012-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | -made tag and zoom tool radio group button styles consistent and removed duplicate classes
* | | | | | | fixed bug introduced when we removed the color toolbar. The styling of the ↵John Mayhew2012-05-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | color chips in the PI was broken due to a reliance on a css class from the colortoolbar reel. The requried class was copied to the properties.css file as a temporary fix.
* | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-05-10
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | WorkingBranch
| * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-05-09
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #185 from ericguzman/StylesControllerPatchValerio Virgillito2012-05-09
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Styles Controller - Fix error when trying dispatch stylesheet change eve...
| | | * | | | | | Styles Controller - Fix error when trying dispatch stylesheet change eventEric Guzman2012-05-01
| | | | | | | | |
| * | | | | | | | some code cleanupValerio Virgillito2012-05-09
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | / Squashed commit of google-components into masterValerio 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
| | | | | | |
| * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-05-08
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Snapping
| | * | | | | | IKNINJA-1603Ananya Sen2012-05-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uncaught TypeError: Cannot read property 'documentRoot' of null js/components/layout/bread-crumb.reel/bread-crumb.js:26 Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | fixed javascript errorsAnanya Sen2012-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | removed incorrect id selector css for code view container since its breaking it.Ananya Sen2012-05-07
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * / | | | | fixes for 2D and 3D translation.hwc4872012-05-07
| |/ / / / /
* | | | | | put color chips in the inkbottle and fill toolJohn Mayhew2012-05-10
| | | | | |
* | | | | | removed unnecessary css classJohn Mayhew2012-05-10
| | | | | |
* | | | | | -moved sel tool images to proper folderJohn Mayhew2012-05-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -finished styling shape tool options -added new icons for shape tool
* | | | | | -Consolidated many redundant css classes used in the tool options barsJohn Mayhew2012-05-09
| | | | | |
* | | | | | Correct layout and styling for the shape tool and its sub toolsJohn Mayhew2012-05-09
| | | | | |
* | | | | | -Put new selection tool icons in the options barJohn Mayhew2012-05-09
| | | | | | | | | | | | | | | | | | | | | | | | -Styled the selection tool options bar
* | | | | | implemented proper styling for shape, inkbottle and fill toolsJohn Mayhew2012-05-08
| | | | | | | | | | | | | | | | | | | | | | | | make all icons for fill and stroke use the proper classes/images
* | | | | | removed unused classes form selection properties reelJohn Mayhew2012-05-08
| | | | | |
* | | | | | moved all tag tool css back into the scss fileJohn Mayhew2012-05-08
| | | | | | | | | | | | | | | | | | | | | | | | added extra padding before first input control
* | | | | | -Removed id dependence of the tag tool options CSSJohn Mayhew2012-05-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Separated the options3d CSS from the tag tool options css -Removed unused translateObjectToolContainer CSS class
* | | | | | Removed unused SubSelect ToolJohn Mayhew2012-05-08
| | | | | |
* | | | | | Fixed missing quote from last mergeJohn Mayhew2012-05-07
| | | | | |
* | | | | | 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
| * | | | | Fixing the color popupValerio Virgillito2012-05-04
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | temporary commenting a timeline bug preventing nested selectionValerio Virgillito2012-05-04
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | fixing the currentContainerValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-idValerio Virgillito2012-05-03
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |