Release

assets/js/src/frontend/blog.js

@@ -10,7 +10,10 @@ const triggerSelector = '.infinite-scroll-trigger';
  * Initialize blog JS.
  */
 export const initBlog = () => {
-	if (document.querySelector('.blog.nv-index-posts') === null) {
+	if (
+		document.querySelector('.blog.nv-index-posts') === null ||
+		typeof NeveProperties === 'undefined'
+	) {
 		return false;
 	}
 	masonry();

assets/js/src/frontend/hgf.js

@@ -92,7 +92,8 @@ HFG.prototype.toggleMenuSidebar = function (toggle, target = null) {
 	);
 
 	if (
-		(!NeveProperties.isCustomize &&
+		((typeof NeveProperties === 'undefined' ||
+			!NeveProperties.isCustomize) &&
 			doc.body.classList.contains(sidebarClasses[0])) ||
 		toggle === false
 	) {

assets/scss/components/main/_gutenberg.scss

@@ -38,6 +38,10 @@
 	padding: 0 7.5px;
 }
 
+.wp-block-image.alignfull {
+	padding: 0;
+}
+
 .alignwide {
 	width: 98vw;
 	max-width: 98vw;

header-footer-grid/Core/Components/Logo.php

@@ -248,8 +248,9 @@ public function toggle_script() {
 		$variants_json = wp_json_encode( $variants );
 
 		$script = <<<JS
-	var html = document.documentElement;
-	var theme = html.getAttribute('data-neve-theme') || 'light';
+	;(function () {
+	var htmlEl = document.documentElement;
+	var theme = htmlEl.getAttribute('data-neve-theme') || 'light';
 	var variants = {$variants_json};
 
 	function setCurrentTheme( theme ) {
@@ -283,16 +284,18 @@ function setCurrentTheme( theme ) {
 
 	var observer = new MutationObserver(function(mutations) {
 		mutations.forEach(function(mutation) {
-			if (mutation.type == 'attributes') {
-				theme = html.getAttribute('data-neve-theme');
+			if (mutation.type == 'attributes' && mutation.attributeName === 'data-neve-theme') {
+				theme = htmlEl.getAttribute('data-neve-theme');
 				setCurrentTheme(theme);
 			};
 		});
 	});
 
-	observer.observe(html, {
-		attributes: true
+	observer.observe(htmlEl, {
+		attributes: true,
+		attributeFilter: ['data-neve-theme']
 	});
+	})();
 JS;
 		return $script;
 	}

inc/views/nav_walker.php

@@ -151,9 +151,10 @@ public function add_caret( $title, $item, $args, $depth ) {
 				$expand_dropdowns = apply_filters( 'neve_first_level_expanded', false );
 				$additional_class = $expand_dropdowns && $depth === 0 ? 'dropdown-open' : '';
 
-				$caret  = '<button ' . $expanded . ' type="button" class="caret-wrap navbar-toggle ' . esc_attr( (string) $item->menu_order ) . ' ' . esc_attr( $additional_class ) . '" style="' . esc_attr( $caret_wrap_css ) . '"  aria-label="' . __( 'Toggle', 'neve' ) . ' ' . wp_filter_nohtml_kses( $title ) . '">';
-				$caret .= $caret_pictogram;
-				$caret .= '</button>';
+				$toggle_aria_label = __( 'Toggle', 'neve' ) . ' ' . wp_filter_nohtml_kses( $title );
+				$caret             = '<button ' . $expanded . ' type="button" class="caret-wrap navbar-toggle ' . esc_attr( (string) $item->menu_order ) . ' ' . esc_attr( $additional_class ) . '" style="' . esc_attr( $caret_wrap_css ) . '"  aria-label="' . esc_attr( $toggle_aria_label ) . '">';
+				$caret            .= $caret_pictogram;
+				$caret            .= '</button>';
 
 				if ( $caret_settings['side'] === 'left' ) {
 					$args->before = $args->before . $caret;

inc/views/partials/excerpt.php

@@ -75,8 +75,11 @@ private function get_excerpt( $length = 25, $post_id = null ) {
 			return apply_filters( 'the_content', get_the_content( null, false, $post_id ) );
 		}
 
-		if ( has_excerpt() ) {
-			return apply_filters( 'the_excerpt', get_the_excerpt( $post_id ) );
+		if ( has_excerpt( $post_id ) ) {
+			$excerpt_more = apply_filters( 'excerpt_more', ' […]' );
+			$content      = wp_trim_words( get_the_excerpt( $post_id ), $length, $excerpt_more );
+
+			return apply_filters( 'the_excerpt', $content );
 		}
 
 		add_filter( 'excerpt_length', array( $this, 'change_excerpt_length' ), 10 );

tests/js/logo-toggle-script.test.mjs

@@ -0,0 +1,53 @@
+// Behavioral test for the Logo palette inline script (issue #4541).
+// Run: node tests/js/logo-toggle-script.test.mjs
+import { readFileSync } from 'fs';
+import { strict as assert } from 'assert';
+import { JSDOM, VirtualConsole } from 'jsdom';
+
+const php = readFileSync(new URL('../../header-footer-grid/Core/Components/Logo.php', import.meta.url), 'utf8');
+const js = php.match(/<<<JS\n([\s\S]*?)\nJS;/)[1].replace(
+	'{$variants_json}',
+	JSON.stringify({ logo: { same: false, light: { src: 'http://x/light.png', srcset: '', sizes: '' }, dark: { src: 'http://x/dark.png', srcset: '', sizes: '' } } })
+);
+
+function makePage() {
+	const errors = [];
+	const virtualConsole = new VirtualConsole();
+	virtualConsole.on('jsdomError', (e) => errors.push(e));
+	const dom = new JSDOM(
+		'<html><body><img class="neve-site-logo" data-variant="logo" src="http://x/light.png"></body></html>',
+		{ runScripts: 'outside-only', virtualConsole }
+	);
+	dom.window.eval(js);
+	return { window: dom.window, errors };
+}
+
+const tick = () => new Promise((r) => setTimeout(r, 0));
+
+// 1. No page globals leaked.
+{
+	const { window } = makePage();
+	assert.equal(window.html, undefined, 'script leaks global "html"');
+	assert.equal(window.setCurrentTheme, undefined, 'script leaks global "setCurrentTheme"');
+}
+
+// 2. Survives a clobbered window.html + unrelated root attribute change.
+{
+	const { window, errors } = makePage();
+	window.html = 'not-an-element';
+	window.document.documentElement.setAttribute('data-test', '1');
+	await tick();
+	assert.deepEqual(errors, [], `observer threw: ${errors[0]}`);
+}
+
+// 3. Still swaps the logo on data-neve-theme change (even after the clobber).
+{
+	const { window, errors } = makePage();
+	window.html = 'not-an-element';
+	window.document.documentElement.setAttribute('data-neve-theme', 'dark');
+	await tick();
+	assert.deepEqual(errors, [], `observer threw: ${errors[0]}`);
+	assert.equal(window.document.querySelector('.neve-site-logo').src, 'http://x/dark.png', 'logo did not swap to dark variant');
+}
+
+console.log('logo-toggle-script: all assertions passed');