Merge branch 'release/1.3.3'

uias · Jun 29, 2017 · a3597b7 · a3597b7
2 parents cd24254 + fb6652c
commit a3597b7
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file.
 `Pageboy` adheres to [Semantic Versioning](http://semver.org/).
 
 #### 1.x Releases
-- `1.3.X` Releases - [1.3.0](#130) | [1.3.1](#131) | [1.3.2](#132)
+- `1.3.X` Releases - [1.3.0](#130) | [1.3.1](#131) | [1.3.2](#132) | [1.3.3](#133)
 - `1.2.X` Releases - [1.2.0](#120) | [1.2.1](#121)
 - `1.1.X` Releases - [1.1.0](#110) | [1.1.1](#111) | [1.1.2](#112)
 - `1.0.X` Releases - [1.0.0](#100) | [1.0.1](#101) | [1.0.2](#102) | [1.0.3](#103) | [1.0.4](#104) | [1.0.5](#105) | [1.0.6](#106) | [1.0.7](#107) | [1.0.8](#108) | [1.0.9](#109)
@@ -13,6 +13,13 @@ All notable changes to this project will be documented in this file.
 
 ---
 
+## [1.3.3](https://github.com/uias/Pageboy/releases/tag/1.3.3)
+Released on 2017-06-29
+
+#### Fixed
+- [#86](https://github.com/uias/Pageboy/pull/86) Fix issue where constraints were inadvertantly not added to the internal page view controller. 
+     - Fixed by [muukii](https://github.com/muukii).
+
 ## [1.3.2](https://github.com/uias/Pageboy/releases/tag/1.3.2)
 Released on 2017-06-25
 

diff --git a/Pageboy.podspec b/Pageboy.podspec
@@ -4,7 +4,7 @@ Pod::Spec.new do |s|
   s.platform     = :ios, "8.0"
   s.requires_arc = true
 
-  s.version      = "1.3.2"
+  s.version      = "1.3.3"
   s.summary      = "A simple, highly informative page view controller."
   s.description  = <<-DESC
   					A page view controller that provides simplified data source management, enhanced delegation and other useful features.

diff --git a/Sources/Pageboy/Extensions/PageboyViewController+Management.swift b/Sources/Pageboy/Extensions/PageboyViewController+Management.swift
@@ -54,15 +54,16 @@ internal extension PageboyViewController {
         self.pageViewController = pageViewController
 
         self.addChildViewController(pageViewController)
-        pageViewController.view.pinToSuperviewEdges()
-
+
         if let existingZIndex = existingZIndex {
             self.view.insertSubview(pageViewController.view, at: existingZIndex)
         } else {
             self.view.addSubview(pageViewController.view)
             self.view.sendSubview(toBack: pageViewController.view)
         }
-
+
+        pageViewController.view.pinToSuperviewEdges()
+
         pageViewController.scrollView?.delegate = self
         pageViewController.view.backgroundColor = .clear
         pageViewController.scrollView?.delaysContentTouches = delaysContentTouches

diff --git a/Sources/Pageboy/Info.plist b/Sources/Pageboy/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.2</string>
+	<string>1.3.3</string>
 	<key>CFBundleVersion</key>
 	<string>AUTO_GENERATED</string>
 	<key>NSPrincipalClass</key>

diff --git a/Sources/Pageboy/Utilities/UIView+AutoLayout.swift b/Sources/Pageboy/Utilities/UIView+AutoLayout.swift
@@ -12,7 +12,7 @@ internal extension UIView {
 
     @discardableResult func pinToSuperviewEdges() -> [NSLayoutConstraint]? {
         guard self.superview != nil else {
-            return nil
+            fatalError("superview can not be nil")
         }
         self.translatesAutoresizingMaskIntoConstraints = false