aboutsummaryrefslogtreecommitdiff
path: root/js/mediators/element-mediator.js
Commit message (Collapse)AuthorAge
* removing _undo array and _targets array and use object instead of matching ↵Valerio Virgillito2012-04-13
| | | | | | arrays to set properties Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* setAttribute added to the undo/redoValerio Virgillito2012-04-09
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* setProperties to the montage undo/redoValerio Virgillito2012-04-09
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Adding back fix in mediator to not set 3d styles unless necessary.Nivesh Rajbhandari2012-04-05
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* 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>
| * | 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>
* | 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>
* 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>
* renaming makeElementModel2 to makeModelFromElementValerio Virgillito2012-02-23
| | | | 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>
| * cleanupValerio 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>
* | doc.markEdited() removed from element-mediator, for style changes, as per ↵Ananya Sen2012-02-18
| | | | | | | | | | | | teams suggestion Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | renamed methods to use better wordsAnanya Sen2012-02-17
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | use method to update dirtyFlagAnanya Sen2012-02-17
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | mark document on setting color, properties and stroke.Ananya Sen2012-02-17
| | | | | | | | 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>
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-10
|\ | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html
| * Squashed commit of the following:Jonathan Duran2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit fe0d1578305db78eb5a744c354dbbb3cec67be2a Author: Kruti Shah <kruti.shah@motorola.com> Date: Thu Feb 9 11:43:53 2012 -0800 Removing a flag Signed-off-by: Kruti Shah <kruti.shah@motorola.com> commit 7a7e5d9a07c85a9a35297efe74f8b45bc4bd3c62 Author: Kruti Shah <kruti.shah@motorola.com> Date: Thu Feb 9 11:42:39 2012 -0800 Timeline : Selection Handling depending on layer selected Signed-off-by: Kruti Shah <kruti.shah@motorola.com> commit d0a4d88ddef2f1690da490cf8f3d167f1eb01945 Merge: ad214f9 f6ad57e Author: Kruti Shah <kruti.shah@motorola.com> Date: Thu Feb 9 09:54:42 2012 -0800 Merge branch 'refs/heads/Timeline' into Timeline_updated Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com> commit ad214f9b5bc19c43eac39e4c9d93cd9645aed2ea Author: Kruti Shah <kruti.shah@motorola.com> Date: Thu Feb 9 09:40:14 2012 -0800 Timeline : When element selected the corresponding layer highlights Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Squashed commit of the following:Jonathan Duran2012-02-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 763910b9d074137eb7dee80447b89407ce5750c9 Merge: e557937 329a859 Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Feb 8 10:18:36 2012 -0800 Merge pull request #20 from mqg734/ToolFixes Hooked up materials code to go through the ShapesController and updated the PI to reflect the currently selected shape's materials. Also fixed the following bugs: commit e5579374ff39b80b8c0c69faba37f6f581758fe0 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Feb 7 13:28:17 2012 -0800 updated montage v.0.6 to the latest changes. Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit 329a859e2666716c3a1d99c6bd2679e10c81fc8d Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Tue Feb 7 15:25:11 2012 -0800 Added ability to toggle combobox's visibility so we can show/hide materials comboboxes in the tool options. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 668510892537eaaeb2e11520831d87b44b2489b7 Merge: 8950b34 c066fb4 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Feb 7 14:19:22 2012 -0800 Merge pull request #19 from ericguzman/TreeComponents Tree Components - Added copyright comments commit aec849d91e4b697d496b9ede28b5d89cf2283781 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Tue Feb 7 14:18:13 2012 -0800 id's must start with a letter, so our workaround for using uuid for RDGE canvas id's won't work because they often start with a number. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit e8e21367e59bb521801fe2e843f42ad5bca5ea9f Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Tue Feb 7 13:52:54 2012 -0800 Fixing some typos and undeclared variables in GLRectangle and ShapesController. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit c066fb41ebee85bacf9b2155366b16831af41d76 Author: Eric Guzman <ericg@motorola.com> Date: Tue Feb 7 13:46:05 2012 -0800 Tree Components - Added copyright comments commit 3a8875c288049b466bfeb8b7f0510fd8cbfb970d Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Tue Feb 7 13:30:08 2012 -0800 Supporting switching materials in the PI. Also, moved makeFillMaterial and makeStrokeMaterial functions into GLGeomObj so shapes other than GLRectangle can use these routines. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 8ad767b61460984a4031ba630f76ac8247a61857 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Tue Feb 7 11:42:10 2012 -0800 Fixed PI to support WebGL materials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 486842239c71e7964f38a09aacda4970f2a82e1a Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Tue Feb 7 10:58:14 2012 -0800 Updated tools and PI to get/set materials by binding to appModel's materials property. This requires us to add FlatMaterial to the list of materials in the MaterialsLibrary. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 789eaf5a92c903f27462c69a8890fbec695ab14e Merge: 92ae17b 8950b34 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Tue Feb 7 09:36:29 2012 -0800 Merge branch 'refs/heads/ninja-internal' into ToolFixes commit 92ae17bc800cf82cdbd1482ef1af1a5fd7bd632a Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Mon Feb 6 16:35:12 2012 -0800 Force layout canvas and SelectionController to update their info when a 2d canvas is replaced by a 3d canvas (and vice-versa). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 75486be2839494c9b54833aff8f5eef3f9542151 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Mon Feb 6 15:41:48 2012 -0800 Support toggling between 2d and 3d canvas context. This requires us to create a new canvas with all the same values as the canvas being replaced and copying over all the shape data. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit f94b0c5ada403379b3ff8a900c2a2aabcecce49e Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Mon Feb 6 14:03:40 2012 -0800 Add enabled property for ComboBox to support enabling/disabling materials dropdowns in the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 5737864d1d55d96e3cc3c1bc9b38ec58303b3981 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Mon Feb 6 13:35:30 2012 -0800 Allow users to switch between 2d and webGL mode. Note that this doesn't currently work. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 486d9a31a85dd833a1c798049a00403756703034 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Mon Feb 6 11:35:49 2012 -0800 Support use WebGL checkbox in the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
|\ \
| * | Support toggling between 2d and 3d canvas context. This requires us to ↵Nivesh Rajbhandari2012-02-06
| |/ | | | | | | | | | | create a new canvas with all the same values as the canvas being replaced and copying over all the shape data. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
|\|
| * Fixing format of for loop.Nivesh Rajbhandari2012-02-06
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Handle delete of multiple objects. Also, have deletion go through the ↵Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | mediator so elementDeleted event is fired for SnapManager, DrawUtils, etc. to clean up after deleted element(s). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Update grid and planes when elementChange event signifies the "matrix", ↵Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | "left", "top", "width" or "height" properties have changed. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Merge branch 'refs/heads/NiveshColor' into ToolFixesNivesh Rajbhandari2012-02-03
| |\ | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Updated color code in the PI to go through element mediator.Nivesh Rajbhandari2012-02-01
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Updated color code to handle shapes.Nivesh Rajbhandari2012-01-31
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-02
|\| | | | | | | | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js
| * | Fixed issue with elements not drawing in the correct plane.Nivesh Rajbhandari2012-01-30
| |/ | | | | | | | | | | When first adding an element, force the 3d model to update with the element's webkit transform values. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* / Merged old FileIOJose Antonio Marquez2012-01-27
|/
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 10:15:43 +0000