aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Collapse)AuthorAge
* 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
| * document controller and stage view code cleanupValerio Virgillito2012-05-16
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * code cleanup and refactoring of the document controller and stage viewValerio Virgillito2012-05-16
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * clearing the needs save flag on save.Valerio Virgillito2012-05-16
| | | | | | | | 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>
| * | removing first draw on the component eventValerio Virgillito2012-05-16
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | fixing some of the document bindings.Valerio Virgillito2012-05-16
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Squashed master into dom-architectureValerio Virgillito2012-05-16
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | fixed some binding warningsValerio Virgillito2012-05-15
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | document close handler. initial working draftValerio Virgillito2012-05-15
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-14
| |\ \ | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| | * \ Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-14
| | |\ \
| | | * \ Merge pull request #226 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-14
| | | |\ \ | | | | | | | | | | | | Fixing 3d to work in banner templates.
| | | * | | Fixing webRequest URL parsingJose Antonio Marquez2012-05-14
| | | | | |
| | * | | | Viewport for banner templates so content doesn't push through "body".Nivesh Rajbhandari2012-05-14
| | | |/ / | | |/| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | Fixing 3d to work in banner templates.Nivesh Rajbhandari2012-05-14
| | |/ / | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * / / code cleanupValerio Virgillito2012-05-14
| |/ / | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Adding support for new templatesJose Antonio Marquez2012-05-11
| | | | | | | | | | | | This is supported for NEW and OPEN, SAVE is not supported yet by I/O. Saving works, but it will not be a banner template.
| * | 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>
| * | Partially fixing the body pi and fixing the selection controllerValerio Virgillito2012-05-10
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | remove console logsValerio Virgillito2012-05-10
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-10
| |\ \ | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| | * | Adding webRequest APIJose Antonio Marquez2012-05-10
| | | | | | | | | | | | | | | | Adding webRequest API to handle local URLs intercepting. Should be a temp fix.
| * | | Fixing the google components.Valerio Virgillito2012-05-10
| |/ / | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Adding partial close functionalityJose Antonio Marquez2012-05-10
| | |
| * | New stage template should not distinguish between user and template body styles.Nivesh Rajbhandari2012-05-10
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Adding support to save body's css styles on preview.Nivesh Rajbhandari2012-05-09
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-08
| |\ \
| | * \ Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-08
| | |\ \
| * | | | Adding SAVE for I/OJose Antonio Marquez2012-05-08
| |/ / / | | | | | | | | | | | | Adding save functionality to new template. Need to implement user UI for prompts and also clean up...
| * | | Adding Chrome PreviewJose Antonio Marquez2012-05-08
| | | |
| * | | Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-04
| |\ \ \
| | * \ \ Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-04
| | |\ \ \
| * | | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-04
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-web/default_html.css Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-05-03
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-05-01
| | |\ \ \ \ \
| | * | | | | | Preliminary IO to new DOM viewJose Antonio Marquez2012-05-01
| | | | | | | |
| * | | | | | | Removed special-casing for new template workflow. Instead, we will enforce ↵Nivesh Rajbhandari2012-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a width and height on the body in order to do 3d. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | Fixing selection and layout code to exclude SCRIPT and STYLE tags.Nivesh Rajbhandari2012-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-05-17
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-05-15
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch
| | * | | | | | | Removing outdated tree-controller.Nivesh Rajbhandari2012-05-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-05-10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch
| * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-05-07
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
| * | | | | | | | More implementation of moving color chips to the individual subtools.John Mayhew2012-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the tool color bar Added new icons for inkbottle Removed Pencil tool Removed Inkbottle tool Added chips to the pen, brush and tag tools Aligned controls in several subtools
* | | | | | | | | Styles Controller - Null out active documentEric Guzman2012-05-17
| | | | | | | | |
* | | | | | | | | CSS Panel - Style sheets dirty flag addedEric Guzman2012-05-16
| | | | | | | | |
* | | | | | | | | Styles Controller - Fix issue with clearing dirty stylesheet listEric Guzman2012-05-16
| | | | | | | | |
* | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-05-10
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
| * | | | | | | | Merge pull request #185 from ericguzman/StylesControllerPatchValerio Virgillito2012-05-09
| |\ \