This repository was archived by the owner on Mar 14, 2020. It is now read-only.
Integration 20120829#267
Closed
zhizhangchen wants to merge 58 commits into
Closed
Conversation
We can define a "morph" function for a zone so that When adding a child, it can be morphed to another type. With this feature, we can have a generic widget in the palette which can adapt to different types of containers when dropped on them.
Looking for parent zone with the same name. If found, extend it with descendant zone, otherwize add a new zone.
Also set the default value of count bubble to empty, i.e, no count bubble
Sorting is still OK without this change and it causes bad appearance of ButtonGroup and ThumbnailSplitList
Previous algorithm only supports one zone containers or Headers, and it works hard to determine the position for insertion. The new algorithm firstly tries to insert to the zone of the nearest sibling using enhenced insertChildAfter/Before, if fails, uses addChild to automatically find a zone to insert.
* modify parser function to support minified theme * refactor uploadTheme function: add a handler to update items in project dialog when upload finished
* add a new property allThemes to record all themes * refactor uploadTheme function
* also clean up some spaces in deflate.js file
Removed the unecessary stylesheets and redefine the container position.
* Every desing has a unique theme css. if we make theme css value as a special mark, it is very easy to update theme for design.
* we can use this API to update theme for given design. It will be used as changing theme of current project and previewing for adding a new page.
* setDesignTheme() will be used to change theme
*When theme of current project changes, it will trigger property Change event. Original there is no response for design node. In order to make selected widget display changed themes, we refresh property view when changed property is css.
* if theme of current design changes, we should inform design to update
Conflicts: src/js/views/property.js
…n-20120829 Conflicts: src/js/views/property.js
Closed
Conflicts: src/js/views/property.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
#266, #245, #257, #251, #265,258,258, #262, #261, #253, #196 included