aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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>
| | * 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>
* | | | | Fixed data type issue on copying library filesJose Antonio Marquez2012-02-08
| | | | | | | | | | | | | | | | | | | | Fixed the methods to allow for ArrayBuffer data to be sent, fixes saving files that are not plain text.
* | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-07
|\| | | |
| * | | | updated montage v.0.6 to the latest changes.Valerio Virgillito2012-02-07
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Mime type fixesJose Antonio Marquez2012-02-07
| | | | | | | | | | | | | | | | Trying to fix mime type issues in FileSystem, Chrome does not support reponseType 'blob', so looking at alternatives.
* | | | Copy local library to cloudJose Antonio Marquez2012-02-07
| | | | | | | | | | | | | | | | Adding functionality to copy a local library to the cloud. Currently creating directory structure. Need to add ability to copy files and ensure proper mime-type is set.
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-07
|\| | |
| * | | Merge pull request #19 from ericguzman/TreeComponentsValerio Virgillito2012-02-07
| |\ \ \ | | |_|/ | |/| | Tree Components - Added copyright comments
| | * | Tree Components - Added copyright commentsEric Guzman2012-02-07
| |/ /
* | | Adding library synced eventsJose Antonio Marquez2012-02-07
| | | | | | | | | | | | Added an event that will be dispatched when Ninja loads and the local chrome Ninja library is fully synced with all required libs.
* | | Adding mime-type detection for new fileJose Antonio Marquez2012-02-07
| | |
* | | Adding ability to copy an entire library for NinjaJose Antonio Marquez2012-02-07
| | | | | | | | | | | | Added the functionality to copy an entire directory/library from a JSON descriptor file into the app sandbox. Need to add logic to dispatch a 'synchronized' event for Ninja to know everything is up to date.
* | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
|\| |
| * | Merge pull request #18 from ericguzman/StylesControllerUpdatesValerio Virgillito2012-02-06
| |\ \ | | | | | | | | Styles controller updates
| | * \ Merge branch 'refs/heads/master' into StylesControllerUpdatesEric Guzman2012-02-06
| | |\ \ | | |/ / | |/| |
| | * | Attempt to fix initialization bug for snap-managerJose 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
| | | |
| | * | Tree Controller - Clean out unused codeEric Guzman2012-02-06
| | | |
| | * | Tree Controller - Initial addEric Guzman2012-02-06
| | | |
| | * | Styles Controller - Add some methods for modifying css keyframe rulesEric Guzman2012-02-06
| | | |
| | * | Styles Controller - Correct author attribution for specificity calculationEric Guzman2012-02-06
| | | |
| | * | Styles Controller - Add code to remove cache items from history (not just ↵Eric Guzman2012-02-06
| | | | | | | | | | | | | | | | nullifying them)
| | * | Styles Controller - First stab at group stylingEric Guzman2012-02-06
| | |/ | | | | | | | | | Split "createOverrideRule" into two methods --> now has createOverrideSelector. Also took first stab at creating a group style.
* | | Single file library syncingJose Antonio Marquez2012-02-06
| | | | | | | | | | | | Added the ability to store locally in chrome single file libraries used by Ninja. Working on adding multi-file libraries.
* | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
|\| |
| * | Merge pull request #17 from joseeight/SnapFixValerio Virgillito2012-02-06
| |\ \ | | | | | | | | Attempt to fix initialization bug for snap-manager
| | * | Attempt to fix initialization bug for snap-managerJose Antonio Marquez2012-02-06
| |/ /
* | | Merge branch 'refs/heads/AnanyaFileIO' into FileIOJose Antonio Marquez2012-02-06
|\ \ \
| * | | integrated save for the document tabs, detect codemirror history to show ↵Ananya Sen2012-02-06
| | | | | | | | | | | | | | | | | | | | | | | | document dirty indicator. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
|\ \ \ \ | | |/ / | |/| |