aboutsummaryrefslogtreecommitdiff
path: root/js/stage
Commit message (Collapse)AuthorAge
...
| | * | | 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
| | | |\ \
| | * | | | 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
| | |\ \ \
| | * | | | Initial Text Tool ChangesArmen Kesablyan2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | Binding-View : Deselect Works Now, Rendering multiple Huds AvailableArmen Kesablyan2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | Render Hud MultipleArmen Kesablyan2012-06-08
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | Changes to Binding ViewArmen Kesablyan2012-06-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | Object ControllerArmen Kesablyan2012-06-06
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | Changes for binding ViewArmen Kesablyan2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | binding canvasArmen Kesablyan2012-06-02
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | Binding View Canvas Initial DevelopmentArmen Kesablyan2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | Visual Bindings Initial generate from Array.Armen Kesablyan2012-05-30
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-25
| |\ \ \ \ \
| * | | | | | Setup up Binding View Draw CycleArmen Kesablyan2012-05-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-23
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/data/panels-data.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | Binding Visual Tool Initial setupArmen Kesablyan2012-05-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | Changes to binding viewArmen Kesablyan2012-05-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-17
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: css/ninja.css scss/imports/scss/_toolbar.scss Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | | Initial Binding HudArmen Kesablyan2012-05-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | | | | | | Merge pull request #338 from mencio/IKNINJA-1615Valerio Virgillito2012-06-26
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix for IKNINJA-1615: Enable mouse up event on top of the user document scrollbar
| * | | | | | | | | Fix for IKNINJA-1615: Enable mouse up event on top of the user document ↵Valerio Virgillito2012-06-25
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scrollbar Chrome has a bug where mouse up does not fire when the mouse is released on top of a scrollbar. To work around this issue, I temporary increase the canvas to cover the scrollbar when drawing and then shrink it back on mouse up. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | IKNinja-1688 - Creating a banner file after a code file causes body div to ↵Nivesh Rajbhandari2012-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shift to the right and has different scroll bars. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | Merge pull request #326 from mqg734/ReclaimStagePaddingValerio Virgillito2012-06-25
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Reclaim negative padding when moving items back into positive direction.
| * | | | | | | | When reclaiming stage's negative scroll padding, we need to use the ↵Nivesh Rajbhandari2012-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | template's left and top padding as the minimum values when switching between documents. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | |