aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Collapse)AuthorAge
...
| | * Binding View - Objects Replace existing source Object if it existsArmen Kesablyan2012-06-25
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-25
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | Binding View :Requested Changes for Pull RequestArmen Kesablyan2012-06-21
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-21
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/hintable.reel/hintable.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * \ \ Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-20
| | |\ \ \
| | * | | | Objects Tray - Filter list of components for those without visual representationEric Guzman2012-06-20
| | | | | |
| | * | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-19
| | |\ \ \ \
| | | * | | | Binding View - Mouse Over Element Pop up HudArmen Kesablyan2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | Objects Tray - Show only "off stage" objectsEric Guzman2012-06-19
| | |/ / / /
| | * | | | 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>
| | * | | | | Objects Controller - Fix call to get current object bindings after ↵Eric Guzman2012-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | add/removing binding
| | * | | | | Objects Controller - Update current object bindings when adding/removing ↵Eric Guzman2012-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | bindings
| | * | | | | Objects Controller - Add concept of categoriesEric Guzman2012-06-12
| | | | | | |
| | * | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-11
| | |\ \ \ \ \
| | | * | | | | Changes Made to Object Listing of iFrameArmen Kesablyan2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | | | | | | Objects Panel - Add component icon and icons by typeEric Guzman2012-06-11
| | |/ / / / / /
| | * | | | | | Controller - Allow currentBindings to update by resetting currentObjectEric Guzman2012-06-11
| | | | | | | |
| | * | | | | | Binding Panel - Direction toggle changes are savable.Eric Guzman2012-06-10
| | | | | | | |
| | * | | | | | 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>
| | * | | | | | Binding Panel - Add getPropertyList and fix null currentObjectEric Guzman2012-06-05
| | | | | | | |
| | * | | | | | Objects Controller - Fix access to the oneway propertyEric Guzman2012-06-01
| | | | | | | |
| | * | | | | | Binding Panel - Item css and toggle button action handlerEric Guzman2012-06-01
| | | | | | | |
| | * | | | | | Bindings Panel - Update binding panel componentsEric Guzman2012-06-01
| | | | | | | |
| | * | | | | | Objects Controller - Add bindable controller properties, and bindings getterEric Guzman2012-05-30
| | | | | | | |
| | * | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-05-25
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-25
| | | |\ \ \ \ \ \
| | * | | | | | | | Objects Controller - Now keeps track of document's object instances, ↵Eric Guzman2012-05-25
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | including added components
| | * | | | | | | 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>
| | * | | | | | | | 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>
| | * | | | | | | | | Objects Panel - Add Objects controller and montage/application hack to ↵Eric Guzman2012-05-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expose template
| | * | | | | | | | | Merge branch 'dom-architecture' of ↵Armen Kesablyan2012-05-15
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into binding
| | * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/masterDomArc' into bindingArmen Kesablyan2012-05-14
| | |\ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | Support pre-flighting of gradients for shape tools - rect, line, oval, brush ↵Nivesh Rajbhandari2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and pen. Note that WebGL shapes are not supported yet. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-25
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Make stage transparent when rotating/zooming templates and draw an outline ↵Nivesh Rajbhandari2012-06-22
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | around the user's root instead. Also, fixed the background color setting on banner and animation templates' "body." Stage outline draws using drawGridLines code so it can show intersection with element planes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | | | | Adding support for gradients on chipsJose Antonio Marquez2012-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |