aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/ninja-internal-master' into bugfix-masterAnanya Sen2012-06-05
|\
| * Merge pull request #267 from mqg734/ToolOptionsValerio Virgillito2012-06-05
| |\ | | | | | | Updated ink bottle and fill tools to support tool options checkboxes and materials.
| | * Merge branch 'refs/heads/ninja-internal' into ToolOptionsNivesh Rajbhandari2012-06-05
| | |\
| | * | Updated ink bottle tool to support color-chip's checkbox and undo/redo for ↵Nivesh Rajbhandari2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | strokes/borders. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Fill and Ink-Bottle fixes.Nivesh Rajbhandari2012-06-04
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | fixing the save asValerio Virgillito2012-06-05
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | fixing a small typoValerio Virgillito2012-06-05
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | fixing the save asValerio Virgillito2012-06-05
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Merge pull request #268 from mqg734/CompassLocationValerio Virgillito2012-06-05
| |\ \ \ | | | | | | | | | | Compass should draw in lower-left regardless of the stage height.
| | * | | Compass should draw in lower-left regardless of the stage height.Nivesh Rajbhandari2012-06-05
| | | |/ | | |/| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Merge pull request #263 from joseeight/ComponentsValerio Virgillito2012-06-05
| |\ \ \ | | |/ / | |/| | Saving Google Components (reel components)
| | * | Fixing CSS bugJose Antonio Marquez2012-06-04
| | | | | | | | | | | | | | | | This is for files using 'save' and not 'save all' in which the styles would be thrown off and mixed improperly.
| | * | Canvas lib fixJose Antonio Marquez2012-06-04
| | | | | | | | | | | | | | | | Fixed a bug where an extra tag would be added to the file and break I/O.
| | * | Adding saving blocking screenJose Antonio Marquez2012-06-04
| | | | | | | | | | | | | | | | This is for chrome preview, also fixed other preview bug with plain files not opening in preview.
| | * | Fixing saveAll from menuJose Antonio Marquez2012-06-04
| | | | | | | | | | | | | | | | This was broken, not sure when it broke, but working again.
| | * | Adding lib copy blocking to previewJose Antonio Marquez2012-06-04
| | | | | | | | | | | | | | | | This fixes an issue with launching preview before libraries were copied, hence, first time run would fail. Need to add a feedback screen for this process.
| | * | Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-06-04
| | |\|
| | * | Adding blocking logic to copy libsJose Antonio Marquez2012-06-03
| | | | | | | | | | | | | | | | Need to implement logic in parsing method, might require a minor restructuring.
| | * | Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-06-01
| | |\ \
| | * | | Adding open draw to reel componentsJose Antonio Marquez2012-06-01
| | | | |
| | * | | Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-06-01
| | |\ \ \
| | * | | | Add logic to allow dynamic placement of canvas json fileJose Antonio Marquez2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | Save to and read from any path on disk (webGL/Canvas data only)
| | * | | | Creating template mediator classJose Antonio Marquez2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | This is to simplify code, more to be changed and added.
| | * | | | Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-05-31
| | |\ \ \ \
* | | | | | | IKNINJA-1645- fix - don't disable OK button on change of file typeAnanya Sen2012-06-05
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | Merge pull request #266 from mencio/element-model-fixesValerio Virgillito2012-06-05
|\ \ \ \ \ \ | | | | | | | | | | | | | | components fix: adding a first draw event to components
| * | | | | | components fix: adding a first draw event to componentsValerio Virgillito2012-06-04
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a first draw allows the component to have the right element so that ninja can use it's controller to get the component instance Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | Timeline: Fix line endings, set to UNIX.Jon Reid2012-06-05
| | | | | |
* | | | | | Timeline: Fixes to timeline to handle document switching & breadcrumbJon Reid2012-06-04
|/ / / / / | | | | | | | | | | | | | | | interactions under new DOM Architecture.
* | | | | Merge pull request #264 from mencio/document-bindings-fixValerio Virgillito2012-06-04
|\ \ \ \ \ | |_|_|_|/ |/| | | | Document bindings fix - Changing the documents architecture to use bindings instead of events
| * | | | fix for the css panelValerio Virgillito2012-06-01
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Merge branch 'document-bindings-fix' of github.com:mencio/ninja-internal ↵Valerio Virgillito2012-06-01
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into document-bindings-fix
| | * \ \ \ Merge pull request #8 from mqg734/dom-architecture-pentoolValerio Virgillito2012-06-01
| | |\ \ \ \ | | | | | | | | | | | | | | IKNinja-1610 and IKNinja-1647 - Can't use transform tool if you haven't used a drawing tool yet.
| | | * | | | IKNinja-1610 and IKNinja-1647 - Can't use transform tool if you haven't used ↵Nivesh Rajbhandari2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a drawing tool yet. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | fixing some selection container changes and the breadcrumb not drawing initiallyValerio Virgillito2012-06-01
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | Merge branch 'refs/heads/master' into document-bindings-fixValerio Virgillito2012-06-01
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
| * | | | Merge branch 'refs/heads/valerio-document-bindings-fix' into ↵Nivesh Rajbhandari2012-06-01
| |\ \ \ \ | | | | | | | | | | | | | | | | | | document-bindings-fix
| | * \ \ \ Merge branch 'document-bindings-fix' of github.com:mencio/ninja-internal ↵Valerio Virgillito2012-06-01
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into document-bindings-fix
| | * | | | | fixing the document closing when the first document is closed.Valerio Virgillito2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | IKNinja-1609 - Stage rotates too fast when closing and re-opening file or ↵Nivesh Rajbhandari2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | switching between files. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | Moving styles controller higher in ninja's serialization so its bindings ↵Nivesh Rajbhandari2012-06-01
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | will get triggered before stage's bindings. This should fix the stage's styles not getting initialized correctly. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Merge branch 'refs/heads/valerio-document-bindings-fix' into ↵Nivesh Rajbhandari2012-06-01
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | document-bindings-fix Conflicts: js/stage/stage.reel/stage.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | fixed the 3d grid when switching documents and some cleanupValerio Virgillito2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | making the document bar handle the current document to hide/show itselfValerio Virgillito2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | fixing the code editor, closing documents and cleanup of the stageValerio Virgillito2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | Merge pull request #5 from mqg734/dom-architecture-pentoolValerio Virgillito2012-05-31
| | |\ \ \ \ | | | | | | | | | | | | | | Fixing stage's scroll offsets when switching between documents.
| | * | | | | removing the stage view component as it is not used anymoreValerio Virgillito2012-05-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | SnapManager.setupDragPlaneFromPlane must happen after StylesController has ↵Nivesh Rajbhandari2012-06-01
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | finished initializeRootStyles. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Fixing scroll offsets when switching between documents.Nivesh Rajbhandari2012-05-31
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Removing unused scroll model save/restore.<