aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Collapse)AuthorAge
* 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>
| * More cleaning upJose Antonio Marquez2012-06-16
| | | | | | | | Controller will need a review and refactoring.
| * Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-15
| |\
| | * Save user's html and body styles and inline body styles for 3d so they don't ↵Nivesh Rajbhandari2012-06-14
| | | | | | | | | | | | | | | | | | | | | | | | get saved out with the document. This still requires some changes by Jose. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Fixing apply 'no color'Jose Antonio Marquez2012-06-15
| |/ | | | | | | This should fix canvas and standard DOM elements including the root (body or template wrapper).
| * Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixesNivesh Rajbhandari2012-06-13
| |\ | | | | | | | | | | | | | | | | | | Conflicts: js/panels/properties.reel/sections/position-size.reel/position-size.html Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * fixed document switching issuesValerio Virgillito2012-06-12
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * hack fix for the PI section throwing errors when dom is not ready to drawValerio Virgillito2012-06-12
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Fixing properties panel to support px and % for body and other elements.Nivesh Rajbhandari2012-06-12
| |/ | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@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>
* | 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>
| | * Merge branch 'refs/heads/ninja-internal' into BodyPINivesh Rajbhandari2012-06-07
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/body-controller.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * fixing the body color chip for non banners templatesValerio Virgillito2012-06-07
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Body PI fixes.Nivesh Rajbhandari2012-06-07
| | |/ | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-05
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/mediators/element-mediator.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * Merge pull request #267 from mqg734/ToolOptionsValerio Virgillito2012-06-05
| | | |\ | | | | | | | | | | Updated ink bottle and fill tools to support tool options checkboxes and materials.
| | | | * Merge branch 'refs/heads/ninja-internal' into ToolOptionsNivesh Rajbhandari2012-06-05
| | | | |\
| | | | * | Updated ink bottle tool to support color-chip's checkbox and undo/redo for ↵Nivesh Rajbhandari2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strokes/borders. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | * | Fill and Ink-Bottle fixes.Nivesh Rajbhandari2012-06-04
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | removing all model creators.Valerio Virgillito2012-06-05
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | The elementModel is now a getter that will create a new model when needed. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | fixing the save asValerio Virgillito2012-06-05
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | fixing the save asValerio Virgillito2012-06-05
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | Merge pull request #263 from joseeight/ComponentsValerio Virgillito2012-06-05
| | |\ \ \ | | | |_|/ | | |/| | Saving Google Components (reel components)
| | | * | Fixing saveAll from menuJose Antonio Marquez2012-06-04
| | | |/ | | | | | | | | | | | | This was broken, not sure when it broke, but working again.
| | * / components fix: adding a first draw event to componentsValerio Virgillito2012-06-04
| | |/ | | | | | | | | | | | | | | | Adding a first draw allows the component to have the right element so that ninja can use it's controller to get the component instance Signed-off-by: Valerio Virgillito <valerio@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
| | |\
| | | * Attempting to track clean nodesJose Antonio Marquez2012-05-30
| | | | | | | | | | | | | | | | Need to figure out CSS overwrite issue <style>
| | * | 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>
| | * | | | 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>
| | | * | fixing the code editor, closing documents and cleanup of the stageValerio Virgillito2012-06-01
| | | | | | | | | | | | | | | | | | | | 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 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.
| | | * | Removed temporary hack to support stage styles.Nivesh Rajbhandari2012-05-31
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | fixing the close and saveValerio Virgillito2012-05-31
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 17:15:52 +0000