Skip to content

Commit 3cdd596

Browse files
committed
Revert redundant changes
1 parent 1385645 commit 3cdd596

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

WooCommerce/Classes/ViewRelated/ListSelector/PaginatedListSelectorViewController.swift

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import class AutomatticTracks.CrashLogging
88
/// A generic data source for the paginated list selector UI `PaginatedListSelectorViewController`.
99
///
1010
protocol PaginatedListSelectorDataSource {
11-
associatedtype StorageModel: ResultsControllerMutableType & ReadOnlyConvertible
11+
associatedtype StorageModel: ResultsControllerMutableType
1212
associatedtype Cell: UITableViewCell
1313

1414
/// Optional custom sorting strategy for storage models in the paginated list. Default is `nil`.
@@ -55,10 +55,7 @@ extension PaginatedListSelectorDataSource {
5555
///
5656
final class PaginatedListSelectorViewController<DataSource: PaginatedListSelectorDataSource, Model, StorageModel, Cell>: UIViewController,
5757
UITableViewDataSource, UITableViewDelegate, UITableViewDragDelegate, PaginationTrackerDelegate, GhostableViewController
58-
where DataSource.StorageModel == StorageModel,
59-
Model == DataSource.StorageModel.ReadOnlyType,
60-
Model: Equatable,
61-
DataSource.Cell == Cell {
58+
where DataSource.StorageModel == StorageModel, Model == DataSource.StorageModel.ReadOnlyType, Model: Equatable, DataSource.Cell == Cell {
6259
private let viewProperties: PaginatedListSelectorViewProperties
6360
private var dataSource: DataSource
6461
private let onDismiss: (_ selected: Model?) -> Void

WooCommerce/Classes/ViewRelated/Products/Edit Product/Linked Products List Selector/ProductListSelector/ProductListMultiSelectorDataSource.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ import Yosemite
44

55
/// Enables the user to select multiple products from a paginated list.
66
final class ProductListMultiSelectorDataSource: PaginatedListSelectorDataSource {
7-
var customResultsSortOrder: ((Product, Product) -> Bool)?
8-
97
typealias StorageModel = StorageProduct
108

119
// Observable list of the latest product IDs

WooCommerce/Classes/ViewRelated/Search/SearchUICommand.swift

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Yosemite
44

55
/// An interface for search UI associated with a generic model and cell view model.
66
protocol SearchUICommand {
7-
associatedtype Model // model to send to selection closure
7+
associatedtype Model
88
associatedtype CellViewModel
99
associatedtype EmptyStateViewControllerType: UIViewController = EmptyStateViewController
1010

@@ -43,8 +43,7 @@ protocol SearchUICommand {
4343
/// Set externally to enable resyncing the models when needed. Otherwise, an empty closure can be set by default.
4444
var resynchronizeModels: (() -> Void) { get set }
4545

46-
associatedtype ResultsControllerModel: ResultsControllerMutableType & ReadOnlyConvertible where
47-
ResultsControllerModel.ReadOnlyType == Model
46+
associatedtype ResultsControllerModel: ResultsControllerMutableType & ReadOnlyConvertible where ResultsControllerModel.ReadOnlyType == Model
4847
/// Creates a results controller for the search results. The result model's readonly type matches the search result model.
4948
func createResultsController() -> ResultsController<ResultsControllerModel>
5049

@@ -97,7 +96,7 @@ protocol SearchUICommand {
9796

9897
/// Creates a view model for the search result cell.
9998
///
100-
/// - Parameter model: search result model used to display on list items.
99+
/// - Parameter model: search result model.
101100
/// - Returns: a view model based on the search result model.
102101
func createCellViewModel(model: Model) -> CellViewModel
103102

0 commit comments

Comments
 (0)