Skip to content

Catch Array Before It Throws Error in data.value.replace string function #26

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
davidshq wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Catch Array Before It Throws Error in data.value.replace string function #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6afa2b1
Update shortcode-button.js
davidshq Feb 2, 2020
96cbbe2
Update shortcode-quicktag-button.js
davidshq Feb 2, 2020
9ef2238
Adding a check for arrays being passed as data.value and converting t…
davidshq Feb 3, 2020
8910160
Removing extraneous code comments.
davidshq Feb 3, 2020
5eb7f75
Remove extra comment
davidshq Feb 3, 2020
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
3 changes: 1 addition & 2 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/shortcode-button.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion js/shortcode-quicktag-button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ window.wp_sc_buttons = window.wp_sc_buttons || {};
*
* @param {document#event:quicktags-init} evt
* @param {object} ed - The current quicktags editor instance
* @see {@link https://github.com/WebDevStudios/WDS-Shortcodes/issues/7|WDS-Shortcodes Issue #7}
* @see {@link https://github.com/WordPress/WordPress/blob/master/wp-includes/js/quicktags.js#L266-L325|WordPress Quicktags}
* @see {@link https://github.com/jtsternberg/Shortcode_Button/blob/master/lib/class-shortcode-button.php#L236-L247|Shortcode Button}
* @see {@link https://github.com/WebDevStudios/WDS-Shortcodes/issues/7|WDS-Shortcodes Issue #7}
*/
var removeQTagsButton = function( evt, ed ) {
var id;
Expand Down Expand Up @@ -455,6 +455,11 @@ window.wp_sc_buttons = window.wp_sc_buttons || {};
data.type = classes[0];
data.value = data.attrs[ data.name ] ? data.attrs[ data.name ] : '';

// If our value is an array convert it to JSON string.
if(Array.isArray(data.value)) {
data.value = JSON.stringify(data.value);
}

// Allow override
if ( btn.populateField ) {
return btn.populateField( $field, data );
Expand Down
Loading