parent
5478e745bb
commit
328cb7d883
|
|
@ -81,7 +81,7 @@
|
|||
if (self.state != FSCalendarTransitionStateIdle) {
|
||||
return NO;
|
||||
}
|
||||
if (gestureRecognizer == self.calendar.scopeGesture && self.calendar.scrollDirection == UICollectionViewScrollDirectionVertical) {
|
||||
if (gestureRecognizer == self.calendar.scopeGesture && self.calendar.collectionViewLayout.scrollDirection == UICollectionViewScrollDirectionVertical) {
|
||||
return NO;
|
||||
}
|
||||
if (gestureRecognizer == self.calendar.scopeHandle.panGesture) {
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@
|
|||
300BFB121C6446FA00399553 /* FSCalendarEventIndicator.m in Sources */ = {isa = PBXBuildFile; fileRef = 300BFB111C6446FA00399553 /* FSCalendarEventIndicator.m */; };
|
||||
306DB1461C96700800A10478 /* FSCalendarAnimator.m in Sources */ = {isa = PBXBuildFile; fileRef = 306DB1451C96700800A10478 /* FSCalendarAnimator.m */; };
|
||||
3078A8B11C50C0ED003D33EF /* FSCalendarFlowLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = EEC9C03F1BDCA2D600383A07 /* FSCalendarFlowLayout.m */; };
|
||||
309FE3EF1D339969002CEF18 /* NSDate+FSExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 309FE3EE1D339969002CEF18 /* NSDate+FSExtension.m */; };
|
||||
EE0954AD1B97DDE0007F6964 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE0954AC1B97DDE0007F6964 /* AppDelegate.swift */; };
|
||||
EE0954AF1B97DDE0007F6964 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE0954AE1B97DDE0007F6964 /* ViewController.swift */; };
|
||||
EE0954B21B97DDE0007F6964 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EE0954B01B97DDE0007F6964 /* Main.storyboard */; };
|
||||
|
|
@ -54,8 +53,6 @@
|
|||
300BFB111C6446FA00399553 /* FSCalendarEventIndicator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FSCalendarEventIndicator.m; sourceTree = "<group>"; };
|
||||
306DB1441C96700800A10478 /* FSCalendarAnimator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSCalendarAnimator.h; sourceTree = "<group>"; };
|
||||
306DB1451C96700800A10478 /* FSCalendarAnimator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FSCalendarAnimator.m; sourceTree = "<group>"; };
|
||||
309FE3ED1D339969002CEF18 /* NSDate+FSExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDate+FSExtension.h"; sourceTree = "<group>"; };
|
||||
309FE3EE1D339969002CEF18 /* NSDate+FSExtension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDate+FSExtension.m"; sourceTree = "<group>"; };
|
||||
EE0954A71B97DDE0007F6964 /* SwiftExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SwiftExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
EE0954AB1B97DDE0007F6964 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||
EE0954AC1B97DDE0007F6964 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
|
||||
|
|
@ -196,8 +193,6 @@
|
|||
EE0954E21B97DDF4007F6964 /* UIView+FSExtension.m */,
|
||||
300BFB0D1C6446F300399553 /* CALayer+FSExtension.h */,
|
||||
300BFB0E1C6446F300399553 /* CALayer+FSExtension.m */,
|
||||
309FE3ED1D339969002CEF18 /* NSDate+FSExtension.h */,
|
||||
309FE3EE1D339969002CEF18 /* NSDate+FSExtension.m */,
|
||||
EE0954CD1B97DDF4007F6964 /* FSCalendar+IBExtension.h */,
|
||||
EE0954CE1B97DDF4007F6964 /* FSCalendar+IBExtension.m */,
|
||||
300414231CD751CF00453AEB /* FSCalendar+DateTools.m */,
|
||||
|
|
@ -312,7 +307,6 @@
|
|||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
EE0954E61B97DDF4007F6964 /* FSCalendarCell.m in Sources */,
|
||||
309FE3EF1D339969002CEF18 /* NSDate+FSExtension.m in Sources */,
|
||||
300414261CD751CF00453AEB /* FSCalendar+Deprecated.m in Sources */,
|
||||
EEC9C0401BDCA2D600383A07 /* FSCalendarCollectionView.m in Sources */,
|
||||
EE0954E81B97DDF4007F6964 /* FSCalendarHeader.m in Sources */,
|
||||
|
|
|
|||
Loading…
Reference in New Issue