aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
| | | * | | | | | | | | | | | Merge pull request #16 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-22
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | FileIO branch pull request
| | | | * | | | | | | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-22
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | | * | | | | | | | | | | | fix bug when closing the first document tabAnanya Sen2012-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | | * | | | | | | | | | | | edit by Eric G.: catch the error instead of doing the null check for the ↵Ananya Sen2012-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stale element Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | | * | | | | | | | | | | | added null check for matchedRules in styles-controller.js, to fix js error ↵Ananya Sen2012-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on reopening and edited html document Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | | * | | | | | | | | | | | - file picker - select file on double clickAnanya Sen2012-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - check cloud availability before IO operations [open file, new file, Save, Save As]. Canceling operation if cloud was unavailable, as per team's agreement. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | | | | | | | | | | Removed css not needed in Ninja TemplateJose Antonio Marquez2012-02-22
| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge pull request #15 from mencio/file-ioJose Antonio Marquez Russo2012-02-22
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | moving the default folder location to the navigator to fix the ok button issue
| | | * | | | | | | | | | | | | Improving temp CSS loading fixJose Antonio Marquez2012-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding logic to parse the entire DOM and insert the style tag loading the link element content directly above.
| | | * | | | | | | | | | | | | Merge pull request #14 from mencio/file-ioJose Antonio Marquez Russo2012-02-21
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | File io - Code cleanup and added default folder to the file new dialog.
| | | * | | | | | | | | | | | | | Temp CSS fix (for file open)Jose Antonio Marquez2012-02-21
| | | | |_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented temporary work-around to the css-cross-origin issue on files loaded into Ninja. Fix is for open file, need to implement save functionality and integrate with CSS panel.
| | * | | | | | | | | | | | | | renaming makeElementModel2 to makeModelFromElementValerio Virgillito2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | | | | | | | Enabling outline on open documents and parsing doom on open to create models.Valerio Virgillito2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | | | | | | | Merge branch 'refs/heads/master' into file-ioValerio Virgillito2012-02-22
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | / / / / / / / / / | | | | |_|_|/ / / / / / / / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | moving the default folder location to the navigator to fix the ok button issueValerio Virgillito2012-02-22
| | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | | | | | Adding some comments.Valerio Virgillito2012-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | | | | | Adding the default folder by default when opening a new file dialog.Valerio Virgillito2012-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding the default folder name in the new file dialog input field. Also some more cleanup. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | | | | | cleanup - using montage functions handlers and using the NJeventValerio Virgillito2012-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | | | | | cleanup - Removing temporary div to render the popupsValerio Virgillito2012-02-21
| | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to render the popup before opening them. Removing that hack. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-24
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | Moved all color updating routines to a single function.Nivesh Rajbhandari2012-02-24
| | | | | | |