aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* 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/Timeline-jreid' into TimelineJonathan Duran2012-02-08
|\
| * Timeline: restore method incorrectly removed in last commit.Jon Reid2012-02-08
| |
* | Keyframe and span style updates and change time marker timesJonathan Duran2012-02-08
|/ | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline: Feature: select first layer by default. Bug fix: Remove left panel ↵Jon Reid2012-02-08
| | | | blur; we should never have a situation where no layers are selected.
* Merge branch 'Timeline-jduran' into Timeline-jreidJon Reid2012-02-08
|\ | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
| * Merge branch 'refs/heads/Timeline_updated' into TimelineJonathan Duran2012-02-08
| |\ | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * Timeline : Adding functionality to unable deletion when a single layer ↵Kruti Shah2012-02-07
| | | | | | | | | | | | | | | | | | remaining & when track is animated Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | * Timeline : Layers & DOM enchancementKruti Shah2012-02-07
| | | | | | | | | | | | | | | | | | | | | | | | - Undo & Redo of Layers within same container - Undo & Redo of Layers between different containers - Adding the element on the layer selected else default is the last layer drawn Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | * Timeline : Change in the Hooking up of DOM/LayersKruti Shah2012-02-06
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | Layer Undo enhancementsJonathan Duran2012-02-07
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | Add Span color highlight for animated spans and restyle keyframesJonathan Duran2012-02-07
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Timeline: Comment updates.Jon Reid2012-02-07
| | |
* | | Timeline: Finish focus/blur for left side of panel. Add new methods ↵Jon Reid2012-02-07
| | | | | | | | | | | | selectLayer, getLayerIndexByID and getLayerIndexByName.
* | | Timeline: select/deselect layers. Work on focus/blur for layers.Jon Reid2012-02-07
| | |
* | | Timeline: fix linked scrolling between tracks and layers (vertical) and ↵Jon Reid2012-02-07
|/ / | | | | | | tracks and time markers (horizontal).
* | Hookup track animations to layer elementJonathan Duran2012-02-07
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Fix timeline time markersJonathan Duran2012-02-07
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Change DOM/layer handling workflowJonathan Duran2012-02-07
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Fix resized going off screen by giving layer gutter a max width of 500Jonathan Duran2012-02-06
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Jonathan Duran2012-02-06
|\ \ | | | | | | | | | Timeline
| * | Attempt to fix initialization bug for snap-managerJose Antonio Marquez2012-02-06
| | |
| * | TreeController - moving the tree controller to the components directoryEric Guzman2012-02-06
| | |
| * | Tree Components - Adding the tree componentsEric Guzman2012-02-06
| | |
| * | Tree Controller - Clean out unused codeEric Guzman2012-02-06
| | |
| * | Tree Controller - Initial addEric Guzman2012-02-06
| | |
| * | Styles Controller - Add some methods for modifying css keyframe rulesEric Guzman2012-02-06
| | |
| * | Styles Controller - Correct author attribution for specificity calculationEric Guzman2012-02-06
| | |
| * | Styles Controller - Add code to remove cache items from history (not just ↵Eric Guzman2012-02-06
| | | | | | | | | | | | nullifying them)
| * | Styles Controller - First stab at group stylingEric Guzman2012-02-06
| | | | | | | | | | | | Split "createOverrideRule" into two methods --> now has createOverrideSelector. Also took first stab at creating a group style.
* | | Change keyframe to use element mediator when repositioning animated elements ↵Jonathan Duran2012-02-06
| | | | | | | | | | | | | | | | | | on stage Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Fix Timeline layer resizer from being inversedJonathan Duran2012-02-06
| | | | | | | | | | | | | | | | | | layer resizer now works in the correct direction when dragging Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Timeline: add new layers to top of stack instead of bottom.Jonathan Duran2012-02-06
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Fix problem with resizer set to capture all webkitTransitionEnd events. ↵Jonathan Duran2012-02-06
| |/ |/| | | | | | | | | Update collapser to use namespaced webkitTransitionEnd events for forward compatibility. Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Add back keyframe selection codeJonathan Duran2012-02-06
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Integrate breadcrumb component and layer handling codeJonathan Duran2012-02-06
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | style controller update for CSS animationsJonathan Duran2012-02-06
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | merge new timelineJonathan Duran2012-02-06
|/ | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Merge pull request #15 from mqg734/ToolFixesValerio Virgillito2012-02-06
|\ | | | | Adding, deleting and modifying elements now keep the element planes and PI in sync.
| * Fixing format of for loop.Nivesh Rajbhandari2012-02-06
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * We were only updating the first custom section in the PI.Nivesh Rajbhandari2012-02-03
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Update element planes after shapes are created so stage grid updates.Nivesh Rajbhandari2012-02-03
| | | | | | | | 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>
| * 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>
| | * Removed border special-casing from PI since the mediator now handles this ↵Nivesh Rajbhandari2012-02-01
| | | | | | | | | | | | | | | | | | generically. Updated mediator's set stroke routine to use the setColor routine. 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/Jose-Color' into NiveshColorNivesh Rajbhandari2012-01-31
| | |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 16:29:25 +0000