aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* 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>
| * | parameterize the parentContainer for text documentAnanya Sen2012-07-18
| | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | Merge branch 'refs/heads/Ninja-master' into DocumentJose Antonio Marquez Russo2012-07-23
|\ \ \
| * \ \ Merge branch 'tag-properties-fixes' of https://github.com/mencio/ninjaValerio Virgillito2012-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
|\| | | | | |_|_|/ |/| | |
| * | | Merge branch 'SevenDotOneCommits' of https://github.com/ericmueller/ninjaValerio Virgillito2012-07-23
| |\ \ \
| | * | | Bugs fixed:hwc4872012-07-23
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | 1915 - Data.JSON too large. Reduced mesh size and limited precision of fp numbers 1381 - Background transparency in preview. 1740 - File Save As caused WebGL to stop animating. Crossed RDGE IDs 1954 - Texture change from material popup broke screen rendering. Set correct context on property change.
| * | | Fix: Adding a check for element w/h/t/lJose Antonio Marquez2012-07-23
| | | | | | | | | | | | | | | | This fixes an issue with elements with no set width, height, top, left values from being handling through the PI. Currently those values will default to zero, a secondary fix will address this to show no value in PI and other panels.
* | | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-23
|\| | |
| * | | Merge branch 'minorFixes_7.1' of https://github.com/ericguzman/ninjaValerio Virgillito2012-07-23
| |\ \ \
| | * | | CSS Panel - Remove data attribute to remove style tags from document.Eric Guzman2012-07-20
| | | | |
| | * | | Merge branch 'refs/heads/master' into fixes_7.1Eric Guzman2012-07-20
| | |\ \ \
| | * | | | CSS Panel - Fix updating when media changes, sheets are deleted.Eric Guzman2012-07-20
| | | | | |
| | * | | | Style Sheets - Show dirty marker when editing media attributeEric Guzman2012-07-18
| | | | | |
| | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja into fixes_7.1Eric Guzman2012-07-18
| | |\ \ \ \
| | * | | | | CSS Panel - Handle media attribute changesEric Guzman2012-07-17
| | | | | | |
| | * | | | | Styles Controller - Re-add dirty event. Add data- attribute to keep created ↵Eric Guzman2012-07-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | stylesheets.
* | | | | | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-23
|\| | | | | |
| * | | | | | Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-23
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUberJonathan Duran2012-07-20
| |\ \ \ \ \ \
| | * | | | | | The zoom slider resets.Commented some codeKruti Shah2012-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | | | Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-20
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-20
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | Improve keyframe selection by moving playhead marker to lower z-indexJonathan Duran2012-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | FIx 3D animation workflowJonathan Duran2012-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can now add 3D to any keyframe and all the tween will initialize their 3D identity matrices Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUberJonathan Duran2012-07-19
| |\ \ \ \ \ \ \
| | * | | | | | | The zoom slider position remembered between multi doc switchKruti Shah2012-07-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-23
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'template-pi-breadcrumb' of https://github.com/mencio/ninjaValerio Virgillito2012-07-22
| |\ \ \ \ \ \ \ \
| | * | | | | | | | 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>
* | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-20
|\| | | | | | | |
| * | | | | | | | Merge branch 'Fixes_071' of https://github.com/mqg734/ninjaValerio Virgillito2012-07-20
| |\ \ \ \ \ \ \ \
| | * | | | | | | | If no material was defined, use Flat material when switching from 2d to ↵Nivesh Rajbhandari2012-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebGL shape. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | IKNINJA-1780 - [Shape] Error when opening document that contains a shape ↵Nivesh Rajbhandari2012-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with gradient color or no color. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | IKNINJA-1899 - Fixed runtime error when undoing a delete shape action.Nivesh Rajbhandari2012-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | IKNINJA-1924 - Hovering over panel resizers after collapsing and expanding ↵Nivesh Rajbhandari2012-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | panel causes error. Canvas sizes were not updated when using the splitter to toggle collapse/expansion of panels. This was fixed by the StageDrawingFixes pull request. We should also guard agains null value in stage's getElement routine. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | Restrict materials popup to appear within our page.Nivesh Rajbhandari2012-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | Binding view: fixed mouse move event outside the hudValerio Virgillito2012-07-20
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changing the variable event to 'e' Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-20
|\| | | | | | | |
| * | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfixAnanya Sen2012-07-20
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | fixing logical error which was a side-effect of ↵Ananya Sen2012-07-20
| | | | |