Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added add_child_screen and remove_child_screen methods. #677

Merged
merged 3 commits into from
May 12, 2015

Conversation

jamonholmgren
Copy link
Owner

Closes #463. Soliciting feedback. Includes docs and tests.

@@ -25,41 +25,6 @@ def modal?
self.modal == true
end

def resolve_title
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Made these methods private, like they should have been. No other changes, just moved them to the private method section.

@ryanlntn
Copy link
Contributor

👍 Looks good to me.

* master:
  Adds tests for prepare_for_reuse and ensures that it's called before on_reuse
  More concise checking to see if web image managers are defined.
  Make sure prepareForReuse calls super.
  Adds support for SDWebImage and takes preference over JMImageCache
  Adds :searchable to the whitelisted properties a cell can have.
  Version 2.3.1
  Minor tweak
  Added on_cell_created and on_cell_reused
  Minor formatting tweaks
  Created PM::TableScreen#set_up_accessibility, #editable? and moved tableView:commitEditingStyle:forRowAtIndexPath to a new PM::TableScreen::Editable module
  Added a spec for editable?
  Wrote the spec to test if the TableScreen has tableView:commitEditingStyle:forRowAtIndexPath
  Handle additional status_bar scenarios

# Conflicts:
#	lib/ProMotion/screen/screen_module.rb
@markrickert
Copy link
Contributor

Fixed master merge conflict introduced by #670.

welcome

jamonholmgren added a commit that referenced this pull request May 12, 2015
Added add_child_screen and remove_child_screen methods.
@jamonholmgren jamonholmgren merged commit 4af9328 into master May 12, 2015
@jamonholmgren jamonholmgren deleted the feature/add_screen branch May 12, 2015 19:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add a way to add a child view controller
3 participants