aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/document-controller.js
Commit message (Collapse)AuthorAge
...
* Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-14
|\ | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| * Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-14
| |\
| | * Merge pull request #226 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-14
| | |\ | | | | | | | | Fixing 3d to work in banner templates.
| | * | Fixing webRequest URL parsingJose Antonio Marquez2012-05-14
| | | |
| * | | Viewport for banner templates so content doesn't push through "body".Nivesh Rajbhandari2012-05-14
| | |/ | |/| | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Fixing 3d to work in banner templates.Nivesh Rajbhandari2012-05-14
| |/ | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* / code cleanupValerio Virgillito2012-05-14
|/ | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Adding support for new templatesJose Antonio Marquez2012-05-11
| | | | This is supported for NEW and OPEN, SAVE is not supported yet by I/O. Saving works, but it will not be a banner template.
* Fixing the dirty document flag. Disabling the stylesheets dirty flag because ↵Valerio Virgillito2012-05-10
| | | | | | === true on document open. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Adding webRequest APIJose Antonio Marquez2012-05-10
| | | | Adding webRequest API to handle local URLs intercepting. Should be a temp fix.
* Adding partial close functionalityJose Antonio Marquez2012-05-10
|
* Adding support to save body's css styles on preview.Nivesh Rajbhandari2012-05-09
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-08
|\
| * Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-08
| |\
| | * fixed javascript errorsAnanya Sen2012-05-07
| | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | Adding SAVE for I/OJose Antonio Marquez2012-05-08
|/ / | | | | | | Adding save functionality to new template. Need to implement user UI for prompts and also clean up...
* | Adding Chrome PreviewJose Antonio Marquez2012-05-08
| |
* | Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-04
|\|
| * Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-01
| |\
| * \ 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>
| * | | - 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
| |\ \ \
| * | | | - 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>
* | | | | Preliminary IO to new DOM viewJose Antonio Marquez2012-05-01
| |_|_|/ |/| | |
* | | | Squashed commit of stage architectureValerio Virgillito2012-04-30
| |_|/ |/| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@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>
* | 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>
* | 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
|\
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 07:24:49 +0000