aboutsummaryrefslogtreecommitdiff
path: root/js/io
Commit message (Collapse)AuthorAge
* Adding back the local storage check in the cloudpopup.Nivesh Rajbhandari2012-02-22
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Revert "Integrating canvas-2d drawing and WebGL fixes, including adding back ↵Nivesh Rajbhandari2012-02-22
| | | | | | WebGL materials." This reverts commit 96a0a8c916533eb5625816192ed38488f639326d.
* 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
| | |
| * | disabling the auto open of a document on load. Temporary using the new ↵Valerio Virgillito2012-02-09
| | | | | | | | | | | | | | | | | | project button to open a document. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | file open and file new integrated againAnanya Sen2012-02-10
|/ / | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | File OpenJose Antonio Marquez2012-02-09
| | | | | | | | Adding file open functionality.
* | Merge branch 'refs/heads/AnanyaFileIO' into FileIOJose Antonio Marquez2012-02-09
|\ \ | | | | | | | | | | | | | | | Conflicts: js/io/system/fileio.js js/mediators/io-mediator.js
| * | fixed templates descriptor, changed validation to on key up, fixed minor ui ↵Ananya Sen2012-02-09
| | | | | | | | | | | | | | | | | | issues Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | New FileJose Antonio Marquez2012-02-09
|/ / | | | | | | Adding new file functionality, awaiting UI to implement correct file path for templates to hook into mediator.
* | Fixing URI for templates, need UI to use correct dataJose Antonio Marquez2012-02-09
| |
* | Adding a purge library methodJose Antonio Marquez2012-02-08
| | | | | | | | Added a delete libraries function to delete all libraries in Chrome sandbox (as in a force delete). Also updated descriptor files to go with new directory layout of files and relation to the relatives paths used by the packed app and it's manifest.
* | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-08
|\ \