diff --git a/core/modules/entity_reference/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_view.yml b/core/modules/entity_reference/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_view.yml index 549e91d..c1db6ee 100644 --- a/core/modules/entity_reference/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_view.yml +++ b/core/modules/entity_reference/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_view.yml @@ -9,7 +9,6 @@ display: fields: '0' relationships: '0' pager: '0' - pager_options: '0' sorts: '0' fields: id: @@ -29,7 +28,6 @@ display: options: offset: '0' type: none - pager_options: { } sorts: id: field: id diff --git a/core/modules/file/config/install/views.view.files.yml b/core/modules/file/config/install/views.view.files.yml index ec3bd40..0046aa2 100644 --- a/core/modules/file/config/install/views.view.files.yml +++ b/core/modules/file/config/install/views.view.files.yml @@ -668,7 +668,6 @@ display: display_description: '' defaults: pager: true - pager_options: true relationships: false relationships: fid: @@ -691,7 +690,6 @@ display: defaults: empty: false pager: false - pager_options: false filters: false filter_groups: false fields: false @@ -719,7 +717,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pager_options: false filters: { } filter_groups: operator: AND diff --git a/core/modules/file/tests/modules/file_test_views/test_views/views.view.file_extension_view.yml b/core/modules/file/tests/modules/file_test_views/test_views/views.view.file_extension_view.yml index ea140c6..ff8047f 100644 --- a/core/modules/file/tests/modules/file_test_views/test_views/views.view.file_extension_view.yml +++ b/core/modules/file/tests/modules/file_test_views/test_views/views.view.file_extension_view.yml @@ -8,7 +8,6 @@ display: defaults: fields: '0' pager: '0' - pager_options: '0' sorts: '0' fields: age: @@ -33,7 +32,6 @@ display: options: offset: '0' type: none - pager_options: { } sorts: id: field: id diff --git a/core/modules/views/config/schema/views.data_types.schema.yml b/core/modules/views/config/schema/views.data_types.schema.yml index 0c684ca..2b88a62 100644 --- a/core/modules/views/config/schema/views.data_types.schema.yml +++ b/core/modules/views/config/schema/views.data_types.schema.yml @@ -187,9 +187,6 @@ views_display: filter_groups: type: boolean label: 'Filter groups' - pager_options: - type: boolean - label: 'Pager options' relationships: type: sequence label: 'Relationships' @@ -225,9 +222,6 @@ views_display: link_url: type: string label: 'Link URL' - pager_options: - type: boolean - label: 'Pager options' header: type: sequence label: 'Header' diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php index 04b3b78..e76210a 100644 --- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php +++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php @@ -469,11 +469,9 @@ public function defaultableSections($section = NULL) { 'style' => array('style', 'row'), 'row' => array('style', 'row'), - 'pager' => array('pager', 'pager_options'), - 'pager_options' => array('pager', 'pager_options'), + 'pager' => array('pager'), - 'exposed_form' => array('exposed_form', 'exposed_form_options'), - 'exposed_form_options' => array('exposed_form', 'exposed_form_options'), + 'exposed_form' => array('exposed_form'), // These guys are special 'header' => array('header'), diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_ajax_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_ajax_view.yml index 6acace5..52ec125 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_ajax_view.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_ajax_view.yml @@ -8,7 +8,6 @@ display: defaults: fields: '0' pager: '0' - pager_options: '0' sorts: '0' fields: age: @@ -34,7 +33,6 @@ display: offset: '0' items_per_page: 2 type: mini - pager_options: { } sorts: id: field: id diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_title.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_title.yml index f65a5d1..90baec0 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_title.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_title.yml @@ -8,7 +8,6 @@ display: defaults: fields: '0' pager: '0' - pager_options: '0' sorts: '0' fields: id: @@ -21,7 +20,6 @@ display: options: offset: '0' type: none - pager_options: { } sorts: id: field: id diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_view.yml index 4457538..fc2b1c8 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_view.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_view.yml @@ -8,7 +8,6 @@ display: defaults: fields: '0' pager: '0' - pager_options: '0' sorts: '0' fields: id: @@ -21,7 +20,6 @@ display: options: offset: '0' type: none - pager_options: { } sorts: id: field: id diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_date.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_date.yml index cde9317..c7de9ec 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_date.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_date.yml @@ -8,7 +8,6 @@ display: defaults: fields: '0' pager: '0' - pager_options: '0' sorts: '0' arguments: date_fulldate: @@ -27,7 +26,6 @@ display: options: offset: '0' type: none - pager_options: { } sorts: id: field: id diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml index fdf04d2..6212668 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml @@ -7,7 +7,6 @@ display: display_options: defaults: pager: '0' - pager_options: '0' row_options: '0' row_plugin: '0' style_options: '0' @@ -20,7 +19,6 @@ display: options: items_per_page: '5' type: some - pager_options: { } row_options: build_mode: teaser comments: '0' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_empty.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_empty.yml index ea6659e..fb54524 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_empty.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_empty.yml @@ -8,7 +8,6 @@ display: defaults: fields: '0' pager: '0' - pager_options: '0' sorts: '0' fields: id: @@ -21,7 +20,6 @@ display: options: offset: '0' type: none - pager_options: { } header: area: field: area diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_more.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_more.yml index 7ec536d..df579f8 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_more.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_more.yml @@ -8,7 +8,6 @@ display: defaults: fields: '0' pager: '0' - pager_options: '0' sorts: '0' fields: id: @@ -21,7 +20,6 @@ display: options: offset: '0' type: none - pager_options: { } sorts: id: field: id diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_area.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_area.yml index 58ab853..bb881bc 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_area.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_area.yml @@ -8,7 +8,6 @@ display: defaults: fields: '0' pager: '0' - pager_options: '0' sorts: '0' header: entity_entity_test: @@ -43,7 +42,6 @@ display: options: offset: '0' type: none - pager_options: { } display_plugin: default display_title: Master id: default diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row.yml index 34e2ec8..2b1273d 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row.yml @@ -8,13 +8,11 @@ display: defaults: fields: '0' pager: '0' - pager_options: '0' sorts: '0' pager: options: offset: '0' type: none - pager_options: { } row: type: 'entity:taxonomy_term' options: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row_renderers.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row_renderers.yml index 3f98dbe..8d5fac9 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row_renderers.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row_renderers.yml @@ -12,13 +12,11 @@ display: defaults: fields: '0' pager: '0' - pager_options: '0' sorts: '0' pager: options: offset: '0' type: none - pager_options: { } row: type: 'entity:node' options: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_grid.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_grid.yml index 70cb460..ef1e178 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_grid.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_grid.yml @@ -8,7 +8,6 @@ display: defaults: fields: '0' pager: '0' - pager_options: '0' sorts: '0' fields: age: @@ -33,7 +32,6 @@ display: options: offset: '0' type: none - pager_options: { } sorts: id: field: id diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml index 75d46ff..3a3fe3e 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml @@ -8,7 +8,6 @@ display: defaults: fields: '0' pager: '0' - pager_options: '0' sorts: '0' fields: age: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_arguments.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_arguments.yml index a5f0074..f6a548d 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_arguments.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_arguments.yml @@ -9,7 +9,6 @@ display: defaults: fields: '0' pager: '0' - pager_options: '0' sorts: '0' fields: id: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml index 489cfe6..0f25df2 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml @@ -9,7 +9,6 @@ display: defaults: fields: '0' pager: '0' - pager_options: '0' sorts: '0' fields: id: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_route.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_route.yml index 540e10d..7e81e72 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_route.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_route.yml @@ -9,7 +9,6 @@ display: defaults: fields: '0' pager: '0' - pager_options: '0' sorts: '0' fields: id: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_view.yml index 58739f2..2186c4e 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_view.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_view.yml @@ -8,7 +8,6 @@ display: defaults: fields: '0' pager: '0' - pager_options: '0' sorts: '0' fields: age: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_simple_argument.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_simple_argument.yml index 855a6cc..fc987ad 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_simple_argument.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_simple_argument.yml @@ -8,7 +8,6 @@ display: defaults: fields: '0' pager: '0' - pager_options: '0' sorts: '0' arguments: '0' fields: @@ -31,7 +30,6 @@ display: options: offset: '0' type: none - pager_options: { } sorts: id: field: id diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_mapping.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_mapping.yml index ef3b07b..83185c4 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_mapping.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_mapping.yml @@ -8,7 +8,6 @@ display: defaults: fields: '0' pager: '0' - pager_options: '0' sorts: '0' fields: age: @@ -33,7 +32,6 @@ display: options: offset: '0' type: none - pager_options: { } sorts: id: field: id diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_table.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_table.yml index de0a8ae..8c635e6 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_table.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_table.yml @@ -8,7 +8,6 @@ display: defaults: fields: '0' pager: '0' - pager_options: '0' sorts: '0' fields: age: @@ -33,7 +32,6 @@ display: options: offset: '0' type: none - pager_options: { } sorts: id: field: id diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml index 79c2bf0..b1a5557 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml @@ -11,7 +11,6 @@ display: defaults: fields: '0' pager: '0' - pager_options: '0' sorts: '0' fields: age: @@ -36,7 +35,6 @@ display: type: full options: items_per_page: 10 - pager_options: { } display_plugin: default display_title: Master id: default diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view.yml index bfcc681..3325d89 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view.yml @@ -8,7 +8,6 @@ display: defaults: fields: '0' pager: '0' - pager_options: '0' sorts: '0' row: type: fields @@ -35,7 +34,6 @@ display: options: offset: '0' type: none - pager_options: { } sorts: id: field: id diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_broken.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_broken.yml index 08ade5f..a71412e 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_broken.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_broken.yml @@ -8,7 +8,6 @@ display: defaults: fields: '0' pager: '0' - pager_options: '0' sorts: '0' fields: id_broken: @@ -71,7 +70,6 @@ display: options: offset: '0' type: none - pager_options: { } display_plugin: default display_title: Master id: default diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_empty.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_empty.yml index 90f8bf3..543d3c1 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_empty.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_empty.yml @@ -8,7 +8,6 @@ display: defaults: fields: '0' pager: '0' - pager_options: '0' sorts: '0' fields: id: @@ -21,7 +20,6 @@ display: options: offset: '0' type: none - pager_options: { } display_plugin: default display_title: Master id: default diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_handler_weight.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_handler_weight.yml index c95c54e..5b13c09 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_handler_weight.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_handler_weight.yml @@ -8,7 +8,6 @@ display: defaults: fields: '0' pager: '0' - pager_options: '0' sorts: '0' fields: id: @@ -33,7 +32,6 @@ display: options: offset: '0' type: none - pager_options: { } sorts: id: field: id diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_render.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_render.yml index 4a22e1d..179a131 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_render.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_render.yml @@ -8,7 +8,6 @@ display: defaults: fields: '0' pager: '0' - pager_options: '0' sorts: '0' fields: age: @@ -33,7 +32,6 @@ display: options: offset: '0' type: none - pager_options: { } sorts: id: field: id diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_storage.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_storage.yml index edc34fa..d8ba0a1 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_storage.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_storage.yml @@ -9,7 +9,6 @@ display: defaults: fields: '0' pager: '0' - pager_options: '0' sorts: '0' fields: id: