aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/document-controller.js
Commit message (Collapse)AuthorAge
* IKNINJA-1305 : fixed the check for stopVideos() method's existenceAnanya Sen2012-03-16
| | | | 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>
* 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>
* - 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-1238 fix and fixing other js errors on switching and closing documentsAnanya Sen2012-03-06
| | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* Optimizing URL intercepting detectionJose Antonio Marquez2012-03-01
| | | | Modified the way the webRequest maps to the file.
* fix for creatingNewFile flagJonathan Duran2012-02-29
| | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* - added closeDocument event for timelineAnanya Sen2012-02-24
| | | | | | - minor bug fixes Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* - added flag for timeline to identify new file flowAnanya Sen2012-02-24
| | | | | | - added switchDocument event for timeline Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-23
|\
| * Fixing document mode checkJose Antonio Marquez2012-02-23
| |
* | 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>
| * App mode checking fixJose Antonio Marquez2012-02-22
| | | | | | | | Added a way to check for the app to be served over http/https to prevent from adding webRequest events on app load.
| * Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-22
| |\
| | * Fix for bug that keeps Ninja from launching over HTTP. We need to wrap any ↵John Mayhew2012-02-22
| | | | | | | | | | | | extension specific code in an if (window.chrome.app.isInstalled) check.
| * | Cleaning up and commenting CSS IOJose Antonio Marquez2012-02-22
| | |
* | | 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>
* | 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>
| * Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal ↵Valerio Virgillito2012-02-21
| |\ | | | | | | | | | | | | | | | | | | | | | | | | into file-io Conflicts: js/controllers/document-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * Removing the log of the url requestsValerio Virgillito2012-02-20
| | | | | | | | | | | | 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>
* | | fix bug when closing the first document tabAnanya Sen2012-02-21
| | | | | | | | | | | | 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>
| * | Clean up and repairing manifestJose Antonio Marquez2012-02-19
| | |
* | | check cloud availability before open file picker and new file dialogsAnanya Sen2012-02-20
| | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | - moved tools specific keyboard controls for desing view onlyAnanya Sen2012-02-20
|/ / | | | | | | | | | | - stopped snapping when all documents are closed Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | 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.
| * Squashed commit of the following:Jose Antonio Marquez2012-02-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 302ae3c1812086d976eb67c9cf693c43205f3904 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Thu Feb 16 11:13:05 2012 -0800 hide the rulers when no document is open Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 2e766c9eaa98fa20f311b3eb2f892a1a240e90cf Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Thu Feb 16 06:43:33 2012 -0800 file picker: Enable ok if user double clicks folder and enter it. Validate path if user enter it manually in addressbar. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 4937b39fb0cf542f57cdadc7d1e2ed9798f7ef87 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 16:09:14 2012 -0800 fixes to document tabbing Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 56d2a8d11a73cd04c7f1bc20d1ded52b9c1242f2 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:54:38 2012 -0800 Revert "Revert "Creating NinjaTemplate to HTML function"" This reverts commit 2e308be9bec5e06d81b2905b65005a232f0a190d. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit e2b97c951a9a5a0c4ff831d44fdd82177cbd82ad Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:54:14 2012 -0800 Revert "Revert "Reverting text/html document classes and setting up MVC folder structure"" This reverts commit 9048cd50bf5e0a418d1d95498bb593961f72db36. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit aead95ce4b2571356701229567bfde73d54bed93 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:53:55 2012 -0800 Revert "Revert "Cleaning up"" This reverts commit a90e3be8850b64e8e370aa8ff8cadaa448dd0c82. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit a8d1a2e1f4f4ab7b9298bfbd1b49731785c79c3a Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:52:56 2012 -0800 Revert "Revert "Merging TextDocument into BaseDocument"" This reverts commit b8782f2e3dd106accbb0160a98e6b498f26752ea. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit e864dc319805e259b7ae39a9d4d96fac552a1f87 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:52:38 2012 -0800 Revert "merging from github.com/joseeight/ninja-internal/tree/FileIO is breaking opening html files… to trying to fix local build" This reverts commit 3cf1d19c5cdc9534d9c87cbc7d1fcf48e68daa42. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 3cf1d19c5cdc9534d9c87cbc7d1fcf48e68daa42 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:06:42 2012 -0800 merging from github.com/joseeight/ninja-internal/tree/FileIO is breaking opening html files… to trying to fix local build Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit b8782f2e3dd106accbb0160a98e6b498f26752ea Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:01:59 2012 -0800 Revert "Merging TextDocument into BaseDocument" This reverts commit 93c8f327d662a7693d1d6ca050a0efd15ebc18ed. Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit a90e3be8850b64e8e370aa8ff8cadaa448dd0c82 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 09:58:37 2012 -0800 Revert "Cleaning up" 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> commit 9048cd50bf5e0a418d1d95498bb593961f72db36 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 09:51:12 2012 -0800 Revert "Reverting text/html document classes and setting up MVC folder structure" This reverts commit 68ce64a5a2f4a71b54d33916aaf1d57161302425. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 2e308be9bec5e06d81b2905b65005a232f0a190d Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 09:50:20 2012 -0800 Revert "Creating NinjaTemplate to HTML function" This reverts commit e327eccb93e2bc513fcbb7ab302783d6bce83884. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | changed the document dirtying logic to be done in the feature that edits the ↵Ananya Sen2012-02-17
| | | | | | | | | | | | document. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | -added keyboard control for saving documentsAnanya Sen2012-02-17
| | | | | | | | | | | | -mark html design view when element is added or deleted Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | fixes to document tabbingAnanya Sen2012-02-15
| | | | | | | | 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 from github.com/joseeight/ninja-internal/tree/FileIO is ↵Ananya Sen2012-02-15
| | | | | | | | | | | | | | | | breaking opening html files… to trying to fix local build" This reverts commit 3cf1d19c5cdc9534d9c87cbc7d1fcf48e68daa42. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | merging from github.com/joseeight/ninja-internal/tree/FileIO is breaking ↵Ananya Sen2012-02-15
| | | | | | | | | | | | opening html files… to trying to fix local build 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>
* 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
* Cleaning up mediatorJose Antonio Marquez2012-02-14
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 17:18:32 +0000