';
+ $collapseSingleButton = '';
+
+ // find each repeater & flexible instance, add the button if the field uses the row layout
+ $('.field_type-repeater, .field_type-flexible_content').each( function() {
+ $repeater = $(this);
+
+ // only use this on row layout
+ if( $( '.acf-input-table', $repeater ).hasClass('row-layout') ) {
+ $repeater.data('acf-rowset-collapsed', false).attr('aria-expanded', false);
+
+ // first: nested, second: parent
+ if( $repeater.is( 'tr' ) ) {
+ $( '.acf-repeater', $repeater ).first().prepend( $collapseAllButton );
+ $repeater
+ .data('acf-rowset-collapsed', false)
+ .data('acf-repeater-nested', true);
+ $('.acf-row,.acf-row.clone', $repeater ).data('acf-repeater-nested', true);
+ } else {
+ $repeater.prepend( $collapseAllButton )
+ .data('acf-rowset-collapsed', false);
+ }
+ }
+ });
+
+ // iterator for adding IDs/aria-controls attributes to repeater buttons
+ i = 1;
+ // append single repeater collapse to each row of repeater field
+ $('.field_type-repeater .row-layout > tbody > .acf-row,.field_type-repeater > tbody > .row-layout .acf-row.clone').each( function() {
+ id = 'acf-repeater-' + i;
+
+ $(this).prepend( $collapseSingleButtonTable )
+ .data('acf-row-collapsed', false)
+ .attr('aria-expanded', true)
+ .attr('id','acf-repeater-' + i)
+ .attr('aria-live','off');
+ $('.field-repeater-toggle-single', $(this)).first()
+ .attr('aria-controls',id);
+
+ i++;
+ });
+
+ // append single repeater collapse to flex fields
+ $('.field_type-flexible_content .layout').each( function() {
+ if( $('.acf-input-table', $(this)).hasClass('row-layout') ) {
+ id = 'acf-repeater-' + i;
+ i++;
+
+ $(this).prepend( $collapseSingleButton )
+ .data('acf-row-collapsed', false)
+ .attr('aria-expanded', true)
+ .attr('id','acf-repeater-' + i)
+ .attr('aria-live','off');
+
+ $('.field-repeater-toggle-single', $(this)).first()
+ .attr('aria-controls',id);
+ }
+ });
+
+ // Bind click events to the toggle functions
+ // delegated to higher DOM element to handle dynamically added repeaters
+ $( '.field_type-repeater, .field_type-flexible_content' ).on(
+ 'click',
+ '.field-repeater-toggle-all',
+ acfRepeaterToggleAll
+ );
+ $( '.field_type-repeater .row-layout,.field_type-flexible_content' ).on(
+ 'click',
+ '.field-repeater-toggle-single',
+ acfRepeaterToggleSingle
+ );
+
+ // prevent default flexible field collapsing for clarity
+ $('.field_type-flexible_content').on(
+ 'click',
+ '.acf-fc-layout-handle',
+ false
+ );
+ }
+
+ /**
+ * Collapse a row or rows
+ */
+ function acfRepeaterCollapseRow( $rows ) {
+ $rowButtonText = $('.screen-reader-text', $rows);
+ $rows.addClass('collapsed-row')
+ .data('acf-row-collapsed', true)
+ .attr('aria-expanded', false);
+ $rowButtonText.text('Expand Row')
+ }
+
+ /**
+ * Expand a row or rows
+ */
+ function acfRepeaterExpandRow( $rows ) {
+ $rowButtonText = $('.screen-reader-text', $rows);
+ $rows.removeClass('collapsed-row')
+ .data('acf-row-collapsed', false)
+ .attr('aria-expanded', true);
+ $rowButtonText.text('Collapse Row');
+ }
+
+ /**
+ * Indicate a collapsed rowset
+ */
+ function acfRepeaterExpandRowset( $wrapper ) {
+ $button = $('.field-repeater-toggle-all', $wrapper).first();
+
+ $wrapper.removeClass('collapsed-repeater')
+ .data('acf-rowset-collapsed', false);
+ $button.text('Collapse All Rows');
+ }
+
+ /**
+ * Indicate an expanded rowset
+ */
+ function acfRepeaterCollapseRowset( $wrapper ) {
+ $button = $('.field-repeater-toggle-all', $wrapper).first();
+
+ $wrapper.addClass('collapsed-repeater')
+ .data('acf-rowset-collapsed', true);
+ $button.text('Expand All Rows');
+ }
+
+ /**
+ * toggles set of repeater rows or flexible fields
+ */
+ function acfRepeaterToggleAll() {
+ $rowsetButton = $(this);
+ $rowsetWrapper = $(this).closest('.acf-field');
+
+ // select either nested or unnested repeater rows, not both
+ if( true === $rowsetWrapper.data('acf-repeater-nested') ) {
+ $rows = $('.acf-row:data(acf-repeater-nested),.layout', $rowsetWrapper);
+ } else {
+ $rows = $('.acf-row,.layout', $rowsetWrapper).not(':data(acf-repeater-nested)');
+ }
+
+ // toggle repeater state and all rows
+ if( true !== $rowsetWrapper.data('acf-rowset-collapsed') ) {
+ acfRepeaterCollapseRowset( $rowsetWrapper );
+ acfRepeaterCollapseRow( $rows );
+ } else {
+ acfRepeaterExpandRowset( $rowsetWrapper );
+ acfRepeaterExpandRow( $rows );
+ }
+
+ // prevent bubbling up to parent repeater rowset
+ event.stopPropagation();
+ }
+
+ /**
+ * toggles single repeater row or flexible field
+ */
+ function acfRepeaterToggleSingle() {
+ $rowButton = $(this);
+ $rowButtonText = $('.screen-reader-text', $rowButton);
+ $row = $rowButton.closest('.acf-row,.layout');
+ $rowsetWrapper = $(this).closest('.acf-field');
+
+ // toggle the row state and button text
+ if( true !== $row.data('acf-row-collapsed') ) {
+ acfRepeaterCollapseRow( $row );
+ } else {
+ acfRepeaterExpandRow( $row );
+ }
+
+ if( true === acfRepeaterAllCollapsed( $rowsetWrapper ) ) {
+ acfRepeaterCollapseRowset( $rowsetWrapper );
+ } else {
+ acfRepeaterExpandRowset( $rowsetWrapper );
+ }
+
+ // prevent bubbling up to parent row button
+ event.stopPropagation();
+ }
+
+ /**
+ * check to see if all rows in a rowset are collapsed
+ * @param obj $rowsetWrapper jquery object
+ * @return bool true if all rows in rowset are collapsed
+ */
+ function acfRepeaterAllCollapsed( $rowsetWrapper ) {
+ // select either nested or unnested repeater rows, not both
+ if( true === $rowsetWrapper.data('acf-repeater-nested') ) {
+ $rows = $('.acf-row:data(acf-repeater-nested),.layout:data(acf-repeater-nested)', $rowsetWrapper).not('.clone');
+ } else {
+ $rows = $('.acf-row,.values .layout', $rowsetWrapper).not(':data(acf-repeater-nested)').not('.clone');
+ }
+
+ // store every row collapsed state in an array
+ var rowStates = new Array();
+ $rows.each( function() {
+ rowStates.push( $(this).data('acf-row-collapsed') );
+ });
+
+ // check if any rows are expanded
+ allCollapsed = 0 > $.inArray( false, rowStates );
+
+ return allCollapsed;
+ }
+
+ // Initiatilize the plugin
+ acfRepeaterCollapserInit();
+
+});
\ No newline at end of file
diff --git a/readme.txt b/readme.txt
index f78319a..678a7e8 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,8 +3,8 @@ Contributors: mrwweb
Tags: advanced custom fields, acf, repeater
Requires at least: 3.0.0
Donate link: https://www.networkforgood.org/donation/MakeDonation.aspx?ORGID2=522061398
-Tested up to: 3.9
-Stable tag: 1.3.0
+Tested up to: 4.0-beta3
+Stable tag: 1.4.0
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -12,37 +12,45 @@ Easier sorting for large repeated fields in the Advanced Custom Fields plugin.
== Description ==
-**This plugin requires both the [Advanced Custom Fields](http://wordpress.org/extend/plugins/advanced-custom-fields/) plugin (version 4.0+ only) *AND* one or both of the [Repeater Field](http://www.advancedcustomfields.com/add-ons/repeater-field/) or [Flexible Content Field](http://www.advancedcustomfields.com/add-ons/flexible-content-field/) paid add-ons (or the PRO plugin for ACF 5.0+).**
+The Repeater and Flexible Content Field features make ACF really powerful, but if you have more than a few fields with either, they becomes unwieldy to sort. This plugin collapses each instance of the repeated fields—**only for the "Row"/"Block" layout**—to allow for easy sorting.
-Both add-ons make "ACF" much more powerful, but if you have more than few fields in either, it becomes unwieldy to sort. This plugin collapses each instance of the repeated fields—only for the "Row" layout with the Repeater Field—to allow for easy sorting.
-
-*To help identify each repeater field group when collapsed, the first field of each repeated field group is shown. See the screenshots for an example.*
+*To help identify each repeater field group when collapsed, the first field of each repeated field group is shown. See the [screenshots](http://wordpress.org/plugins/advanced-custom-field-repeater-collapser/screenshots/) for an example.*
**Want support for the table layout? Sponsor an update!** [Contact me](http://mrwweb.com/contact/) about sponsoring this feature if you're interested.
-Contribute to [this plugin on GitHub](https://github.com/mrwweb/ACF-Repeater-Collapser).
+------------------------------------------------
-This plugin began as a [support forum thread](http://support.advancedcustomfields.com/discussion/comment/16239) on the ACF site.
+**Requirements:**
+
+* [Advanced Custom Fields](http://wordpress.org/extend/plugins/advanced-custom-fields/) 4.X *AND* one or both of the [Repeater Field](http://www.advancedcustomfields.com/add-ons/repeater-field/) or [Flexible Content Field](http://www.advancedcustomfields.com/add-ons/flexible-content-field/) paid add-ons
+* ACF 5.X PRO
+* Both ACF 4.X and ACF 5.X: Use the **Row/Block Layout**
+
+------------------------------------------------
+
+Contribute to [this plugin on GitHub](https://github.com/mrwweb/ACF-Repeater-Collapser).
-Sponsors:
+**Sponsors:**
* [Angie Meeker Designs](http://angiemeekerdesigns.com/) — Single Row Collapsing Development
-Other contributors:
+**Other contributors:**
* [brasofilo](http://profiles.wordpress.org/brasofilo/)
* [weskoop](http://profiles.wordpress.org/weskoop/)
* [philiphetue](https://github.com/philiphetue)
+This plugin began as a [support forum thread](http://support.advancedcustomfields.com/discussion/comment/16239) on the ACF site.
+
== Frequently Asked Questions ==
= Where is the "Collapse Rows" button? I don't see it. =
-The plugin only supports the "Row" layout for repeaters.
+The plugin only supports the "Row" layout ("Block" Layout in ACF 5) for repeaters.
= Why don't rows collapse? / Why is the row only grayed out? =
To help identify each repeater field group when collapsed, the first field of each repeated field group is shown. See the screenshots for an example.
-As a work around, use a short field (like a text field or dropdown) as the first row in a repeatable fieldset.
+When possible, use a short field (like a text field or dropdown) as the first row in a repeatable fieldset.
= Can I collapse individual rows? =
Now you can, as of version 1.3.0.
@@ -66,8 +74,14 @@ With the addition of the ability to collapse single rows, the button now is alwa
6. New in v1.3.0, you can collapse individual fields! (Thanks to Angie Meeker Designs for sponsoring this feature.)
== Changelog ==
+= 1.4.0 (15 Aug 2014) =
+* [New] **ACF5 Support**
+* [Fix] aria-controls attribute fix
+* Note: The plugin supports both ACF4 and ACF5; however, all future feature improvements will only be made for ACF 5.X.
+* Did this plugin save you some time or help build a site for a client? [Buy me a beverage!](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=HH4FKZHK75MTN&lc=US&item_name=MRW%20Web%20Design%20%2f%20Mark%20Root%2dWiley&item_number=Buy%20Me%20a%20Beverage%21%20%2d%20ACF%20Repeater%20Collapser¤cy_code=USD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted).
+
= 1.3.0 (18 Jul 2014) =
-* [New] Ability to collapse single fields
+* [New] **Ability to collapse single fields**
* [New] Added aria-expanded / aria-controls attributes on rows for improved accessibility
* [Tweak] Clarified button text and added icons to buttons for improved UI
* [Fix] Fixed errant closing tag on