aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/document-controller.js
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-01
|\
| * Squashed commit of stage architectureValerio Virgillito2012-04-30
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-26
|\| | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * Temporary fix for the PI and Stage when opening the new template.Valerio Virgillito2012-04-23
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * reverting old template to current working status. New template work.Valerio Virgillito2012-04-20
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * typo fixValerio Virgillito2012-04-19
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * initial stage web templateValerio Virgillito2012-04-18
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | - collapse panels for code view, restore for design viewAnanya Sen2012-04-18
| | | | | | | | | | | | - apply theme selection to all code view documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-17
|\|
| * Merge pull request #153 from mencio/componentsValerio Virgillito2012-04-05
| |\ | | | | | | Components panel cleanup and displaying only simple properties.
| | * Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-03-28
| | |\
| | * | removed trace statementValerio Virgillito2012-03-27
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | [CR] Keep Save related menu items always enabled, if there is an open documentAnanya Sen2012-04-04
| | |/ | |/| | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* / | - code editor view options barAnanya Sen2012-04-13
|/ / | | | | | | | | | | | | - Checkbox for user to toggle between manually triggered autocomplete and automatic autocomplete - font zoom hottext Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Merge pull request #131 from ananyasen/integration-candidateValerio Virgillito2012-03-28
|\ \ | |/ |/| Pull request IKNINJA-1302, IKNINJA-1367, IKNINJA-1361, IKNINJA-1364, IKNINJA-1302, IKNINJA-1266
| * - enable/disable save, saveAs, saveAll, close, closeAll as per documents openAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | - added close file and close all menu items Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/helper-classes/3D/draw-utils.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-22
|\ \ | | | | | | | | | FileIO-Montage-Components
| * | Changes to the webrequest blocking and adding a google.com permission workaroundValerio Virgillito2012-03-21
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Adding firstDraw event to components addedJose Antonio Marquez2012-03-22
|/ / | | | | | | This will allow us to re-parse the document for styles added dynamically.
* / Removing usage of webRequest APIsJose Antonio Marquez2012-03-21
|/ | | | Removed the usage of the webRequest API since all files are parsed on open to handle prefixing correct origin. This will most likely not work for assets that are added dynamically and will most likely break, all those adding linking to assets should make use of a function in the mediator to mask the display value and actual value of the linked asset.
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 15:27:34 +0000