aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* Merge pull request #105 from joseeight/FileIO-Build-CandidateValerio Virgillito2012-03-13
|\ | | | | File I/O adding webGL/canvas data functionality
| * Cleaning up webGL runtimeJose Antonio Marquez2012-03-13
| |
| * Clean up and TODOsJose Antonio Marquez2012-03-12
| |
| * Add temp delay for webGL previewJose Antonio Marquez2012-03-10
| | | | | | | | Added a padded launch webGL preview delay. This is very temporary, just a work around until RDGE issues are fixed.
| * Temp Runtime WebGL FixJose Antonio Marquez2012-03-10
| | | | | | | | Added a temporary fix to allow for webGL runtime functionality. Copying the desired folder name into a static name. There is a lag in doing this, so obviously now ideal. Need to discuss adding dynamic path-ing during author and runtime.
| * Setting local path to assetsJose Antonio Marquez2012-03-10
| | | | | | | | This is still no resolving issues with webGL runtime.
| * Merge branch 'refs/heads/Ninja-Internal' into FileIO-IntegrationJose Antonio Marquez2012-03-09
| |\
| * \ Merge branch 'refs/heads/Ninja-Internal' into FileIO-IntegrationJose Antonio Marquez2012-03-09
| |\ \
| * | | Fixing Issues for Windows LibJose Antonio Marquez2012-03-09
| | | |
| * | | Merge pull request #33 from ericmueller/integrationJose Antonio Marquez Russo2012-03-09
| |\ \ \ | | | | | | | | | | Integration
| | * | | remap hard coded strings in rdge internal code.hwc4872012-03-09
| | | | |
| | * | | Merge branch 'FileIO-Integration' of github.com:joseeight/ninja-internal ↵hwc4872012-03-09
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into integration Conflicts: js/document/html-document.js
| | * | | | further removal of authortime asset path replacement.hwc4872012-03-09
| | | | | |
| * | | | | Removing duplicate fileJose Antonio Marquez2012-03-09
| | |/ / / | |/| | |
| * | | | Clean upJose Antonio Marquez2012-03-09
| | | | |
| * | | | Merge pull request #32 from ericmueller/integrationJose Antonio Marquez Russo2012-03-09
| |\| | | | | | | | | | | | | Added asset folder replacement to runtime load.
| | * | | Removed asset path replacement at authortime.hwc4872012-03-09
| | | | |
| * | | | Adding missing file for webGL, still need a fix for runtimeJose Antonio Marquez2012-03-09
| |/ / /
| * | | Adding webGL I/O runtime functionalityJose Antonio Marquez2012-03-09
| | | | | | | | | | | | | | | | There is a problem that needs to be resolved in the CanvasRuntime.
| * | | Merge branch 'refs/heads/integration' into FileIO-IntegrationJose Antonio Marquez2012-03-09
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js
| | * | | Canvas IOhwc4872012-03-08
| | | | |
| * | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-08
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js js/helper-classes/3D/draw-utils.js
| * \ \ \ \ Merge pull request #30 from ananyasen/FileIO-ananyaJose Antonio Marquez Russo2012-03-08
| |\ \ \ \ \ | | | | | | | | | | | | | | FileIO branch pull request
| | * \ \ \ \ Merge branch 'refs/heads/FileIO-jose' into FileIO-ananyaAnanya Sen2012-03-08
| | |\ \ \ \ \
| | * | | | | | null the arrays on all documents closed, so that they get garbage collectedAnanya Sen2012-03-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | minor fixesAnanya Sen2012-03-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | added close file menu itemAnanya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIO-ananyaAnanya Sen2012-03-06
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/selection-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | removed unnecessary console logsAnanya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | IKNINJA-1270: fixed browser crashing when you close a document while playing ↵Ananya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a video then wait for a while Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | updated file picker image iconsAnanya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | - detect document style edit [with Eric's input for styles-controller.js]Ananya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - integrated save as Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | IKNINJA-1256 fix - needed to convert String object to stringAnanya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | IKNINJA-1238 fix and fixing other js errors on switching and closing documentsAnanya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | fixed picker address dropdown to backtrace till the logical driveAnanya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | IKNINJA-1207: added check for design view to fix js errorAnanya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | Fixing WebGL not available bugJose Antonio Marquez2012-03-06
| | | | | | | | |
| | * | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-06
| | |\ \ \ \ \ \ \
| | * | | | | | | | Changing length of characters per line (pretty function)Jose Antonio Marquez2012-03-06
| | | | | | | | | |
| | * | | | | | | | CSS on CDN preview fixJose Antonio Marquez2012-03-05
| | | | | | | | | |
| | * | | | | | | | Temp support for CDN CSSJose Antonio Marquez2012-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a temp fix for allow the viewing of CSS on a CDN, however, the styles should not be editable, but will allow for accurate preview of styles. Need to coordinate with the CSS panel and styles manager to insert styles in the appropriate files or tags that have write permission.
| | * | | | | | | | Minor FixJose Antonio Marquez2012-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forgot to comment out the return, therefore preventing to save.
| | * | | | | | | | Fixed URL parsing issue on actual opened documentJose Antonio Marquez2012-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still need to implement CSS loaded from a CDN, currently this would break Ninja.
| | * | | | | | | | Resolved URL path issues in document and CSSJose Antonio Marquez2012-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added logic to allow for files opened and assets linked in any order all under the cloud server root.
| | * | | | | | | | Setting up document level URL parsingJose Antonio Marquez2012-03-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set up logic to parse URLs document level (href, src, url) still need to add functionality to return proper value, currently only detecting current value.
| | * | | | | | | | Improved CSS URL cleanedJose Antonio Marquez2012-03-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added logic to accommodate any URLs in a CSS file inside the opened document root. Need to add logic for handling linked references above the root. Also need to reformat into a reusable method as it might be needed besides CSS.
| | * | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-02
| | |\ \ \ \ \ \ \ \