aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
|\
| * Merge pull request #16 from ericguzman/TreeComponentsValerio Virgillito2012-02-06
| |\ | | | | | | Tree components
| | * TreeController - moving the tree controller to the components directoryEric Guzman2012-02-06
| | |
| | * Tree Components - Adding the tree componentsEric Guzman2012-02-06
| | |
| | * Tree Controller - Clean out unused codeEric Guzman2012-02-06
| | |
| | * Tree Controller - Initial addEric 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.
* | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
|\| |
| * | Merge pull request #15 from mqg734/ToolFixesValerio Virgillito2012-02-06
| |\ \ | | | | | | | | Adding, deleting and modifying elements now keep the element planes and PI in sync.
| | * | Fixing format of for loop.Nivesh Rajbhandari2012-02-06
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-06
| | |\|
| | * | We were only updating the first custom section in the PI.Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Update element planes after shapes are created so stage grid updates.Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Handle delete of multiple objects. Also, have deletion go through the ↵Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | | | | | | | | | | | | | mediator so elementDeleted event is fired for SnapManager, DrawUtils, etc. to clean up after deleted element(s). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Update grid and planes when elementChange event signifies the "matrix", ↵Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | | | | | | | | | | | | | "left", "top", "width" or "height" properties have changed. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Update grid and planes when elementChange event signifies the "matrix", ↵Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | | | | | | | | | | | | | "left", "top", "width" or "height" properties have changed. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Merge branch 'refs/heads/NiveshColor' into ToolFixesNivesh Rajbhandari2012-02-03
| | |\ \ | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Removed border special-casing from PI since the mediator now handles this ↵Nivesh Rajbhandari2012-02-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generically. Updated mediator's set stroke routine to use the setColor routine. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Updated color code in the PI to go through element mediator.Nivesh Rajbhandari2012-02-01
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Updated color code to handle shapes.Nivesh Rajbhandari2012-01-31
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Merge branch 'refs/heads/Jose-Color' into NiveshColorNivesh Rajbhandari2012-01-31
| | | |\ \
| | * | \ \ Merge branch 'refs/heads/master' into ToolFixesNivesh Rajbhandari2012-02-03
| | |\ \ \ \
| | * | | | | Update PI when element is changed by one of the tools.Nivesh Rajbhandari2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | Fixing keyboard shortcut and tooltip for hand and 3d tools.Nivesh Rajbhandari2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | Merge pull request #14 from mencio/IKNINJA-854Valerio Virgillito2012-02-06
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | IKNINJA-854 - removed cons and replaced it with var
| | * | | | | IKNINJA-854 - removed cons and replaced it with varValerio Virgillito2012-02-03
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | Setting up library detection for Chrome File SystemJose Antonio Marquez2012-02-06
| | | | | |
* | | | | | Merge branch 'refs/heads/AnanyaFileIO' into FileIOJose Antonio Marquez2012-02-05
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-05
| |\ \ \ \ \ \
| * | | | | | | 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>
* | | | | | | | Setting up Chrome IO classJose Antonio Marquez2012-02-05
| |/ / / / / / |/| | | | | |
* | | | | | | Setting up IO Ninja LibraryJose Antonio Marquez2012-02-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This class will be used to copy locally the library needed for Ninja's IO.
* | | | | | | Merge branch 'refs/heads/AnanyaFileIO' into FileIOJose Antonio Marquez2012-02-04
|\| | | | | |
| * | | | | | allow to open html file in design view,Ananya Sen2012-02-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integrated file open with io mediator 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 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-03
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/document/document-controller.js js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js js/io/ui/save-as-dialog.reel/save-as-dialog.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | removed usage of NJUtils.js as it is being deleted.Ananya Sen2012-02-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | integrated new file dialog with the template descriptor.json and ↵Ananya Sen2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-04
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | updating the versions file after the montage integration. Bumped ninja ↵Valerio Virgillito2012-02-03
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | version to 0.5.5 in preparation to a stable build. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | Setting up Chrome File System API classJose Antonio Marquez2012-02-04
| |_|/ / / / |/| | | | | | | | | | | | | | | | | Chrome file system API will be used to copy over files from the sandboxed app into the sandboxed file system directory (in Chrome) to then be used by the core API and the cloud.
* | | | | | Chrome FileSystem API TestingJose Antonio Marquez2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | Doing benchmark testing of the native HTML5 FileSystem API available in Chrome. Need to run testing of local XHR requests and also getting files from packaged app.
* | | | | | Removing reference to Ninja UtilsJose Antonio Marquez2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | This was removed, will need to check was it affects. Also added the removed checking script on Ninja didDraw to prompt user for cloud simulator.
* | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-02
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js
| * | | | | Merge branch 'montage-integration' into stagingValerio Virgillito2012-02-02
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #11 from joseeight/MontageV6ColorValerio Virgillito2012-02-02
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Fixed the color popups to work with m-js v6
| | | * | | | | Fixed the color popups to work with m-js v6Jose Antonio Marquez2012-02-02
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Removed the wrapper DIV, now it's more direct to create and insert the content in the popups. Changes created DOM exceptions, so it had to be modified.
| | * | | | | upgrading to Montage v0.6Valerio Virgillito2012-02-02
| | | | | | | | | | |