aboutsummaryrefslogtreecommitdiff
path: root/js/io
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>
| * | | - 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>
| * | | Revert "check cloud availability before open file picker and new file dialogs"Ananya Sen2012-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3251315ecc22544dab50623ee5862e00dfe02302. Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-20
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | check cloud availability before open file picker and new file dialogsAnanya Sen2012-02-20
| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | 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 pull request #11 from ericguzman/StylesControllerUpdatesJose Antonio Marquez Russo2012-02-20
|\ \ | |/ |/| Styles controller updates
| * Cloud URL localStorage FixJose Antonio Marquez2012-02-20
| | | | | | | | Fixed logic to remember and display the previously used URL for local cloud if not started on Ninja load.
* | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-17
|\| | | | | | | | | | | | | | | Conflicts: css/ninja.css js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * Adding webRequest redirects for iFrame templatesJose Antonio Marquez2012-02-17
| |
| * Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-16
| |\
| | * Cloud download windows bug fixJose Antonio Marquez2012-02-16
| | |
| * | Adding new RDGE library dataJose Antonio Marquez2012-02-16
| |/
| * Adding Cloud app download URLsJose Antonio Marquez2012-02-16
| |
| * Setting up webGL library copy on saveJose Antonio Marquez2012-02-15
| |
| * Setting up webGL local library (assets)Jose Antonio Marquez2012-02-15
| |
* | remove similar function from coreioapi.jsAnanya Sen2012-02-16
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | moved file picker in file ioAnanya Sen2012-02-16
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Revert "Revert "Reverting text/html document classes and setting up MVC ↵Ananya Sen2012-02-15
| | | | | | | | | | | | | | | | folder structure"" This reverts commit 9048cd50bf5e0a418d1d95498bb593961f72db36. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Revert "Revert "Cleaning up""Ananya Sen2012-02-15
| | | | | | | | | | | | This reverts commit a90e3be8850b64e8e370aa8ff8cadaa448dd0c82. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Revert "Revert "Merging TextDocument into BaseDocument""Ananya Sen2012-02-15
| | | | | | | | | | | | This reverts commit b8782f2e3dd106accbb0160a98e6b498f26752ea. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Revert "Merging TextDocument into BaseDocument"Ananya Sen2012-02-15
| | | | | | | | | | | | | | | | | | | | This reverts commit 93c8f327d662a7693d1d6ca050a0efd15ebc18ed. Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Revert "Cleaning up"Ananya Sen2012-02-15
| | | | | | | | | | | | | | | | | | | | | | This reverts commit a7952c5a16e2cae3fd1a459b03b9f16bba1004da. Conflicts: js/controllers/document-controller.js js/io/document/text-document.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Revert "Reverting text/html document classes and setting up MVC folder ↵Ananya Sen2012-02-15
|/ | | | | | | | structure" This reverts commit 68ce64a5a2f4a71b54d33916aaf1d57161302425. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* Merge branch 'refs/heads/AnanyaFileIO' into FileIOJose Antonio Marquez2012-02-14
|\
| * allow / in windows directory pathAnanya Sen2012-02-14
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * use button tag for save as dialogAnanya Sen2012-02-14
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Reverting text/html document classes and setting up MVC folder structureJose Antonio Marquez2012-02-14
|/ | | | Setting up the folder structure for the proposed set up for documents in Ninja. Reverted to have a temp HTML/Text document class. Tweak some UI for file pickers.
* Cleaning upJose Antonio Marquez2012-02-14
| | | | Setting up a 'document' folder to handle all document related classes that in relation to IO
* File IO UI tweaksJose Antonio Marquez2012-02-13
| | | | Making minor tweaks to the UI for file IO, will need to make much more at a later time.
* new file dialog - preselect default templateAnanya Sen2012-02-13
| | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* Merge branch 'refs/heads/AnanyaFileIO' into FileIOJose Antonio Marquez2012-02-13
|\
| * Revert "Merge from /joseeight/ninja-internal/tree/FileIO"Ananya Sen2012-02-10
| | | | | | | | | | | | This reverts commit c48eeb01bd726895dc577d8b843b2a75883eee07. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * Merge from /joseeight/ninja-internal/tree/FileIOAnanya Sen2012-02-10
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * show iframeContainer if all documents are closedAnanya Sen2012-02-10
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
|\ \
| * | initial color chip for the stageValerio Virgillito2012-02-10
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Save 'code' view filesJose Antonio Marquez2012-02-13
| | | | | | | | | | | | Added functionality (temp) to save files in code view.
* | | File Save (with CSS styles)Jose Antonio Marquez2012-02-12
| | | | | | | | | | | | Temp fix for saving styles in <style> of HTML document.
* | | File Save (HTML only)Jose Antonio Marquez2012-02-12
| | | | | | | | | | | | Added the ability to save an HTML file from design view, need to add CSS detection and saving (of styles in <style> only). Also need to add 'Save All' for all file attached to the HTML file.
* | | File OpenJose Antonio Marquez2012-02-10
| |/ |/| | | | | Adding the functionality to open a basic file.
* | hide iframeContainer if we want to open code view as the first document ↵Ananya Sen2012-02-10
| | | | | | | | | | | | after ninja launches Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | removed temporary test to open ninja without default document, since it is ↵Ananya Sen2012-02-10
| | | | | | | | | | | | breaking other things. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-10
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: js/io/document/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | Adding download cloud app UIJose Antonio Marquez2012-02-09
| | |