aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Collapse)AuthorAge
...
| * | | | | | fix for the document tab close button and rulers on initial documentValerio Virgillito2012-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | document bindings phase 1Valerio Virgillito2012-05-29
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - using array controller to bind the current document to all ninja components - removed open document event - removed references to the document controller Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | cut/paste html elements in single documentAnanya Sen2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-05-31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/styles-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@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
| | * | | | | Fixed selection bug when switching/opening documents. Also, use saved scroll ↵Nivesh Rajbhandari2012-05-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | values when switching between documents. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | fixing the styles manager to open code view files and closing the last document.Valerio Virgillito2012-05-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | Merge pull request #252 from ananyasen/dom-architectureValerio Virgillito2012-05-23
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | bug fixes
| | | * \ \ \ \ Merge branch 'refs/heads/master-dom-architecture' into dom-architectureAnanya Sen2012-05-22
| | | |\ \ \ \ \
| | | * | | | | | - don't redraw stage for code document - fixes a switching bugAnanya Sen2012-05-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix for ctrl+S for code document - disallow opening the panels while in code document Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | Some clean up, adding commentsJose Antonio Marquez2012-05-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This obviously needs much work and reworking...
| * | | | | | | | Renaming variable as it will now be usedJose Antonio Marquez2012-05-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is no longer a temp fix, it might be a permanent boolean to open/close web-request API gates.
| * | | | | | | | 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.
| * | | | | | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-23
| |\| | | | | | |
| | * | | | | | | improve the closing of documents.Valerio Virgillito2012-05-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | CSS Panel - Merged Styles controller from DOM ArchitectureEric Guzman2012-05-22
| | | | | | | | |
| | * | | | | | | Merge branch 'dom-architecture' of ↵Eric Guzman2012-05-22
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates Conflicts: js/controllers/styles-controller.js
| | * | | | | | | Merge branch 'dom-architecture' of ↵Eric Guzman2012-05-18
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
| | * | | | | | | | Style sheets - Add support for removing default style sheetEric Guzman2012-05-18
| | | | | | | | | |
| | * | | | | | | | CSS Panel - Add support for deleting style sheetsEric Guzman2012-05-18
| | | | | | | | | |
| | * | | | | | | | 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
| | * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-05-17
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | * | | | | | | | | 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
| | * | | | | | | | | | Styles Controller - Added fix for setting style on cached, multi-target rule.Eric Guzman2012-05-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added fix for setting style on cached, multi-target rule. Also added parameter to selector override to augment specificity of selector
| | * | | | | | | | | | Style sheets - Add sheet actionEric Guzman2012-05-07
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-05-02
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | * | | | | | | | | | Styles Controller - Fix error when trying dispatch stylesheet change eventEric Guzman2012-05-01
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-05-01
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-09
| | |