Merge branch 'master' into swift-3.0

vinceyuan · vinceyuan · commit 72309a6a6428 · 2016-08-18T18:23:30.000+08:00
diff --git a/Sources/DataSources/CollectionViewSectionedDataSource.swift b/Sources/DataSources/CollectionViewSectionedDataSource.swift
@@ -204,7 +204,11 @@ public class CollectionViewSectionedDataSource<S: SectionModelType>
     }
     
     override func _rx_collectionView(_ collectionView: UICollectionView, moveItemAtIndexPath sourceIndexPath: IndexPath, toIndexPath destinationIndexPath: IndexPath) {
-        self._sectionModels.moveFromSourceIndexPath(sourceIndexPath, destinationIndexPath: destinationIndexPath)
+        if self.moveItem != nil {
+            self.moveItem!(self, sourceIndexPath: sourceIndexPath, destinationIndexPath: destinationIndexPath)
+        } else {
+            self._sectionModels.moveFromSourceIndexPath(sourceIndexPath, destinationIndexPath: destinationIndexPath)
+        }
     }
     
 }

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