aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Collapse)AuthorAge
...
| | * | | | | Merge branch 'master' into pentoolPushkar Joshi2012-02-08
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/MaterialsLibrary.js
| | * \ \ \ \ \ Merge branch 'master' into pentoolPushkar Joshi2012-02-07
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | * | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-02-02
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into pentoolPushkar Joshi2012-01-31
| | |\ \ \ \ \ \ \
| | * | | | | | | | missed a couple of pen tool property files on last checkinPushkar Joshi2012-01-30
| | | |_|_|_|_|/ / | | |/| | | | | |
* | | | | | | | | fixed templates descriptor, changed validation to on key up, fixed minor ui ↵Ananya Sen2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issues Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
|\| | | | | | | |
| * | | | | | | | Tree Components - css fixesEric Guzman2012-02-08
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-08
|\ \ \ \ \ \ \ \
| * | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
| |\| | | | | | |
| | * | | | | | | 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>
| | * | | | | | | 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>
| | | * | | | | | 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
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |
| | | * | | | | | 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>
| * | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-07
| |\| | | | | |
| | * | | | | | Tree Components - Added copyright commentsEric Guzman2012-02-07
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
| |\| | | | |
| | * | | | | TreeController - moving the tree controller to the components directoryEric Guzman2012-02-06
| | | | | | |
| | * | | | | Tree Components - Adding the tree componentsEric Guzman2012-02-06
| | |/ / / /
| * | | | | Adding logic to copy ninja librariesJose Antonio Marquez2012-02-06
| | | | | | | | | | | | | | | | | | | | | | | | Setting up the logic to handling copying ninja required libraries into the app local file system sandbox to be used by cloud simulator.
* | | | | | fixed undo/redo for each code view document, changed new file integration ↵Ananya Sen2012-02-08
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | with io mediator Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | changes to show document dirty indicator on editing code view, and to remove ↵Ananya Sen2012-02-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dirty indicator on save. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | added editor tab save while switching code view tabs,Ananya Sen2012-02-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integrated new file dialog with io mediator to open the new file in a new tab Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | removed using montage button, since it has changed in Montafe 0.6Ananya Sen2012-02-03
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-02
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js
| * | | | upgrading to Montage v0.6Valerio Virgillito2012-02-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Merge pull request #12 from mqg734/ToolFixesValerio Virgillito2012-02-02
| |\ \ \ \ | | | | | | | | | | | | Merged pan and zoom tool and 3d stage orientation fixes. Also updated PI to support shapes properties.
| | * | | | Updating Shapes PI to support corner radii. Also fixed PI bug where we were ↵Nivesh Rajbhandari2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | always updating custom section 0. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | Checkbox and Combobox change/changing events were not setting wasSetByCode ↵Nivesh Rajbhandari2012-01-30
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | property correctly, causing our PI to dispatch events at improper times. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Fixing the bread-crumb backgroundValerio Virgillito2012-02-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CSS cleanup added a background to the bottom panel container which broke the bread-crumb background. Fixing by adding the background directly to the bread-crumb component. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Checkbox and Combobox change/changing events were not setting wasSetByCode ↵Nivesh Rajbhandari2012-02-01
| |/ / / | | | | | | | | | | | | | | | | | | | | property correctly, causing our PI to dispatch events at improper times. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | refactoring some file names and locations,Ananya Sen2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | change made to maintain only one codemirror div. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | changes to open multiple code view tabs and switch between the code views, ↵Ananya Sen2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | added nj-skinned css class for the buttons in file picker, new file dialog and save as dialog Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-01
|\ \ \ \
| * | | | Fixing coreIO API referencingJose Antonio Marquez2012-02-01
| | | | |
| * | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-01-31
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fixing the bread-crumb backgroundValerio Virgillito2012-01-31
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | The CSS cleanup added a background to the bottom panel container which broke the bread-crumb background. Fixing by adding the background directly to the bread-crumb component. Signed-off-by: Valerio Virgilli