Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add array of notice ids and/or classes and iterate to collapse

This commit is contained in:
Tiago Noronha 2019-02-15 18:01:18 +00:00
parent 92de076a45
commit 6d58ed97c4
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
plugins/woocommerce-admin/client/header/activity-panel/wordpress-notices.js
View File

@ -116,32 +116,38 @@ class WordPressNotices extends Component {
// Some messages should not be displayed in the toggle, like Jetpack JITM messages or update/success messages
shouldCollapseNotice( element ) {
if ( element.classList.contains( 'jetpack-jitm-message' ) ) {
return false;
}
const noticesToHide = [
[ null, [ 'jetpack-jitm-message' ] ], // ID and/or array of classes
[ 'woocommerce_errors', null ],
[ null, [ 'hidden' ] ],
[ 'message', [ 'notice', 'updated' ] ],
[ 'dolly', null ],
];
if ( 'woocommerce_errors' === element.id ) {
return false;
}
let collapse = true;
for ( let i = 0; collapse && i < noticesToHide.length; i++ ) {
const [ id, classes ] = noticesToHide[ i ];
if ( element.classList.contains( 'hidden' ) ) {
return false;
}
if ( 'message' === element.id && element.classList.contains( 'notice' ) ) {
return false;
}
if ( 'message' === element.id && 'updated' === element.className ) {
return false;
if ( Array.isArray( classes ) ) {
for ( let j = 0; j < classes.length; j++ ) {
if (
element.classList.contains( classes[ j ] ) &&
( ! id || ( id && id === element.id ) )
) {
collapse = false;
break;
}
}
} else if ( id && id === element.id ) {
collapse = false;
}
}
if ( 'dolly' === element.id ) {
element.style.display = 'none';
return false;
}
return true;
return collapse;
}
updateCount() {