aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* Fix layer/element selection on first click selectJonathan Duran2012-02-09
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Squashed commit of the following:Jonathan Duran2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit fe0d1578305db78eb5a744c354dbbb3cec67be2a Author: Kruti Shah <kruti.shah@motorola.com> Date: Thu Feb 9 11:43:53 2012 -0800 Removing a flag Signed-off-by: Kruti Shah <kruti.shah@motorola.com> commit 7a7e5d9a07c85a9a35297efe74f8b45bc4bd3c62 Author: Kruti Shah <kruti.shah@motorola.com> Date: Thu Feb 9 11:42:39 2012 -0800 Timeline : Selection Handling depending on layer selected Signed-off-by: Kruti Shah <kruti.shah@motorola.com> commit d0a4d88ddef2f1690da490cf8f3d167f1eb01945 Merge: ad214f9 f6ad57e Author: Kruti Shah <kruti.shah@motorola.com> Date: Thu Feb 9 09:54:42 2012 -0800 Merge branch 'refs/heads/Timeline' into Timeline_updated Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com> commit ad214f9b5bc19c43eac39e4c9d93cd9645aed2ea Author: Kruti Shah <kruti.shah@motorola.com> Date: Thu Feb 9 09:40:14 2012 -0800 Timeline : When element selected the corresponding layer highlights Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-02-09
|\ | | | | | | | | | | | | Conflicts: index.html Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-02-09
| |\ | | | | | | | | | WorkingBranch
| | * Merge pull request #24 from mencio/pi_bugsValerio Virgillito2012-02-08
| | |\ | | | | | | | | Pi bugs
| | | * Correcting the PI lock for height which had a bug in the original pull request.Valerio Virgillito2012-02-08
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * Fix for the PI Lock button.Valerio Virgillito2012-02-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing the following JIRA bugs: 111 Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Tree Components - css fixesEric Guzman2012-02-08
| | |/
| * / fixed error with initializing and accessing the ninja version object from ↵John Mayhew2012-02-09
| |/ | | | | | | the main reel
| * Merge pull request #21 from mencio/pi_bugsValerio Virgillito2012-02-08
| |\ | | | | | | Pi bugs fixes for 964, 616, 1084
| | * IKNINJA - 1084: Fixing the custom tag.Valerio Virgillito2012-02-07
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * IKNINJA-616 - Drag and drop images fix for the PI and sourceValerio Virgillito2012-02-07
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * IKNINJA-964 - Fixed inconsistent element name in PI/CSS panel.Valerio Virgillito2012-02-07
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Merge pull request #22 from ericguzman/StylesControllerUpdatesValerio Virgillito2012-02-08
| |\ \ | | | | | | | | Styles Controller - Added array of dirty stylesheets and event dispatch ...
| | * | Styles Controller - Added array of dirty stylesheets and event dispatch when ↵Eric Guzman2012-02-08
| | | | | | | | | | | | | | | | a sheet is dirtied.
| * | | Merge pull request #20 from mqg734/ToolFixesValerio Virgillito2012-02-08
| |\ \ \ | | |_|/ | |/| | Hooked up materials code to go through the ShapesController and updated the PI to reflect the currently selected shape's materials. Also fixed the following bugs:
| | * | Added ability to toggle combobox's visibility so we can show/hide materials ↵Nivesh Rajbhandari2012-02-07
| | | | | | | | | | | | | | | | | | | | | | | | comboboxes in the tool options. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | id's must start with a letter, so our workaround for using uuid for RDGE ↵Nivesh Rajbhandari2012-02-07
| | | | | | | | | | | | | | | | | | | | | | | | canvas id's won't work because they often start with a number. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Fixing some typos and undeclared variables in GLRectangle and ShapesController.Nivesh Rajbhandari2012-02-07
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Supporting switching materials in the PI. Also, moved makeFillMaterial and ↵Nivesh Rajbhandari2012-02-07
| | | | | | | | | | | | | | | | | | | | | | | | makeStrokeMaterial functions into GLGeomObj so shapes other than GLRectangle can use these routines. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Fixed PI to support WebGL materials.Nivesh Rajbhandari2012-02-07
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Updated tools and PI to get/set materials by binding to appModel's materials ↵Nivesh Rajbhandari2012-02-07
| | | | | | | | | | | | | | | | | | | | | | | | property. This requires us to add FlatMaterial to the list of materials in the MaterialsLibrary. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-07
| | |\|
| | * | Force layout canvas and SelectionController to update their info when a 2d ↵Nivesh Rajbhandari2012-02-06
| | | | | | | | | | | | | | | | | | | | | | | | canvas is replaced by a 3d canvas (and vice-versa). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Support toggling between 2d and 3d canvas context. This requires us to ↵Nivesh Rajbhandari2012-02-06
| | | | | | | | | | | | | | | | | | | | | | | | create a new canvas with all the same values as the canvas being replaced and copying over all the shape data. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Add enabled property for ComboBox to support enabling/disabling materials ↵Nivesh Rajbhandari2012-02-06
| | | | | | | | | | | | | | | | | | | | | | | | dropdowns in the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Allow users to switch between 2d and webGL mode. Note that this doesn't ↵Nivesh Rajbhandari2012-02-06
| | | | | | | | | | | | | | | | | | | | | | | | currently work. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Support use WebGL checkbox in the PI.Nivesh Rajbhandari2012-02-06
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Tree Components - Added copyright commentsEric Guzman2012-02-07
| | |/ | |/|
* | | Fixes for animation element assignmentJonathan Duran2012-02-09
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | CleanupJonathan Duran2012-02-09
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Cleaning up more code and adding more models for timelineJonathan Duran2012-02-09
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Squashed commit of the following:Jonathan Duran2012-02-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 35ad4d6d2fac4432046141c63c0209cf3d00be5c Merge: 76377d5 88e80d5 A