aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
| | * | | | | | | | Tool Icons : New layoutArmen Kesablyan2012-02-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | | | moving the default folder location to the navigator to fix the ok button issueValerio Virgillito2012-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | 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>
| * | | | | | | | 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.
| * | | | | | | | Merge pull request #14 from mencio/file-ioJose Antonio Marquez Russo2012-02-21
| |\| | | | | | | | | | | | | | | | | | | | | | | | | File io - Code cleanup and added default folder to the file new dialog.
| | * | | | | | | Adding some comments.Valerio Virgillito2012-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | Adding the default folder by default when opening a new file dialog.Valerio Virgillito2012-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding the default folder name in the new file dialog input field. Also some more cleanup. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | cleanup - using montage functions handlers and using the NJeventValerio Virgillito2012-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | cleanup - Removing temporary div to render the popupsValerio Virgillito2012-02-21
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to render the popup before opening them. Removing that hack. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * / | | | | | 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>
| * | | | | | 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>
| | * | | | | | enabling nested selectionValerio Virgillito2012-02-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | formatting and removing un-used code from the stageValerio Virgillito2012-02-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | cleanupValerio Virgillito2012-02-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | | | | | Removing the timeline selection code.Valerio Virgillito2012-02-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Timeline selection code is now handled by the selection controller and current container change Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | Merge branch 'refs/heads/master' into nested-selectionValerio Virgillito2012-02-20
| | |\ \ \ \ \ \
| | * | | | | | | formatting cleanupValerio Virgillito2012-02-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | cleanup of the breadcrumbValerio 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>
* | | | | | | | | edit by Eric G.: catch the error instead of doing the null check for the ↵Ananya Sen2012-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stale element Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | | added null check for matchedRules in styles-controller.js, to fix js error ↵Ananya Sen2012-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on reopening and edited html document 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>
| * \ \ \ \ \ \ \ Merge pull request #11 from ericguzman/StylesControllerUpdatesJose Antonio Marquez Russo2012-02-20
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Styles controller updates
| | * \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into StylesControllerUpdatesEric Guzman2012-02-20
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Cloud URL localStorage FixJose Antonio Marquez2012-02-20
| | | | |_|_|_|_