diff --git a/Hangover UI Sandbox/Base.lproj/Main.storyboard b/Hangover UI Sandbox/Base.lproj/Main.storyboard index b665fad..7b9d6c6 100644 --- a/Hangover UI Sandbox/Base.lproj/Main.storyboard +++ b/Hangover UI Sandbox/Base.lproj/Main.storyboard @@ -679,7 +679,7 @@ - + diff --git a/Hangover UI Sandbox/SandboxViewController.swift b/Hangover UI Sandbox/SandboxViewController.swift index 701a903..61facdc 100644 --- a/Hangover UI Sandbox/SandboxViewController.swift +++ b/Hangover UI Sandbox/SandboxViewController.swift @@ -13,10 +13,11 @@ class SandboxViewController: NSViewController, NSTableViewDataSource, NSTableVie @IBOutlet weak var conversationTableView: NSTableView! let messages = [ -// ("Oh hey, person number 1.", ChatMessageView.Orientation.Left), -// ("Hey person number 2, what's up?", ChatMessageView.Orientation.Right), -// ("Not all that much, just testing out this chat client.", ChatMessageView.Orientation.Left), + ("Oh hey, person number 1.", ChatMessageView.Orientation.Left), + ("Hey person number 2, what's up?", ChatMessageView.Orientation.Right), + ("Not all that much, just testing out this chat client.", ChatMessageView.Orientation.Left), ("Coooooooooool beans. Will this longer message wrap onto multiple lines and possibly cause any issues?", ChatMessageView.Orientation.Right), + ("Here's an emoji: 😄.", ChatMessageView.Orientation.Left), ] override func viewDidAppear() { diff --git a/Hangover/NSView.swift b/Hangover/NSView.swift index 3c79cbf..4de219c 100644 --- a/Hangover/NSView.swift +++ b/Hangover/NSView.swift @@ -14,7 +14,9 @@ extension NSView { let nibName = T.className().componentsSeparatedByString(".").last if NSBundle.mainBundle().loadNibNamed(nibName!, owner: owner, topLevelObjects: &objects) { if let objects = objects { - return objects.filter { $0 is T }.map { $0 as! T }.filter { $0.identifier == identifier }.first + let candidate = objects.filter { $0 is T }.map { $0 as! T }.filter { $0.identifier == identifier }.first + assert(candidate != nil, "Could not find view with identifier \(identifier) in \(nibName).xib.") + return candidate } } assert(false, "Could not find view with identifier \(identifier) in \(nibName).xib.")