aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
...
* | | | Remove unneeded selection codeJonathan Duran2012-02-23
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Move element selection to click handlerJonathan Duran2012-02-23
|/ / / | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* / / Remove selection calls from timelinepanel.jsJonathan Duran2012-02-23
|/ / | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Fix for tween repetition arrays getting overwritten on file openJonathan Duran2012-02-23
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Timeline: Reopen Doc Restore TimeLineJonathan Duran2012-02-23
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | New DocJonathan Duran2012-02-23
| | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Timeline Track Open docJonathan Duran2012-02-23
| | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Timeline:Open Doc in TimelinePanel.jsJonathan Duran2012-02-23
| | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Timeline: Create new PropertyTrack subcomponent, and use it in the ↵Jonathan Duran2012-02-23
| | | | | | | | | | | | | | | | TimelineTrack component. Cherry pick commit from jreid/Timeline-jreid Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Unterminated linesJonathan Duran2012-02-23
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Redo timeline resize codeJonathan Duran2012-02-23
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Timeline Reset to clean Master branch. Code scrub.Jonathan Duran2012-02-23
| | | | | | | | | | | | Fresh copy of ninja-internal/master with Timeline folder copied in to resolved merge issues. Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Integrating canvas-2d and WebGL drawing fixes. Also adding back WebGL materials.Nivesh Rajbhandari2012-02-22
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Revert "Integrating canvas-2d drawing and WebGL fixes, including adding back ↵Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | WebGL materials." This reverts commit 96a0a8c916533eb5625816192ed38488f639326d.
* | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
|\|
| * Removing the timeline selection code.Valerio Virgillito2012-02-20
| | | | | | | | | | | | Timeline selection code is now handled by the selection controller and current container change Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Integrating canvas-2d drawing and WebGL fixes, including adding back WebGL ↵Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | materials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Updated Materials Library and Materials Editor Popup to work with latest ↵mqg7342012-02-21
|/ | | | | | | | version of Montage. We had to change our css to not use id's. Also, updated the popup to use Montage's Popup component. It looks like bump material has a bug. So loading that material results in a runtime error.
* Fixing the selectInput and finishing the textinputValerio Virgillito2012-02-16
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-16
|\
| * Presets Panel - Move to bottom, add to menuEric Guzman2012-02-16
| |
| * Presets - Minor CSS text-shadow work-around for Windows ChromeEric Guzman2012-02-16
| |
| * Merge branch 'refs/heads/master' into PresetsPanelEric Guzman2012-02-16
| |\
| | * CSSPanel - fix code indentationEric Guzman2012-02-16
| | |
| | * CSS Panel - Add Resizer to sub panelsEric Guzman2012-02-16
| | |
| * | Merge branch 'refs/heads/TreeComponents' into PresetsPanelEric Guzman2012-02-16
| |\|
| * | Presets - Get/set active tab from local storage + other improvementsEric Guzman2012-02-15
| | |
| * | Presets - Modify application of preset classes for new json structureEric Guzman2012-02-15
| | |
| * | Presets - Modify structure of preset dataEric Guzman2012-02-15
| | |
| * | Presets - Add external json file with transition dataEric Guzman2012-02-15
| | |
| * | Merge branch 'refs/heads/master' into PresetsPanelEric Guzman2012-02-13
| |\ \
| * | | Style Presets - Separate out the style preset data to new fileEric Guzman2012-02-13
| | | |
| * | | Merge branch 'refs/heads/master' into PresetsPanelEric Guzman2012-02-13
| |\ \ \
| * | | | Presets - Committing half-baked drag and dropEric Guzman2012-02-13
| | | | |
| * | | | Presets - fixed some object naming and css for presets treeEric Guzman2012-02-08
| | | | |
| * | | | Merge branch 'refs/heads/master' into PresetsPanelEric Guzman2012-02-08
| |\ \ \ \
| * | | | | Presets Panel - Initial commit with panel contentEric Guzman2012-02-07
| | | | | |
* | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-15
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'components' of https://github.com/mencio/ninja-internal into ↵Valerio Virgillito2012-02-14
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration Conflicts: js/io/document/html-document.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-11
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html
| * | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html
| * | | | | | | | disabling the auto open of a document on load. Temporary using the new ↵Valerio Virgillito2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | project button to open a document. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-02
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js