Merge branch 'develop'

Backelite · Apr 30, 2014 · 5ed860a · 5ed860a
2 parents cbb7004 + 1be4118
commit 5ed860a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/MaryPopin.podspec b/MaryPopin.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaryPopin"
-  s.version      = "1.3"
+  s.version      = "1.3.1"
   s.summary      = "Category to display modal-like view controllers with more options"
 
   s.description  = <<-DESC
@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
 
   s.platform     = :ios, '5.0'
 
-  s.source       = { :git => "https://github.com/Backelite/MaryPopin.git", :tag => "1.3" }
+  s.source       = { :git => "https://github.com/Backelite/MaryPopin.git", :tag => "1.3.1" }
 
   s.source_files  = 'MaryPopin/**/*.{h,m}'
 

diff --git a/MaryPopin/UIViewController+MaryPopin.m b/MaryPopin/UIViewController+MaryPopin.m
@@ -543,9 +543,6 @@ - (void)setPopinCustomOutAnimation:(void (^)(UIViewController * popinController,
 - (BKTPopinAlignementOption)popinAlignment
 {
     id storedValue = objc_getAssociatedObject(self, _cmd);
-    if (nil == storedValue) {
-        return BKTPopinAlignementOptionDown;
-    }
     return [objc_getAssociatedObject(self, _cmd) intValue];
 }
 

diff --git a/README.md b/README.md
@@ -28,6 +28,9 @@ that is why we name it a popin controller. And as it is implemented as a categor
 =========
 
 ## Changes
+v 1.3.1
+* Fixed an issue with default alignment option
+
 v 1.3
 * Added on option to have a blurry background view
 * Added an option to change popin alignment in parent (thanks to @leverdeterre)