Skip to content

Fixed instantiating ViewController basing on StoryboardSceneBased #38

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.

Sign up for GitHub

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

Merged
AliSoftware merged 2 commits into from Dec 5, 2016
Merged

Fixed instantiating ViewController basing on StoryboardSceneBased #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5463f39
Fixed instantiating ViewController basing on StoryboardSceneBased
jgert Nov 21, 2016
8331df2
Updated CHANGELOG
jgert Nov 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# CHANGELOG

## 3.0.1

* Fix `instantiate()` implementation on `StoryboardSceneBased` ViewControllers.
[@jakubgert](https://github.com/jakubgert)
[#38](https://github.com/AliSoftware/Reusable/pull/38)

## 3.0.0

* Converted library and Demo project to Swift 3.
Expand Down
4 changes: 2 additions & 2 deletions Sources/Storyboard/StoryboardSceneBased.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ public extension StoryboardSceneBased where Self: UIViewController {
- returns: instance of the conforming ViewController
*/
static func instantiate() -> Self {
let storyboard = Self().storyboard
guard let vc = storyboard?.instantiateViewController(withIdentifier: self.sceneIdentifier) as? Self else {
let storyboard = (Self.self as StoryboardSceneBased.Type).storyboard
guard let vc = storyboard.instantiateViewController(withIdentifier: self.sceneIdentifier) as? Self else {
fatalError("The viewController '\(self.sceneIdentifier)' of '\(storyboard)' is not of class '\(self)'")
}
return vc
Expand Down