WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Themes: Fix javascript regression that linter found. 

Tests were failing from line length optimizations and double quotes. 

Fixes #37536

Built from https://develop.svn.wordpress.org/trunk@46310


git-svn-id: http://core.svn.wordpress.org/trunk@46109 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
whyisjake 2019-09-25 22:12:57 +00:00
parent b4ab6b7e14
commit 2822281c57
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-content/themes/twentyfifteen/js/functions.js
View File

@ -100,16 +100,13 @@
sidebarHeight = $sidebar.height(), sidebarHeight = $sidebar.height(),
bodyHeight = $body.height(); bodyHeight = $body.height();
if( 955 < $window.width() if( 955 < $window.width() && bodyHeight > sidebarHeight && ( windowPos + windowHeight ) >= sidebarHeight ) {
&& bodyHeight > sidebarHeight
&& ( windowPos + windowHeight ) >= sidebarHeight ) {
$sidebar.css({ $sidebar.css({
position: "fixed", position: 'fixed',
bottom: sidebarHeight > windowHeight ? 0 : 'auto' bottom: sidebarHeight > windowHeight ? 0 : 'auto'
}); });
} else { } else {
$sidebar.css('position', 'relative') $sidebar.css('position', 'relative');
} }
} }

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.3-beta1-46309'; $wp_version = '5.3-beta1-46310';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.