Skip to content

Default functionality update #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jimsheen wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Default functionality update #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
088467e
All rows collapsed by default on init
Nov 24, 2015
f8dbdc5
All rows collapsed by default on init
Nov 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions js/acf4_repeater_collapser_admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ jQuery(document).ready(function($) {
$collapseSingleButtonTable = '<td class="repeater-button-cell"><div class="repeater-button-cell-div"><button type="button" role="button" class="button field-repeater-toggle field-repeater-toggle-single"><span class="screen-reader-text">' + acfrcL10n.collapseRow + '</span></button></div></td>',
$collapseSingleButton = '<button type="button" role="button" class="button field-repeater-toggle field-repeater-toggle-single"><span class="screen-reader-text">' + acfrcL10n.collapseRow + '</span></button>';

// Collapse all fields by default
acfRepeaterToggleAll();


// find each repeater & flexible instance, add the button if the field uses the row layout
$('.field_type-repeater, .field_type-flexible_content').each( function() {
var $repeater = $(this);
Expand Down Expand Up @@ -137,6 +141,13 @@ jQuery(document).ready(function($) {
$rowsetButton = $that,
$rowsetWrapper = $that.parent();

if ($rowsetWrapper.length == 0) {
$rowsetWrapper = $('.field_type-repeater');
}
else {
$rowsetWrapper = $that.parent();
}

// select either nested or unnested repeater rows, not both
if( true === $rowsetWrapper.data('acf-repeater-nested') ) {
$rows = $('.row:data(acf-repeater-nested),.layout', $rowsetWrapper);
Expand All @@ -154,7 +165,9 @@ jQuery(document).ready(function($) {
}

// prevent bubbling up to parent repeater rowset
event.stopPropagation();
if (event) {
event.stopPropagation();
}
}

/**
Expand Down Expand Up @@ -187,7 +200,9 @@ jQuery(document).ready(function($) {
}

// prevent bubbling up to parent row button
event.stopPropagation();
if (event) {
event.stopPropagation();
}
}

/**
Expand Down
18 changes: 16 additions & 2 deletions js/acf5_repeater_collapser_admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ jQuery(document).ready(function($) {
$collapseSingleButtonTable = '<td class="repeater-button-cell"><div class="repeater-button-cell-div"><button type="button" role="button" class="button field-repeater-toggle field-repeater-toggle-single"><span class="screen-reader-text">' + acfrcL10n.collapseRow + '</span></button></div></td>',
$collapseSingleButton = '<button type="button" role="button" class="button field-repeater-toggle field-repeater-toggle-single"><span class="screen-reader-text">' + acfrcL10n.collapseRow + '</span></button>';

// Collapse all fields by default
acfRepeaterToggleAll();

// find each repeater & flexible instance, add the button if the field uses the row layout
$('.field_type-repeater, .field_type-flexible_content').each( function() {
var $repeater = $(this);
Expand Down Expand Up @@ -143,6 +146,13 @@ jQuery(document).ready(function($) {
$rowsetButton = $that,
$rowsetWrapper = $that.closest('.acf-field');

if ($rowsetWrapper.length == 0) {
$rowsetWrapper = $('.field_type-repeater');
}
else {
$rowsetWrapper = $that.parent();
}

// 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);
Expand All @@ -160,7 +170,9 @@ jQuery(document).ready(function($) {
}

// prevent bubbling up to parent repeater rowset
event.stopPropagation();
if (event) {
event.stopPropagation();
}
}

/**
Expand All @@ -186,7 +198,9 @@ jQuery(document).ready(function($) {
}

// prevent bubbling up to parent row button
event.stopPropagation();
if (event) {
event.stopPropagation();
}
}

/**
Expand Down