Merge pull request #15 from 942v/master

Add support for iOS 7 and negative times.
davdroman · Sep 26, 2015 · 0b631fe · 0b631fe
2 parents 46772ee + bdf8d53
commit 0b631fe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Popsicle.podspec b/Popsicle.podspec
@@ -6,8 +6,8 @@ Pod::Spec.new do |s|
   s.author                = { "David Roman" => "[email protected]" }
   s.license               = { :type => 'MIT', :file => 'LICENSE' }
 
-  s.platform              = :ios, '8.0'
-  s.ios.deployment_target = '8.0'
+  s.platform              = :ios, '7.1'
+  s.ios.deployment_target = '7.1'
 
   s.source                = { :git => "https://github.com/DavdRoman/Popsicle.git", :tag => s.version.to_s }
   s.source_files          = 'Popsicle/*.{h,m}'

diff --git a/Popsicle/PSInterpolator.m b/Popsicle/PSInterpolator.m
@@ -36,11 +36,11 @@ - (void)performInterpolations {
 		timeFraction = MAX(0, timeFraction);
 		timeFraction = MIN(1, timeFraction);
 
-		if ((ic.interpolation.startTime <= self.time && self.time <= ic.interpolation.endTime) || (ic.timeFraction != 1 && ic.timeFraction != 0)) {
-			id value = [ic.interpolation valueForTimeFraction:timeFraction];
-			[ic.object setValue:value forKeyPath:ic.keyPath];
-			ic.timeFraction = timeFraction;
-		}
+        if (((ic.interpolation.endTime>ic.interpolation.startTime)?(ic.interpolation.startTime <= self.time && self.time <= ic.interpolation.endTime):(ic.interpolation.startTime >= self.time && self.time >= ic.interpolation.endTime)) || (ic.timeFraction != 1 && ic.timeFraction != 0)) {
+            id value = [ic.interpolation valueForTimeFraction:timeFraction];
+            [ic.object setValue:value forKeyPath:ic.keyPath];
+            ic.timeFraction = timeFraction;
+        }
 	}
 }