Merge branch 'release/1.2.1'

SebastianBoldt · Jan 11, 2017 · 2e989a1 · 2e989a1
2 parents 7323dd3 + 7003e76
commit 2e989a1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 1.2.1 (2017-01-11)
+- Fixed issue with background tap dismissal options
+
 ## 1.2.0 (2016-12-18)
 - There is a new cool animation style called shiftIn Animation. Check out the README to find out more
 - Rounding Corners can now be specified unsing the corners property (e.g. presentation.corners = [.leftBottom,rightTop])

diff --git a/Example/Jelly.xcodeproj/project.pbxproj b/Example/Jelly.xcodeproj/project.pbxproj
@@ -31,6 +31,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		152009C91E26C6EA00537CD5 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = CHANGELOG.md; path = ../CHANGELOG.md; sourceTree = "<group>"; };
 		154509481DF6084B0096C822 /* Jelly_Tests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Jelly_Tests-Bridging-Header.h"; sourceTree = "<group>"; };
 		154509491DF6084C0096C822 /* JellyAnimatorSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JellyAnimatorSpec.swift; sourceTree = "<group>"; };
 		155B7B841DE1E5820093DF2A /* CustomNavController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomNavController.swift; sourceTree = "<group>"; };
@@ -89,6 +90,7 @@
 		607FACC71AFB9204008FA782 = {
 			isa = PBXGroup;
 			children = (
+				152009C91E26C6EA00537CD5 /* CHANGELOG.md */,
 				15B1CF991DEB7299003B4107 /* Github */,
 				607FACF51AFB993E008FA782 /* Podspec Metadata */,
 				607FACD21AFB9204008FA782 /* Example for Jelly */,

diff --git a/Jelly.podspec b/Jelly.podspec
@@ -6,7 +6,7 @@
 
 Pod::Spec.new do |s|
 s.name             = 'Jelly'
-s.version          = '1.2.0'
+s.version          = '1.2.1'
 s.summary          = 'Jelly provides custom view controller animations with just a few lines of code'
 
 s.description      = <<-DESC

diff --git a/Jelly/Classes/JellyPresentationController.swift b/Jelly/Classes/JellyPresentationController.swift
@@ -279,6 +279,8 @@ fileprivate extension JellyPresentationController {
     }
 
     dynamic func handleTap(recognizer: UITapGestureRecognizer) {
-        presentingViewController.dismiss(animated: true)
+        if self.presentation.isTapBackgroundToDismissEnabled {
+            presentingViewController.dismiss(animated: true)
+        }
     }
 }