aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* Fix error when opening file with no animationsJonathan Duran2012-06-05
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline: Merge branch 'pull-request' into timeline-localJon Reid2012-06-05
|\ | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
| * 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 branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-05
|\ \
| * | Timeline: Better style selection and deselection. Automatic re-selection ofJon Reid2012-06-01
| | | | | | | | | | | | previously selected style when parent layer is reselected.
| * | Timeline: Bug fixes for deleting styles and their associated tracksJon Reid2012-05-31
| | | | | | | | | | | | correctly.
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-05
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * 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.Nivesh Rajbhandari2012-05-31
| | |/ / | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | fixing the switching between various types of documentsValerio Virgillito2012-05-31
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | removing the last closeDocument handlerValerio Virgillito2012-05-31
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Merge pull request #4 from mqg734/dom-architecture-pentoolValerio Virgillito2012-05-31
| | |\ \ | | | | | | | | | | Adding back the stage references in the 3d classes and fixing styles lookup for the stage.
| | | * | Adding back the stage references in the 3d classes.Nivesh Rajbhandari2012-05-31
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Removed temporary hack to support stage styles.Nivesh Rajbhandari2012-05-31
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Valerio Virgillito2012-05-31
| | |\ \ \ | | | | | | | | | | | | | | | | | | document-bindings-fix
| | * | | | fixing the close and saveValerio Virgillito2012-05-31
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | fixing selection when switching documentsValerio Virgillito2012-05-31
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | cleanup itemValerio Virgillito2012-05-31
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | cleanup itemsValerio Virgillito2012-05-31
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | fixing the closing of documentsValerio Virgillito2012-05-30
| | | |/ / | | |/| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | opening code view documentsValerio Virgillito2012-05-30
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | Merge branch 'document-bindings-fix' of github.com:mencio/ninja-internal ↵Valerio Virgillito2012-05-30
| | |\ \ \ | | | | | | | | | | | | | | | | | | into document-bindings-fix
| | | * | | PI's 3d section was not binding correctly to the current document.Nivesh Rajbhandari2012-05-30
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Fixed bad reference to stage element in pen tool.Nivesh Rajbhandari2012-05-30
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | fixing the timeline current document bindingsValerio Virgillito2012-05-30
| | |/ / / | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | remove current document binding from the stage depsValerio Virgillito2012-05-30
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | Merge branch 'Dom-Architecture' of github.com:mqg734/ninja-internal into ↵Valerio Virgillito2012-05-30
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | document-bindings-fix Conflicts: js/stage/stage-deps.js js/stage/stage.reel/stage.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | Fix for snap-align not working correctly after resizing the stage.Nivesh Rajbhandari2012-05-30
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Fixed bug with scrolling too much when moving objects in negative space.Nivesh Rajbhandari2012-05-29
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Moving layout and stageDeps' handleOpenDocument into stage.Nivesh Rajbhandari2012-05-29
| | | | | | | | | | | | | | | | | | | |