aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Collapse)AuthorAge
* 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
| |\
| | * 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>
| | * | 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
| | |\ \
| | * \ \ Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-22
| | |\ \ \
| | * | | | Adding redirect from app folder in templatesJose Antonio Marquez2012-05-22
| | | | | | | | | | | | | | | | | | | | | | | | This doesn't resolve the issue of XHR requests made in Montage.
* | | | | | 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>
| * | | | 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>
| * | | 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
| | * | fixing the selection in multiple documents and some code cleanupValerio Virgillito2012-05-22
| | |/ | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * fixing a few document switching issues.Valerio Virgillito2012-05-22
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * - fixed save asAnanya Sen2012-05-21
| | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * - added opening multiple code and design view documentsAnanya Sen2012-05-21
| | | | | | | | | | | | | | | | | | | | | - switching between multiple code and design view documents - Note: closing of documents, when multiple documents are open, is not yet implemented Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * save for code view documents in the new dom architectureAnanya Sen2012-05-18
| | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * Merge branch 'refs/heads/master-dom-architecture' into dom-architectureAnanya Sen2012-05-18
| | |\
| | * | integrated open code view document in new dom architectureAnanya Sen2012-05-18
| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | Merge branch 'dom-architecture' of ↵Eric Guzman2012-05-18
| |\ \ \ | | | |/ | | |/| | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
| | * | Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-18
| | |\ \ | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| | | * | Fixing save logicJose Antonio Marquez2012-05-18
| | | | | | | | | | | | | | | | | | | | Moved dirty marker clearing code to model.
| | * | | fixing the color chip for the document rootValerio Virgillito2012-05-18
| | |/ / | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | fixed a switch documents bug where the layout was getting called before ↵Valerio Virgillito2012-05-18
| | | | | | | | | | | | | | | | | | | | | | | | setting the container. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Fixing the save as pathsValerio 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>
| | * | multiple documents - enable opening multiple documents and initial switchingValerio Virgillito2012-05-17
| | |/ | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | 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
| |\ \ \ \ \ \ \ \