aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
| | | * | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-15
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js
| | | * | | | | | | | | | | | Setting up webGL local library (assets)Jose Antonio Marquez2012-02-15
| | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Creating NinjaTemplate to HTML functionJose Antonio Marquez2012-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function will need to be cleaned up and possibly moved once the MVC structure is in-place for the document.
| | | * | | | | | | | | | | Merge branch 'refs/heads/AnanyaFileIO' into FileIOJose Antonio Marquez2012-02-14
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | allow / in windows directory pathAnanya Sen2012-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | | * | | | | | | | | | | use button tag for save as dialogAnanya Sen2012-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | | | | | | | | | Reverting text/html document classes and setting up MVC folder structureJose Antonio Marquez2012-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting up the folder structure for the proposed set up for documents in Ninja. Reverted to have a temp HTML/Text document class. Tweak some UI for file pickers.
| | | * | | | | | | | | | | | Merging TextDocument into BaseDocumentJose Antonio Marquez2012-02-14
| | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merged the text-document class with base-document, didn't make sense to have two classes for basic model of documents, the html-document class remain extending base-document to incorporate design view. These two classes might be renamed.
| | | * | | | | | | | | | | Cleaning upJose Antonio Marquez2012-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting up a 'document' folder to handle all document related classes that in relation to IO
| | | * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-14
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | |
| | | * | | | | | | | | | | Cleaning up mediatorJose Antonio Marquez2012-02-14
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-14
| | | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Tree controller - Minor change (to use "distinct" descriptor)Eric Guzman2012-02-15
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Tree view event delegate map fixEric Guzman2012-02-15
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Ninja Leaf/Branch - Minor CSS fixesEric Guzman2012-02-15
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Tree Node - fix for applying tree child nodes array twice (and getting ↵Eric Guzman2012-02-15
| | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | duplicates)
| * / | | | | | | | | | | | Fixing the load document event being fired twice.Valerio Virgillito2012-02-16
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | | | allow / for window directory path formatAnanya Sen2012-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | | | | | Merge branch 'live-preview-fix' of https://github.com/mencio/ninja-internal ↵Valerio Virgillito2012-02-14
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | into integration
| * | | | | | | | | | | | 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>
| | * | | | | | | | | | | small changes to the tree component to allow events to be passed and add a ↵Valerio Virgillito2012-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | double click handler Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | | | | Add support for drag and drop for the components.Valerio Virgillito2012-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-13
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/treeview/ninja-leaf.reel/ninja-leaf.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | | | | Setting defaults and more cleanupValerio Virgillito2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | | | | code cleanup, light refactor and now adding components at the center stage ↵Valerio Virgillito2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | point. Signed-off-by: Valerio Virgillito <valerio@motorola.com>