This repository was archived by the owner on Mar 14, 2020. It is now read-only.
Integration 20120629#106
Closed
zhizhangchen wants to merge 15 commits into
Closed
Conversation
* style property of page has two values: page and dialog. User can configure this property from property panel. * When style of page is dialog, show its text as Dialog * enforce style of the first page in app is page
Also creating new page according to style passed in.
In design view, we make dialog and page looked as same.
getPropertySchema() should return a clone of object, not a reference of object. It will avoid caller to change original value
Add a check in function refresh(): in case property of some widget such as design is shown in property view.
only update view when widget can be shown in outline. Orignally, we ignore property of design changes. When property of design node changes, outline view doesn't need update
Also refactor css definitions for 'Add device' dialog so that it can be resued by msg-box.
Conflicts: src/js/widgets.js
Contributor
Author
|
Replaced by #111 |
1 similar comment
Contributor
Author
|
Replaced by #111 |
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.
3 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.
#105, #104, #86 included. #105, #37 is more important as List View grouping depends on it. #86 has some conflicts. I've fixed in the integration branch