aboutsummaryrefslogtreecommitdiff
path: root/js/document
Commit message (Collapse)AuthorAge
* persist selections while switching documentsAnanya Sen2012-02-28
| | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-27
|\
| * Fixed issue with losing track of Ninja template cssJose Antonio Marquez2012-02-26
| | | | | | | | Also cleaned up URL getter for app in cleaning string code.
| * Cleaning up comments for external styles loadingJose Antonio Marquez2012-02-25
| |
| * Cleaning up ninja-data attributesJose Antonio Marquez2012-02-25
| | | | | | | | Added logic to load cross-domain CSS from CDN, but need to explore how to load without impacting permissions.
| * Merge pull request #19 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-24
| |\ | | | | | | FileIO branch pull request
| * | Added import/export of RDGE dataJose Antonio Marquez2012-02-24
| | | | | | | | | | | | This is only the IO aspect, the data getter seems broken for 2D canvas and does not allow for save, and nothing works for setting the data on load. However, the IO aspect of saving and opening the data are not incorporated.
* | | - save show3DGrid flag per document while switching documentsAnanya Sen2012-02-27
| |/ |/| | | | | | | | | - fix zoom tool keyboard control to listen to Z when ctrl and shift keys are not pressed with it Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-23
|\|
| * Merge pull request #17 from ericmueller/integrationJose Antonio Marquez Russo2012-02-23
| |\ | | | | | | Integration
| | * GL save and reload.hwc4872012-02-22
| | |
* | | refresh draw-utils, snap-manager, view-utils for html document stitchingAnanya Sen2012-02-23
| | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-23
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js js/helper-classes/3D/snap-manager.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into file-ioValerio Virgillito2012-02-23
| |\ \
| | * | Temp fix for CSS url dataJose Antonio Marquez2012-02-22
| | | | | | | | | | | | | | | | Added a temp fix to parse out the app url that is placed in the CSS styles.
| | * | Cleaning up and commenting CSS IOJose Antonio Marquez2012-02-22
| | | |
| | * | Logic to save <style> for a fileJose Antonio Marquez2012-02-22
| | | | | | | | | | | | | | | | Saving CSS in <style> tags, need to implement saving CSS to files.
| | * | Removed css not needed in Ninja TemplateJose Antonio Marquez2012-02-22
| | | |
| * | | 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>
* | | switch html document - re-initialize draw-utils and snap-manager on opening ↵Ananya Sen2012-02-23
| |/ |/| | | | | | | | | a document and while switching documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | 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.
* | 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.
* user document main reel listener moved to the html-document class.Valerio Virgillito2012-02-21
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* fixing the dirty flag and removing sass changesValerio Virgillito2012-02-21
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Clean up and repairing manifestJose Antonio Marquez2012-02-19
|
* Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-18
|\ | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * Chrome PreviewJose Antonio Marquez2012-02-17
| |
* | 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
| |
| * Adding Chrome webRequest interceptJose Antonio Marquez2012-02-17
| | | | | | | | Need to add logic to resolve file's actual URL dynamically.
| * Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-16
| |\
| * | Moving Ninja iFrame templatesJose Antonio Marquez2012-02-16
| |/
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-02-16
| |
| * Setting up webGL library copy on saveJose Antonio Marquez2012-02-15
| |
| * Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-15
| | | | | | | | | | Conflicts: js/document/html-document.js
* | renamed methods to use better wordsAnanya Sen2012-02-17
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | use method to update dirtyFlagAnanya Sen2012-02-17
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Revert "Revert "Creating NinjaTemplate to HTML function""Ananya Sen2012-02-15
| | | | | | | | | | | | This reverts commit 2e308be9bec5e06d81b2905b65005a232f0a190d. 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>
* | Revert "Creating NinjaTemplate to HTML function"Ananya Sen2012-02-15
|/ | | | | | This reverts commit e327eccb93e2bc513fcbb7ab302783d6bce83884. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* Creating NinjaTemplate to HTML functionJose Antonio Marquez2012-02-14
| | | | This function will need to be cleaned up and possibly moved once the MVC structure is in-place for the document.
* 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.
* Merging TextDocument into BaseDocumentJose Antonio Marquez2012-02-14
| | | | Merged the text-document class with base-document, didn't make sense to have two classes for basic model of documents, the html-document class remain extending base-document to incorporate design view. These two classes might be renamed.
* Cleaning upJose Antonio Marquez2012-02-14
Setting up a 'document' folder to handle all document related classes that in relation to IO
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 19:43:55 +0000