! More compatibility fixes for jQuery 3.x (andSelf...) (ManageSetting…

…s.php, sbox.js, script.js, zoomedia.js)
Wedge · Jul 25, 2016 · c5277ec · c5277ec
1 parent 7d44367
commit c5277ec
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/core/app/ManageSettings.php b/core/app/ManageSettings.php
@@ -528,11 +528,11 @@ function ModifyHomepage($return_config = false)
 	add_js('
 	function updateHomepage()
 	{
-		$("#homepage_board").closest("dd").prev().andSelf().toggle($("#homepage_type").val() == "board");
-		$("#homepage_action").closest("dd").prev().andSelf().toggle($("#homepage_type").val() == "action");
-		$("#homepage_custom").closest("dd").prev().andSelf().toggle($("#homepage_type").val() == "custom");
+		$("#homepage_board").closest("dd").prev().addBack().toggle($("#homepage_type").val() == "board");
+		$("#homepage_action").closest("dd").prev().addBack().toggle($("#homepage_type").val() == "action");
+		$("#homepage_custom").closest("dd").prev().addBack().toggle($("#homepage_type").val() == "custom");
 		$("#homepage_custom").closest("dl").prev().toggle($("#homepage_type").val() != "boardlist");
-		$("[id^=homepage_blurb_]").closest("dd").prev().andSelf().toggle($("#homepage_type").val() == "custom");
+		$("[id^=homepage_blurb_]").closest("dd").prev().addBack().toggle($("#homepage_type").val() == "custom");
 	}
 	$("#homepage_type").change(updateHomepage);
 	updateHomepage();');

diff --git a/core/javascript/sbox.js b/core/javascript/sbox.js
@@ -72,7 +72,7 @@
 						$dd.append($optgroup = $('<div class="optgroup"><div class="label">' + $og.attr('label') + '</div>'));
 						$og.find('option').each(function () { $dd.append(createOption($(this)).addClass('sub')); });
 						if ($og.is(':disabled'))
-							$optgroup.nextAll().andSelf()
+							$optgroup.nextAll().addBack()
 								.addClass('disabled').attr('aria-disabled', true);
 					}
 					else

diff --git a/core/javascript/script.js b/core/javascript/script.js
@@ -640,7 +640,7 @@ $(function ()
 	// Catch the wheel button (or middle-click), and if it's not attempting to open a link, toggle the sidebar.
 	$(document).on(is_firefox ? 'mouseup' : 'mousedown', function (e)
 	{
-		if (e.which == 2 && !$(e.target).closest('a').andSelf().filter('a').length && !$('#sideshow').is(':hidden') && !$.hasData(e.target))
+		if (e.which == 2 && !$(e.target).closest('a').addBack().filter('a').length && !$('#sideshow').is(':hidden') && !$.hasData(e.target))
 		{
 			sidebar_shown ? hide_sidebar() : show_sidebar();
 			e.preventDefault();
@@ -838,7 +838,7 @@ $(window).on('load', function ()
 								{
 									var was_new = that.hasClass('n_new');
 
-									that.removeClass('n_new').next('.n_prev').andSelf().hide(300, function () { $(this).remove(); });
+									that.removeClass('n_new').next('.n_prev').addBack().hide(300, function () { $(this).remove(); });
 									if (was_new)
 									{
 										we_notifs--;

diff --git a/core/javascript/zoomedia.js b/core/javascript/zoomedia.js
@@ -213,7 +213,7 @@ $.fn.zoomedia = function (options)
 	{
 		double_clicked = false;
 		$fullsize = $zoom_desc.find('.fullsize').attr('href'); // $zoom_desc or $anchor.next('.zoom-overlay')
-		$zoom_desc.find('.fullsize').next().andSelf().remove();
+		$zoom_desc.find('.fullsize').next().addBack().remove();
 		if ($fullsize && img && img.src != $fullsize)
 		{
 			show_ajax($img);