aboutsummaryrefslogtreecommitdiff
path: root/js/stage
Commit message (Collapse)AuthorAge
* Binding View - Mouse Over Element Pop up HudArmen Kesablyan2012-06-19
| | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-19
|\ | | | | | | | | Conflicts: js/stage/binding-view.reel/binding-view.js
| * Bug: Text Tool Breaking canvas space.Armen Kesablyan2012-06-19
| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-19
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-19
| | |\
| | | * IKNinja-1710 - Boundary box is drawn offset when switching between docs. ↵Nivesh Rajbhandari2012-06-14
| | | | | | | | | | | | | | | | | | | | | | | | This issue is related to move object to negative space. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-11
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | * removing console logValerio Virgillito2012-06-11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | * rewrite: currentSelectedContainer -> domContainerValerio Virgillito2012-06-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the currentSelectedContainer by removing bindings and using property change on the current document added the red outline back. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | first iteration of adding serializable to ninja plus other changes to run ↵Valerio Virgillito2012-06-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the latest montage Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Binding-View: Visual Bind Item WorkingArmen Kesablyan2012-06-19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | | Binding Hud CSS ChangeEric Guzman2012-06-19
|/ / / /
* | | | Latest Changes Visual Binding StartingArmen Kesablyan2012-06-18
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | Merge branch 'binding' of https://github.com/dhg637/ninja-internal into bindingArmen Kesablyan2012-06-18
|\ \ \ \
| * | | | Objects Tray - Move back to binding viewEric Guzman2012-06-18
| | | | |
| * | | | Binding - Show tray when there are objects. Edit binding view css update.Eric Guzman2012-06-18
| | | | |
| * | | | Objects Tray - Moved to stage object from binding viewEric Guzman2012-06-15
| | | | |
* | | | | Binding - Drop Locate connectorArmen Kesablyan2012-06-18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | | Binding View - validate over hudsArmen Kesablyan2012-06-18
|/ / / / | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-15
|\ \ \ \
| * | | | Put Objects in front of HudsArmen Kesablyan2012-06-15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | Merge branch 'binding' of https://github.com/dhg637/ninja-internal into bindingArmen Kesablyan2012-06-15
| |\ \ \ \
| * | | | | Binding Hud: Calling Option Selection to viewArmen Kesablyan2012-06-15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | | | Objects Tray - Add hiding based on workspace mode.Eric Guzman2012-06-15
| |/ / / / |/| | | |
* | | | | Objects Tray - Add objects tray to binding viewEric Guzman2012-06-15
|/ / / /
* | | | Binding-Huds draw to componentArmen Kesablyan2012-06-14
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | Merge pull request #12 from ericguzman/bindingArmen Kesablyan2012-06-13
|\ \ \ \ | | | | | | | | | | Binding Panel update
| * | | | Binding View - Use same icon component as objects panelEric Guzman2012-06-12
| | | | |
* | | | | Binding-View: Translate hudsArmen Kesablyan2012-06-13
|/ / / / | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js js/ninja.reel/ninja.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-11
| |\ \ \ | | | |/ | | |/|
| | * | Merge pull request #274 from ananyasen/bugfix-masterValerio Virgillito2012-06-06
| | |\ \ | | | | | | | | | | Bugfix master
| | | * | IKNINJA-1662 - fixed js error while resizing brewing in code viewAnanya Sen2012-06-05
| | | |/ | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * / handle switching between multiple documents for Pen tool by having its own ↵Pushkar Joshi2012-06-05
| | |/ | | | | | | | | | selection change handler
| * / Initial Text Tool ChangesArmen Kesablyan2012-06-05
| |/ | | | | | | Signed-off-by: Armen Kesablyan <armen@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>
| | * 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>
| * Adding back the stage references in the 3d classes.Nivesh Rajbhandari2012-05-31
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@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>