Call CollectionViewSectionedDataSource.moveItem in the correct way.

vinceyuan · vinceyuan · commit 0019ec5e0509 · 2016-08-21T22:12:11.000+08:00
diff --git a/Sources/DataSources/CollectionViewSectionedDataSource.swift b/Sources/DataSources/CollectionViewSectionedDataSource.swift
@@ -204,11 +204,8 @@ public class CollectionViewSectionedDataSource<S: SectionModelType>
     }
     
     override func _rx_collectionView(collectionView: UICollectionView, moveItemAtIndexPath sourceIndexPath: NSIndexPath, toIndexPath destinationIndexPath: NSIndexPath) {
-        if self.moveItem != nil {
-            self.moveItem!(self, sourceIndexPath: sourceIndexPath, destinationIndexPath: destinationIndexPath)
-        } else {
-            self._sectionModels.moveFromSourceIndexPath(sourceIndexPath, destinationIndexPath: destinationIndexPath)
-        }
+        self._sectionModels.moveFromSourceIndexPath(sourceIndexPath, destinationIndexPath: destinationIndexPath)
+        self.moveItem?(self, sourceIndexPath: sourceIndexPath, destinationIndexPath: destinationIndexPath)
     }
     
 }

Original file line number	Diff line number	Diff line change
`@@ -204,11 +204,8 @@ public class CollectionViewSectionedDataSource<S: SectionModelType>`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`override func _rx_collectionView(collectionView: UICollectionView, moveItemAtIndexPath sourceIndexPath: NSIndexPath, toIndexPath destinationIndexPath: NSIndexPath) {`
`207`		`- if self.moveItem != nil {`
`208`		`- self.moveItem!(self, sourceIndexPath: sourceIndexPath, destinationIndexPath: destinationIndexPath)`
`209`		`- } else {`
`210`		`- self._sectionModels.moveFromSourceIndexPath(sourceIndexPath, destinationIndexPath: destinationIndexPath)`
`211`		`- }`
	`207`	`+ self._sectionModels.moveFromSourceIndexPath(sourceIndexPath, destinationIndexPath: destinationIndexPath)`
	`208`	`+ self.moveItem?(self, sourceIndexPath: sourceIndexPath, destinationIndexPath: destinationIndexPath)`
`212`	`209`	`}`
`213`	`210`
`214`	`211`	`}`