aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/styles-controller.js
Commit message (Collapse)AuthorAge
...
* | Styles Controller - Added fix for setting style on cached, multi-target rule.Eric Guzman2012-05-09
| | | | | | | | Added fix for setting style on cached, multi-target rule. Also added parameter to selector override to augment specificity of selector
* | Style sheets - Add sheet actionEric Guzman2012-05-07
| |
* | Styles Controller - Fix error when trying dispatch stylesheet change eventEric Guzman2012-05-01
| |
* | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-11
|\|
| * Single perspective fix.Nivesh Rajbhandari2012-04-09
| | | | | | | | | | | | Note that rotating multiple objects when the stage is rotated still doesn't work and flatten still doesn't work. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-09
|\|
| * Get matrix and perspective distance from styles controller.Nivesh Rajbhandari2012-03-21
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * - detect document style edit [with Eric's input for styles-controller.js]Ananya Sen2012-03-06
| | | | | | | | | | | | - integrated save as Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | CSS Panel - Updating components, created toolbar components, and small ↵Eric Guzman2012-03-02
| | | | | | | | changes to styles controller
* | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-02-29
|\| | | | | | | | | Conflicts: js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
| * 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>
* | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-02-22
|\|
| * Merge branch 'StylesControllerUpdates' of ↵Eric Guzman2012-02-20
| |\ | | | | | | | | | github.com:ericguzman/ninja-internal into StylesControllerUpdates
| | * Styles controller - Check for element's window object before querying for ↵Eric Guzman2012-02-20
| | | | | | | | | | | | matching css rules.
| * | Styles Controller -Fix invalid variable reference when looking for element's ↵Eric Guzman2012-02-20
| |/ | | | | | | window object
* / CSS Panel UpdateEric Guzman2012-02-22
|/
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
|\
| * Styles Controller - Separate css animation rule gettersEric Guzman2012-02-13
| | | | | | | | To add document- and sheet-specific getters.
| * Styles Controller - added methods to get keyframe animation rulesEric Guzman2012-02-08
| |
* | 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-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 10cdeb52403f16d5d4be43a516e8cdfbc866a2a2 Merge: 24f9717 9a404b8 Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Feb 8 11:33:42 2012 -0800 Merge pull request #21 from mencio/pi_bugs Pi bugs fixes for 964, 616, 1084 commit 24f9717f2714f0497382436c4602736283247cf1 Merge: 763910b 9154cff Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Feb 8 11:33:22 2012 -0800 Merge pull request #22 from ericguzman/StylesControllerUpdates Styles Controller - Added array of dirty stylesheets and event dispatch ... commit 9154cff2ce10aae54d9a7bd37a9d8b5578b0e297 Author: Eric Guzman <ericg@motorola.com> Date: Wed Feb 8 10:39:17 2012 -0800 Styles Controller - Added array of dirty stylesheets and event dispatch when a sheet is dirtied. 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 9a404b8a717d0aac0eabb828a4d3cdc8c9c3eed8 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Feb 7 17:42:04 2012 -0800 IKNINJA - 1084: Fixing the custom tag. Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit a930295dfebd7fe7b4db5324b2048e6e7366c6d8 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Feb 7 16:12:23 2012 -0800 IKNINJA-616 - Drag and drop images fix for the PI and source 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 65145cebdf4cde2767cbd0489ddcea5863c2ca9e Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Feb 7 14:53:46 2012 -0800 IKNINJA-964 - Fixed inconsistent element name in PI/CSS panel. Signed-off-by: Valerio Virgillito <valerio@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 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Jonathan Duran2012-02-06
| |\ \ | | | | | | | | | | | | Timeline
| * | | style controller update for CSS animationsJonathan Duran2012-02-06
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
|\ \ \ \ | | |_|/ | |/| |
| * | | Styles Controller - Added array of dirty stylesheets and event dispatch when ↵Eric Guzman2012-02-08
| | |/ | |/| | | | | | | a sheet is dirtied.
* | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-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.
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-02
|\| | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js
| * upgrading to Montage v0.6Valerio Virgillito2012-02-02
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@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-11-17 23:44:27 +0000