Skip to content
This repository has been archived by the owner on Oct 9, 2018. It is now read-only.

Merging in Rory's changes #58

Merged
merged 24 commits into from
Apr 12, 2012
Merged

Merging in Rory's changes #58

merged 24 commits into from
Apr 12, 2012

Conversation

tneil
Copy link
Collaborator

@tneil tneil commented Apr 12, 2012

Took the pull request from Rory, merged it with master and pushed it up into this Rory branch.. All conflicts have been resolved and it should be a clean commit.

I've tested all the bbUI controls on a BB7 device and on PlayBook 2.0 using the samples included in the repo.

glasspear and others added 24 commits February 29, 2012 05:51
Added support for menu separators for Smartphones
(data-bb-type="menu-separator")

Added ability to set data-bb-selected="true" for menu items to be
default item, if multiple are set the last one is the one that sticks
for Smart Phones

Removed clearMenuItems from menu setup, handled in both pushScreen and
popScreen.

Cleaned up check for necessary blackberry features done before setting
up menu and before clearing menus to avoid throwing errors
Added usage instructions to readme.md
Added menu separator for PlayBook menuBar
Added copy of class(es) attached to menu and menu items
Tweaked CSS for display to get colours/sizing closer to native.
Cleaned up CSS file
Cleaned up JS file
Ported changes back to source
This reverts commit 6647989.
tneil pushed a commit that referenced this pull request Apr 12, 2012
Merging in Rory's additions for Menu support in bbUI
@tneil tneil merged commit b6b58e5 into master Apr 12, 2012
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants