aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements
Commit message (Collapse)AuthorAge
...
| | * IKNinna-1409 - Should dirty document when changing shape properties. ↵Nivesh Rajbhandari2012-04-02
| | | | | | | | | | | | | | | | | | IKNinja-1391 - Shapes need to support no-color. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Merge branch 'refs/heads/ninja-internal' into WebGLFileIONivesh Rajbhandari2012-03-30
| | |\ | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Updated shapes to always check for its stroke and fill colors and materials ↵Nivesh Rajbhandari2012-03-29
| | | | | | | | | | | | | | | | | | | | | | | | instead of relying on the shapeModel cache because it can get out of sync. 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>
| * | Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
| |\|
| * | Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
| |\ \ | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js
| * | | revert to using the angle without flipping its sign...fixing some minor bugs ↵Pushkar Joshi2012-03-20
| | | | | | | | | | | | | | | | | | | | | | | | and code cleanup GOOD status before doing 3D unprojection step
| * | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-16
| |\ \ \
| * | | | update values in the PI from values of the selected brush stroke or pen tool ↵Pushkar Joshi2012-03-15
| | | | | | | | | | | | | | | | | | | | path
| * | | | PI for pen and brush strokesPushkar Joshi2012-03-14
| | | | |
* | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-03-27
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Reverting change for IKNinja-1355 because it is causing line tool to fail.Nivesh Rajbhandari2012-03-27
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | Check for Viewport case in StageController styles lookup.Nivesh Rajbhandari2012-03-27
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-03-27
|\| | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Fixed a problem switching from 3D to 2D and back to 3D.hwc4872012-03-23
| | | |
| * | | Respect play/pause WebGL animation when saving files and re-rendering caused ↵Nivesh Rajbhandari2012-03-23
| | | | | | | | | | | | | | | | | | | | | | | | by geometry changes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Adding checkbox in PI to start/stop WebGL animation preview.Nivesh Rajbhandari2012-03-22
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-21
| |\ \ \
| * | | | fixing the selection of components. Temporary workaround for now.Valerio Virgillito2012-03-18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Adding back webkit-transform styles in set3DProperties. Changing "zoom" to ↵Valerio Virgillito2012-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "zoomValue" in map component to avoid scaling the map. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | fixing the map styles and temporary disabling the 3d styles for elements.Valerio Virgillito2012-03-17
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Adding logic for flatten checkbox in PI.Nivesh Rajbhandari2012-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This requires minor modifications to both StageController and ComponentController. Also removing unused global3DSettings CSS. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | WebGL needs to have 3d styles to render.Nivesh Rajbhandari2012-03-22
| | | | | | | | | | | | | | | | 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>
* | | | Get matrix and perspective distance from styles controller.Nivesh Rajbhandari2012-03-21
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | IKNINJA-1370 - Toggle WebGL on/off is no longer working in the PI.Nivesh Rajbhandari2012-03-20
| |/ / |/| | | | | | | | | | | | | | This bug was injected by some changes in GLWorld.import. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Support button control in Properties Panel and use them for edit fill and ↵Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | | stroke material. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Removing zoom from element's getMatrix. Zoom should only be checked on stage.Nivesh Rajbhandari2012-03-20
|/ / | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* / Removing the name attribute from the PI. Fixing the ID and Class attribute ↵Valerio Virgillito2012-03-14
|/ | | | | | from the PI Signed-off-by: Valerio Virgillito <valerio@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>
* gradient support for canvas-2d shapes.Nivesh Rajbhandari2012-03-07
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Gradient support for canvas-2d rectangle.Nivesh Rajbhandari2012-03-07
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* preliminary support for setting gradients on webgl shapes.Nivesh Rajbhandari2012-03-07
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Squashed commit of preload-fix into MasterValerio Virgillito2012-03-06
| | | | | | | - Requiring all the previously pre-loaded files - RDGE, Codemirror and gl-matrix are not included via a script tag. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* stage and elements fixesValerio Virgillito2012-03-01
| | | | | | | | - Resizing the iframe container when resizing the stage - Removing 3d rules from elements when adding them - Adding a name property in the pi Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Fix for performance issue when moving shapes. We don't need to call render ↵Nivesh Rajbhandari2012-02-29
| | | | | | | | except if the geometry and materials change. This is more easy to see with shapes like the brush tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* 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>
| * Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| |\
| | * Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-22
| | |\
| | * | Fixing eyedropper tool to get color from image data. This required us to ↵Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | | | | | | | | | workaround having inconsistent color object. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Do not use color object for stage's border since we don't allow users to ↵Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | | | | | | | | | modify the stage's border; we only need the border-width. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Color chips expect a color object, not a css value.Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| |\ \ \ | | |/ / | |/| / | | |/
| * | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-20
| |\ \
| * \ \ Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-14
| |\ \ \
| * \ \ \ Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-14
| |\ \ \ \
| * | | | | Working around inconsistent color object when getting/setting WebGL values.Nivesh Rajbhandari2012-02-13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Updated ink bottle tool to use new setColor routine in the mediator and ↵Nivesh Rajbhandari2012-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | controllers. Signed-off-by: Nivesh Rajbhandari <mqg734@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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 19:11:23 +0000