From 2822281c575f969f7b6d12e720427ed0a38bb6eb Mon Sep 17 00:00:00 2001
From: whyisjake <whyisjake@git.wordpress.org>
Date: Wed, 25 Sep 2019 22:12:57 +0000
Subject: [PATCH] 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
---
 wp-content/themes/twentyfifteen/js/functions.js | 9 +++------
 wp-includes/version.php                         | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/wp-content/themes/twentyfifteen/js/functions.js b/wp-content/themes/twentyfifteen/js/functions.js
index f26293edab..f968885829 100644
--- a/wp-content/themes/twentyfifteen/js/functions.js
+++ b/wp-content/themes/twentyfifteen/js/functions.js
@@ -100,16 +100,13 @@
 			sidebarHeight = $sidebar.height(),
 			bodyHeight = $body.height();
 
-		if( 955 < $window.width()
-			&& bodyHeight > sidebarHeight
-			&& ( windowPos + windowHeight ) >= sidebarHeight ) {
-
+		if( 955 < $window.width() && bodyHeight > sidebarHeight && ( windowPos + windowHeight ) >= sidebarHeight ) {
 			$sidebar.css({
-				position: "fixed",
+				position: 'fixed',
 				bottom: sidebarHeight > windowHeight ? 0 : 'auto'
 			});
 		} else {
-			$sidebar.css('position', 'relative')
+			$sidebar.css('position', 'relative');
 		}
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4d926189a2..fd319c3dbe 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @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.