aboutsummaryrefslogtreecommitdiff
path: root/js/mediators
Commit message (Collapse)AuthorAge
* Fixing curly brackets from auto-merge.Nivesh Rajbhandari2012-04-05
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Removing unnecessary code element = element.Nivesh Rajbhandari2012-04-05
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/default_html.css js/mediators/element-mediator.js js/panels/properties.reel/properties.js js/tools/BrushTool.js js/tools/LineTool.js js/tools/PenTool.js js/tools/SelectionTool.js js/tools/ShapeTool.js js/tools/TranslateObject3DTool.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Merge branch 'refs/heads/WebGLFileIO' into ToolFixesNivesh Rajbhandari2012-04-04
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: assets/canvas-runtime.js js/controllers/elements/shapes-controller.js js/lib/drawing/world.js js/lib/geom/geom-obj.js js/lib/geom/line.js js/mediators/element-mediator.js js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Adjusting line's width and height when changing stroke size.Nivesh Rajbhandari2012-04-04
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * IKNinja-1375 - After WebGL conversion from PI, Selection tool gets ↵Nivesh Rajbhandari2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | deactivated or becomes non-functional to the shape. Need to set elementModel.isIn2DSnapCache to false when replacing element. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-04-04
| |\ \
| | * \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-04-04
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch Conflicts: js/lib/drawing/world.js
| | * | | Removed the dependence on an "assets" directory for the RDGE runtime. Now ↵John Mayhew2012-04-03
| | | | | | | | | | | | | | | | | | | | Ninja does not need to create duplicate files when it sets up the users Ninja Projects directory for RDGE support.
| | * | | Namespaced the canvas runtime file and updated all dependenciesJohn Mayhew2012-04-03
| | | |/ | | |/|
| * | | Adding replaceElement routine and event so Timeline can avoid removing and ↵Nivesh Rajbhandari2012-04-04
| | |/ | |/| | | | | | | | | | | | | adding layers and PI and SelectionController can avoid deselecting and reselecting the element. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Squashed commit of Preparing for the montage undo-manager: Architecture changesValerio Virgillito2012-04-04
| |/ | | | | | | | | | | | | | | | | Reworked the add and remove elements into 1 function which can take 1 or more elements. Removed the _element from the selection array Many other changes related to those 2 changes Undo/Redo shortcuts are now using montage undo/redo manager. Signed-off-by: Valerio Virgillito <valerio@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
| | * KNINJA-1302 : refactored fixed as per requestAnanya Sen2012-03-22
| | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * IKNINJA-1302 : For File>New and File>SaveAll dialogs, 'ESC' key now ↵Ananya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | triggers Cancel button and 'Enter' key now triggers OK button. For File picker, the 'ESC' now triggers the Cancel button. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/io/ui/new-file-dialog/new-file-workflow-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-03-27
|\| | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Removing m-js components I/O and fix for webGLJose Antonio Marquez2012-03-23
| | | | | | | | | | | | Removed saving m-js components as new components broke I/O when present. Also made a fix for checking length of webGL array since first item now is non-user data. (That is to be removed)
| * | Adding Ninja URL method to io-mediatorJose Antonio Marquez2012-03-22
| | |
| * | Tests and clean-upJose Antonio Marquez2012-03-18
| | |
| * | Temp I/O functionality for M-JS componentsJose Antonio Marquez2012-03-18
| |/ | | | | | | Added the ability to save montages component serialization from Ninja. Very rough, but functional.
* | IKNINJA-758 - The rotation value of the stage is not updated in the ↵Nivesh Rajbhandari2012-03-22
| | | | | | | | | | | | properties panel. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Do not set webkit-transform styles on elements unless 3d is used on them.Nivesh Rajbhandari2012-03-21
|/ | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* fixing the components drag and drop.Valerio Virgillito2012-03-16
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* fixing the drag and drop images to the pasteboardValerio Virgillito2012-03-16
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Temp fix applied to all elementsJose Antonio Marquez2012-03-15
| | | | This should be moved to 'makeNJElement' to account for the element to be loaded.
* Temp fix for element dimensions (SVG)Jose Antonio Marquez2012-03-15
| | | | Added a temp fix to allow for a redraw of an SVG on load.
* Fixing offset bug for drag-and-dropJose Antonio Marquez2012-03-15
|
* Adding Temp drag-drop I/O supportJose Antonio Marquez2012-03-15
| | | | Added methods to get data from dropped file while document is opened and save as a file. Currently only supporting images and SVGs, no error handling, which will have to be done.
* Merge pull request #110 from mqg734/WebGLFixesValerio Virgillito2012-03-13
|\ | | | | Gradient Support for Shapes and Eyedropper support for gradients. Also fixed 3d bug when moving multiple selections in 3d using the Selection Tool
| * Fixed element mediator, PI, and eye-dropper to handle different borders ↵Nivesh Rajbhandari2012-03-12
| | | | | | | | | | | | sides and gradients. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Cleaning up webGL runtimeJose Antonio Marquez2012-03-13
| |
* | Clean up and TODOsJose Antonio Marquez2012-03-12
| |
* | 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.
* | Clean upJose Antonio Marquez2012-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.
* | Adding I/O functionality to RDGEJose Antonio Marquez2012-03-08
|/ | | | Added webGL/Canvas file I/O for Ninja, it also created routine for saving data for runtime, however, the runtime RDGE library needs an update for runtime to work, so right now I/O will only work for Ninja.
* Image data fix on OpenJose Antonio Marquez2012-03-07
| | | | Fixed a bug with data-uris not opening correctly.
* Adding CDN support for URLs in linked CSSJose Antonio Marquez2012-03-06
|
* Fixing WebGL not available bugJose Antonio Marquez2012-03-06
|
* Changing length of characters per line (pretty function)Jose Antonio Marquez2012-03-06
|
* 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.
* 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.
* Minor logic fixes for URL resolution in CSSJose Antonio Marquez2012-03-02
|
* Fixing CSS URL issuesJose Antonio Marquez2012-03-02
| | | | Only partially, supporting unquoted files under same root.
* Fixing IO RegExJose Antonio Marquez2012-03-02
| | | | Fixed parsing files to have correct URLs with RegEx, inner content of CSS files still needs to be fixed.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 13:45:25 +0000