From cce54ef0cbd886ca5c116c18c18bdababb140d86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20Sa=CC=81enz?= Date: Mon, 8 Jun 2015 21:29:24 -0500 Subject: [PATCH 1/2] Added support for case when endTime < startTime. (negative scroll) --- Popsicle/PSInterpolator.m | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Popsicle/PSInterpolator.m b/Popsicle/PSInterpolator.m index 8778e48..e78c710 100644 --- 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; + } } } From bdf8d5335d6b9893319c15e9a0aa57f6010d5ea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20Sa=CC=81enz?= Date: Mon, 8 Jun 2015 21:31:35 -0500 Subject: [PATCH 2/2] Change deplayment_target of the pod spec to support 7.1 --- Popsicle.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Popsicle.podspec b/Popsicle.podspec index 2635c8a..d25c3a9 100755 --- a/Popsicle.podspec +++ b/Popsicle.podspec @@ -6,8 +6,8 @@ Pod::Spec.new do |s| s.author = { "David Roman" => "dromaguirre@gmail.com" } 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/Dromaguirre/Popsicle.git", :tag => s.version.to_s } s.source_files = 'Popsicle/*.{h,m}'