This repository was archived by the owner on Mar 14, 2020. It is now read-only.
Integration 20120713#148
Closed
zhizhangchen wants to merge 16 commits into
Closed
Conversation
user can set a costom icon name, with suggestions from a dropdown list greped by user's input
The designDirty and pInfoDirty flag are all for current acitve project, then if I want to sync inactive projects, these flags can not be used.
Now any widget that has at least one zone is a container, even if the zone can contain only 1 child. Also modified some code which exist only because of the previous defintion of container.
The function will determine the property whether to show in property view.
Previous init code set property directly without calling setProperty. Now that getProperty returns a copy of the property, we should call setProperty instead of changing the returned property object to set a property.
* dialog property of page indicate the data of page is page or dialog.
* because the first page of RIB must be a page, we don't show the checkbox of dialog for the first page in property view
according to style, creating page as dialog or page
In design view, we make dialog and page looked as same.
* There are different behavior on button opening target between JQM and RIB. For JQM, when data-role of page is "dialog" and the page is loaded by a button with the data-rel=page, the behavior of the page is "Page". Fixing this bug by modifying default value of opentargetas property of button.
Contributor
|
Merged just about everything from this -- really great job! |
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.
#37, #147, #143, #144, #120, #150 included