aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-31
|\ | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/properties.reel/properties.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-24
| |\ | | | | | | | | | | | | | | | | | | Conflicts: js/document/document-html.js js/helper-classes/3D/view-utils.js js/stage/stage.reel/stage.js
| | * adding document views checks for the timeline and breadcrumbValerio Virgillito2012-05-23
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Cleaning up referencing to 'documentRoot' and '_document'Jose Antonio Marquez2012-05-24
| |/ | | | | | | Moved to reference new model in DOM architecture rework. This should not affect anything, just moving the references, and also the setting to the render methods in the design view.
| * CSS Panel - Update components to use new serialization formatEric Guzman2012-05-22
| |
| * CSS Style Component - Moved unit identification to local change handler ↵Eric Guzman2012-05-21
| | | | | | | | instead of delegate
| * CSS Panel - Allow ":" to be used in selector fieldEric Guzman2012-05-21
| |
| * Style sheets view - Fixed drawing of toolbar and "no sheets" messageEric Guzman2012-05-21
| |
| * Merge branch 'dom-architecture' of ↵Eric Guzman2012-05-18
| |\ | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
| | * Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-18
| | |\
| | | * fixing the color chip for the document rootValerio Virgillito2012-05-18
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Fixing radio control in the PI.Nivesh Rajbhandari2012-05-18
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Fixed Materials Popup to work with new changes to repetition bindings.Nivesh Rajbhandari2012-05-18
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | File Input control in materials panel was not working because of the change ↵Nivesh Rajbhandari2012-05-18
| | |/ | | | | | | | | | | | | | | | from id to data-montage-id. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * fixed the shape subtool not refreshing the iconValerio Virgillito2012-05-18
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * enabling basic document switchingValerio Virgillito2012-05-18
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Editable - Trigger change event after stop eventEric Guzman2012-05-17
| | |
| * | Merge branch 'dom-architecture' of ↵Eric Guzman2012-05-17
| |\| | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates Conflicts: js/document/templates/montage-html/default_html.css js/lib/NJUtils.js
| | * Removed unneeded identifier.Nivesh Rajbhandari2012-05-17
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-17
| | |\
| | | * fixing the breadcrumbValerio Virgillito2012-05-17
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Fixed border radius hot-text linking that was broken by update to montage v.10.Nivesh Rajbhandari2012-05-17
| | |/ | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Adding a disabled property to the label-checkbox.Valerio Virgillito2012-05-17
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-16
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/package.json js/io/system/ninjalibrary.json node_modules/descriptor.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | fixing a null value for the document entry barValerio Virgillito2012-05-16
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | fixing the menu binding resulting in 1 === true > falseValerio Virgillito2012-05-16
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-16
| | |\ \ | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| | | * | document close handler. initial working draftValerio Virgillito2012-05-15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | adding some test convertersValerio Virgillito2012-05-14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | code cleanupValerio Virgillito2012-05-14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | adding a converter for the hot textValerio Virgillito2012-05-11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | Removing the old checkbox components. Created a new LabelCheckboxValerio Virgillito2012-05-16
| | |/ / | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Fixing the dirty document flag. Disabling the stylesheets dirty flag because ↵Valerio Virgillito2012-05-10
| | | | | | | | | | | | | | | | | | | | | | | | === true on document open. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-08
| | |\ \
| | * \ \ Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-04
| | |\ \ \
| | * | | | Fixing bindings to new modelJose Antonio Marquez2012-05-01
| | | | | |
| * | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-05-17
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Editable - remove formatting on pasteEric Guzman2012-05-17
| | | | | |
| * | | | | CSS Panel - Fix errors from new Montage and remove logs.Eric Guzman2012-05-10
| | | | | |
| * | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-05-10
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | Conflicts: js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
| * | | | | Panel Toolbar - Support hiding and showing of buttonsEric Guzman2012-05-03
| | | | | |
| * | | | | CSS Panel - Add focus management to styles view delegateEric Guzman2012-05-02
| | | | | |
| * | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-30
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Tree Controller -Delegate getter/setterEric Guzman2012-04-30
| | | | | |
| * | | | | Editable - Add paste event handling/dispatchingEric Guzman2012-04-30
| | | | | |
| * | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-26
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-23
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-23
| |\ \ \ \ \ \ \
| * | | | | | | | Toolbar - Add buttons to toolbar componentEric Guzman2012-04-23
| | | | | | | | |
| * | | | | | | | Editable - Pass event data with stop eventEric Guzman2012-04-23
| | | | | | | | |