aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-24
|\
| * removing console logValerio Virgillito2012-07-24
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge branch 'TextTool-Color' of https://github.com/dhg637/ninjaValerio Virgillito2012-07-24
| |\
| | * Text Tool Color Change FixArmen Kesablyan2012-07-24
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | New: Adding method to switch from code to design viewJose Antonio Marquez2012-07-24
| | | | | | | | | | | | Added functionality to parse the code view string back into a Ninja template object to redraw design view. Only outstanding bugs are timeline errors and code view layout issues.
* | | New: Adding method to display document in code viewJose Antonio Marquez Russo2012-07-23
| | | | | | | | | | | | Added method to parse in memory document in code view. This allows users to view current in memory document in code view while not saving the document or external files. Still need to handle naming of paths for files that require saving but are not saved (webGL and Montage libraries). Also, need to implement method to switch back from code view to design view, but will need Timeline fixes.
* | | In Progress: Cleaning up mergeJose Antonio Marquez Russo2012-07-23
| | | | | | | | | | | | Cleaned up new updates. Still pending is adding functionality to parse the document when toggling views and fix Timeline errors. Code view also has some rending issues that will be fixed, this is just a clean up.
* | | Merge pull request #44 from ananyasen/DocumentJose Antonio Marquez Russo2012-07-23
|\ \ \ | | | | | | | | first cut to show code editor for design document
| * \ \ Merge branch 'refs/heads/Jose-Document' into DocumentAnanya Sen2012-07-23
| |\ \ \
| * | | | show design code editor - first cutAnanya Sen2012-07-23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | Merge branch 'refs/heads/Ninja-master' into DocumentJose Antonio Marquez Russo2012-07-23
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | tag-tool: Minor styles update and some cleanupValerio Virgillito2012-07-23
| | |/ | |/| | | | | | | | | | | | | Styled the position drop down and moved some styles to the reel. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-23
|\| |
| * | Unifying the banner and animation template display of ninja-contentValerio Virgillito2012-07-20
| | | | | | | | | | | | | | | | | | | | | In the banner and animation template the stage element now shows div in both the pi and breadcrumb. IKNINJA: 1776 Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Preview button: enabling the entire button to handle a mouse clickValerio Virgillito2012-07-18
| | | | | | | | | | | | | | | | | | - Then entire button area (button and icon) is not click enabled to launch a Chrome Preview instead of only the actual button. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-18
|\| | | |/ |/|
| * fixed highlight of file icons and grid menuValerio Virgillito2012-07-18
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * removed left over comments.Valerio Virgillito2012-07-17
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | New: Adding re-render method to switching viewJose Antonio Marquez2012-07-17
| | | | | | | | This now re-renders the design view when switching from code view. There are many outstanding issues, the Time-Line completely breaks and blocks Ninja, it is unknown why, there are too many dependencies. To make it work, we disabled that feature, although this check in does not include that, so it can be fixed proper. Also, the document controller creates a new tab per switch as it does not check that it is the same document. That bug must also be fixed. Finally, we need to hook up a new code view to the document, the current code view will not work as desired, so a new code view must be built and implemented.
* | New: Added switching view functionality to document UIJose Antonio Marquez2012-07-16
|/ | | | This now let's you switch between code and design views in all documents opened that support design view. Code view for these documents is currently unsupported, so this is just to hook up the UI to the new methods. Code view will be added next.
* Merge pull request #392 from joseeight/DocumentValerio Virgillito2012-07-16
|\ | | | | New: Improved layout of components for breadcrumb and UI buttons for views
| * CSS Fixes for WindowsJose Antonio Marquez2012-07-16
| | | | | | | | Font size is not inherited in Chrome for Windows, but does inherit in Mac, adding size for avoid inconsistency.
| * Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-16
| |\
| * | New: Added knob to timeline resizerJose Antonio Marquez2012-07-13
| | | | | | | | | | | | Added visual feedback for the timeline resizer
| * | New: Improved Breadcrumb LayoutJose Antonio Marquez2012-07-13
| | | | | | | | | | | | Added new CSS/HTML layout for the breadcrumb component.
| * | adding a container around the breadcrumb buttonValerio Virgillito2012-07-12
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Improving Document Bar UIJose Antonio Marquez2012-07-12
| | | | | | | | | | | | Setting up new document bar UI to then set up switching document view modes. Improving layout of component and cleaning up. Added icons and button UI.
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninjaJohn Mayhew2012-07-16
|\ \ \ | | |/ | |/|
| * | Fixing IKNINJA-1634Jose Antonio Marquez2012-07-10
| |/ | | | | | | Adding a fix for referencing the stop from all elements on the gradient stop itself.
* / Trademark Update - added trademarked Ninja name to the splash screen and ↵John Mayhew2012-07-16
|/ | | | about box.
* fixed incorrect capitalization for DOCTYPE htmlJohn Mayhew2012-07-09
|
* cleaned up remaining copyrights for releaseJohn Mayhew2012-07-09
|
* Normalize HTML DOCTYPEKris Kowal2012-07-09
| | | | | | | Was lower-case. Now upper-case. Also fixed BOMs, trailing white-space, DOS line terminators. Did not expand tabs to spaces.
* BSD LicenseKris Kowal2012-07-09
|
* Merge branch 'normalize' of https://github.com/kriskowal/ninja-internalValerio Virgillito2012-07-09
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Normalize HTML doctypeKris Kowal2012-07-06
| |
| * Remove byte order markers (BOM)Kris Kowal2012-07-06
| |
| * Remove trailing spacesKris Kowal2012-07-06
| |
| * Remove trailing spacesKris Kowal2012-07-06
| |
| * Expand tabsKris Kowal2012-07-06
| |
* | Merge branch 'GIO-TextTool' of https://github.com/dhg637/ninja-internalValerio Virgillito2012-07-09
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/text-properties.reel/text-properties.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Text Tool 2Armen Kesablyan2012-07-03
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | Merge branch 'refs/heads/master' into GIO-TextToolArmen Kesablyan2012-07-02
| |\ \
| * | | Bug: Font Name & Size not updating text toolArmen Kesablyan2012-07-02
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | Merge pull request #371 from ananyasen/menu-bug-fixValerio Virgillito2012-07-09
|\ \ \ \ | | | | | | | | | | fixed IKNINJA-1877 : Clicking on a menu item should commit on mouse up a...
| * | | | fixed IKNINJA-1877 : Clicking on a menu item should commit on mouse up and ↵Ananya Sen2012-07-03
| | |/ / | |/| | | | | | | | | | | | | | | | | | not on mouse down. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | Merge pull request #366 from joseeight/ColorValerio Virgillito2012-07-09
|\ \ \ \ | | | | | | | | | | Fix: IKNINJA-1634
| * | | | Fix: IKNINJA-1634Jose Antonio Marquez2012-07-02
| |/ / / | | | | | | | | | | | | Fixing reference error for gradient stops on click.
* | | | Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-09
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Materials/materials-library-panel.reel/materials-library-panel.css js/panels/Materials/materials-popup.reel/materials-popup.css Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Update copyright boilerplateKris Kowal2012-07-06
| |/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 12:13:24 +0000