aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| * \ Merge pull request #261 from ericguzman/CSSPanelUpdatesValerio Virgillito2012-05-31
| |\ \ | | | | | | | | CSS Panel Toolbar - Prevent warning regarding undefined sourceObject
| | * \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Eric Guzman2012-05-30
| | |\ \ | | | | | | | | | | | | | | | CSSPanelUpdates
| | * | | CSS Panel Toolbar - Prevent warning regarding undefined sourceObjectEric Guzman2012-05-30
| | | | |
| | * | | Merge branch 'dom-architecture' of ↵Eric Guzman2012-05-29
| | |\ \ \ | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
| | * | | | CSS Panel - Handle focus after editing selectorEric Guzman2012-05-29
| | | | | |
| | * | | | CSS Panel - Find correct previously-rendered rule list after selection.Eric Guzman2012-05-29
| | | | | |
| | * | | | CSS Panel - Prevent Animation on New StyleEric Guzman2012-05-27
| | | | | |
| * | | | | updating the google components serialization to enable savingValerio Virgillito2012-05-31
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | 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 'refs/heads/master' into document-bindings-fixValerio Virgillito2012-05-30
|\| | |
| * | | updating to version 0.6Valerio 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
| * \ \ \ Merge pull request #3 from mqg734/dom-architecture-pentoolValerio Virgillito2012-05-30
| |\ \ \ \ | | | | | | | | | | | | Fixed bad reference to stage from pen tool.
| | * | | | 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>
* | | | Merge branch 'refs/heads/dom-architecture' into document-bindings-fixValerio Virgillito2012-05-30
|\| | |
| * | | Merge pull request #260 from joseeight/DocumentValerio Virgillito2012-05-30
| |\ \ \ | | |_|/ | |/| | Document
| | * | Merge pull request #35 from aadsm/DocumentJose Antonio Marquez Russo2012-05-30
| |/| | | | | | | | | | Bug fixes to template creator
| | * | Initialize an internal Template variable in TemplateCreatorAntónio Afonso2012-05-30
| | | |
| | * | Stop serializing the child components of the top components are not serializedAntónio Afonso2012-05-30
| | | | | | | | | | | | We just removed them before serializing and add them again afterwards.
| | * | Stop adding ids to elements in template creatorAntónio Afonso2012-05-30
| | | | | | | | | | | | | | | | This is the fix for Motorola-Mobility/montage#648
| | * | Avoid duplicate labels in template creatorAntónio Afonso2012-05-30
| |/ / | | | | | | This is the fix for Motorola-Mobility/montage#649
* | | remove current document binding from the stage depsValerio Virgillito2012-05-30
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | updating ninja.cssValerio 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
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>