From 35b7340af950eb0bd38dcefdd8eed40b18d2166c Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sat, 7 Sep 2024 22:44:17 +0000
Subject: [PATCH] Administration: Remove old IE9 code from
 `wp-admin/js/svg-painter.js`.

About half of the file's code was a back-compat polyfill of base64 functions for IE9.

Since WordPress no longer supports IE9 as of version 4.8, and all modern browsers come with these functions, the polyfills can be removed.

Follow-up to [26072], [26131], [26601], [47771].

Props TobiasBg, sabernhardt.
Fixes #61995.
Built from https://develop.svn.wordpress.org/trunk@58997


git-svn-id: http://core.svn.wordpress.org/trunk@58393 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/admin-header.php      |   2 +-
 wp-admin/js/svg-painter.js     | 123 ++-------------------------------
 wp-admin/js/svg-painter.min.js |   2 +-
 wp-includes/version.php        |   2 +-
 4 files changed, 10 insertions(+), 119 deletions(-)

diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index 53e3c06cfd..235468f146 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -203,7 +203,7 @@ if ( is_network_admin() ) {
 	$admin_body_class .= ' network-admin';
 }
 
-$admin_body_class .= ' no-customize-support no-svg';
+$admin_body_class .= ' no-customize-support svg';
 
 if ( $current_screen->is_block_editor() ) {
 	$admin_body_class .= ' block-editor-page wp-embed-responsive';
diff --git a/wp-admin/js/svg-painter.js b/wp-admin/js/svg-painter.js
index a356735446..6a99d070d7 100644
--- a/wp-admin/js/svg-painter.js
+++ b/wp-admin/js/svg-painter.js
@@ -8,123 +8,22 @@ window.wp = window.wp || {};
 
 wp.svgPainter = ( function( $, window, document, undefined ) {
 	'use strict';
-	var selector, base64, painter,
+	var selector, painter,
 		colorscheme = {},
 		elements = [];
 
 	$( function() {
-		// Detection for browser SVG capability.
-		if ( document.implementation.hasFeature( 'http://www.w3.org/TR/SVG11/feature#Image', '1.1' ) ) {
-			$( document.body ).removeClass( 'no-svg' ).addClass( 'svg' );
-			wp.svgPainter.init();
-		}
+		wp.svgPainter.init();
 	});
 
-	/**
-	 * Needed only for IE9
-	 *
-	 * Based on jquery.base64.js 0.0.3 - https://github.com/yckart/jquery.base64.js
-	 *
-	 * Based on: https://gist.github.com/Yaffle/1284012
-	 *
-	 * Copyright (c) 2012 Yannick Albert (http://yckart.com)
-	 * Licensed under the MIT license
-	 * http://www.opensource.org/licenses/mit-license.php
-	 */
-	base64 = ( function() {
-		var c,
-			b64 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/',
-			a256 = '',
-			r64 = [256],
-			r256 = [256],
-			i = 0;
-
-		function init() {
-			while( i < 256 ) {
-				c = String.fromCharCode(i);
-				a256 += c;
-				r256[i] = i;
-				r64[i] = b64.indexOf(c);
-				++i;
-			}
-		}
-
-		function code( s, discard, alpha, beta, w1, w2 ) {
-			var tmp, length,
-				buffer = 0,
-				i = 0,
-				result = '',
-				bitsInBuffer = 0;
-
-			s = String(s);
-			length = s.length;
-
-			while( i < length ) {
-				c = s.charCodeAt(i);
-				c = c < 256 ? alpha[c] : -1;
-
-				buffer = ( buffer << w1 ) + c;
-				bitsInBuffer += w1;
-
-				while( bitsInBuffer >= w2 ) {
-					bitsInBuffer -= w2;
-					tmp = buffer >> bitsInBuffer;
-					result += beta.charAt(tmp);
-					buffer ^= tmp << bitsInBuffer;
-				}
-				++i;
-			}
-
-			if ( ! discard && bitsInBuffer > 0 ) {
-				result += beta.charAt( buffer << ( w2 - bitsInBuffer ) );
-			}
-
-			return result;
-		}
-
-		function btoa( plain ) {
-			if ( ! c ) {
-				init();
-			}
-
-			plain = code( plain, false, r256, b64, 8, 6 );
-			return plain + '===='.slice( ( plain.length % 4 ) || 4 );
-		}
-
-		function atob( coded ) {
-			var i;
-
-			if ( ! c ) {
-				init();
-			}
-
-			coded = coded.replace( /[^A-Za-z0-9\+\/\=]/g, '' );
-			coded = String(coded).split('=');
-			i = coded.length;
-
-			do {
-				--i;
-				coded[i] = code( coded[i], true, r64, a256, 6, 8 );
-			} while ( i > 0 );
-
-			coded = coded.join('');
-			return coded;
-		}
-
-		return {
-			atob: atob,
-			btoa: btoa
-		};
-	})();
-
 	return {
 		init: function() {
 			painter = this;
 			selector = $( '#adminmenu .wp-menu-image, #wpadminbar .ab-item' );
 
-			this.setColors();
-			this.findElements();
-			this.paint();
+			painter.setColors();
+			painter.findElements();
+			painter.paint();
 		},
 
 		setColors: function( colors ) {
@@ -201,11 +100,7 @@ wp.svgPainter = ( function( $, window, document, undefined ) {
 				}
 
 				try {
-					if ( 'atob' in window ) {
-						xml = window.atob( encoded[1] );
-					} else {
-						xml = base64.atob( encoded[1] );
-					}
+					xml = window.atob( encoded[1] );
 				} catch ( error ) {}
 
 				if ( xml ) {
@@ -218,11 +113,7 @@ wp.svgPainter = ( function( $, window, document, undefined ) {
 					// Replace `fill` properties in `<style>` tags.
 					xml = xml.replace( /fill:.*?;/g, 'fill: ' + color + ';');
 
-					if ( 'btoa' in window ) {
-						xml = window.btoa( xml );
-					} else {
-						xml = base64.btoa( xml );
-					}
+					xml = window.btoa( xml );
 
 					$element.data( 'wp-ui-svg-' + color, xml );
 				} else {
diff --git a/wp-admin/js/svg-painter.min.js b/wp-admin/js/svg-painter.min.js
index a6f012e8b1..459c2b1007 100644
--- a/wp-admin/js/svg-painter.min.js
+++ b/wp-admin/js/svg-painter.min.js
@@ -1,2 +1,2 @@
 /*! This file is auto-generated */
-window.wp=window.wp||{},wp.svgPainter=function(e,i,n){"use strict";var t,o,a,m,r,s,c,u,l,f={},g=[];function p(){for(;l<256;)m=String.fromCharCode(l),s+=m,u[l]=l,c[l]=r.indexOf(m),++l}function d(n,t,e,a,i,o){for(var r,s=0,c=0,u="",l=0,f=(n=String(n)).length;c<f;){for(s=(s<<i)+(m=(m=n.charCodeAt(c))<256?e[m]:-1),l+=i;o<=l;)l-=o,u+=a.charAt(r=s>>l),s^=r<<l;++c}return!t&&0<l&&(u+=a.charAt(s<<o-l)),u}return e(function(){n.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#Image","1.1")&&(e(n.body).removeClass("no-svg").addClass("svg"),wp.svgPainter.init())}),r="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",s="",c=[256],u=[256],l=0,o={atob:function(n){var t;for(m||p(),n=n.replace(/[^A-Za-z0-9\+\/\=]/g,""),t=(n=String(n).split("=")).length;n[--t]=d(n[t],!0,c,s,6,8),0<t;);return n=n.join("")},btoa:function(n){return m||p(),(n=d(n,!1,u,r,8,6))+"====".slice(n.length%4||4)}},{init:function(){a=this,t=e("#adminmenu .wp-menu-image, #wpadminbar .ab-item"),this.setColors(),this.findElements(),this.paint()},setColors:function(n){(n=void 0===n&&void 0!==i._wpColorScheme?i._wpColorScheme:n)&&n.icons&&n.icons.base&&n.icons.current&&n.icons.focus&&(f=n.icons)},findElements:function(){t.each(function(){var n=e(this),t=n.css("background-image");t&&-1!=t.indexOf("data:image/svg+xml;base64")&&g.push(n)})},paint:function(){e.each(g,function(n,t){var e=t.parent().parent();e.hasClass("current")||e.hasClass("wp-has-current-submenu")?a.paintElement(t,"current"):(a.paintElement(t,"base"),e.on("mouseenter",function(){a.paintElement(t,"focus")}).on("mouseleave",function(){i.setTimeout(function(){a.paintElement(t,"base")},100)}))})},paintElement:function(n,t){var e,a;if(t&&f.hasOwnProperty(t)&&(t=f[t]).match(/^(#[0-9a-f]{3}|#[0-9a-f]{6})$/i)&&"none"!==(e=n.data("wp-ui-svg-"+t))){if(!e){if(!(a=n.css("background-image").match(/.+data:image\/svg\+xml;base64,([A-Za-z0-9\+\/\=]+)/))||!a[1])return void n.data("wp-ui-svg-"+t,"none");try{e=("atob"in i?i:o).atob(a[1])}catch(n){}if(!e)return void n.data("wp-ui-svg-"+t,"none");e=(e=(e=e.replace(/fill="(.+?)"/g,'fill="'+t+'"')).replace(/style="(.+?)"/g,'style="fill:'+t+'"')).replace(/fill:.*?;/g,"fill: "+t+";"),e=("btoa"in i?i:o).btoa(e),n.data("wp-ui-svg-"+t,e)}n.attr("style",'background-image: url("data:image/svg+xml;base64,'+e+'") !important;')}}}}(jQuery,window,document);
\ No newline at end of file
+window.wp=window.wp||{},wp.svgPainter=function(a,i){"use strict";var n,t,s={},o=[];return a(function(){wp.svgPainter.init()}),{init:function(){t=this,n=a("#adminmenu .wp-menu-image, #wpadminbar .ab-item"),t.setColors(),t.findElements(),t.paint()},setColors:function(n){(n=void 0===n&&void 0!==i._wpColorScheme?i._wpColorScheme:n)&&n.icons&&n.icons.base&&n.icons.current&&n.icons.focus&&(s=n.icons)},findElements:function(){n.each(function(){var n=a(this),e=n.css("background-image");e&&-1!=e.indexOf("data:image/svg+xml;base64")&&o.push(n)})},paint:function(){a.each(o,function(n,e){var a=e.parent().parent();a.hasClass("current")||a.hasClass("wp-has-current-submenu")?t.paintElement(e,"current"):(t.paintElement(e,"base"),a.on("mouseenter",function(){t.paintElement(e,"focus")}).on("mouseleave",function(){i.setTimeout(function(){t.paintElement(e,"base")},100)}))})},paintElement:function(n,e){var a,t;if(e&&s.hasOwnProperty(e)&&(e=s[e]).match(/^(#[0-9a-f]{3}|#[0-9a-f]{6})$/i)&&"none"!==(a=n.data("wp-ui-svg-"+e))){if(!a){if(!(t=n.css("background-image").match(/.+data:image\/svg\+xml;base64,([A-Za-z0-9\+\/\=]+)/))||!t[1])return void n.data("wp-ui-svg-"+e,"none");try{a=i.atob(t[1])}catch(n){}if(!a)return void n.data("wp-ui-svg-"+e,"none");a=(a=(a=a.replace(/fill="(.+?)"/g,'fill="'+e+'"')).replace(/style="(.+?)"/g,'style="fill:'+e+'"')).replace(/fill:.*?;/g,"fill: "+e+";"),a=i.btoa(a),n.data("wp-ui-svg-"+e,a)}n.attr("style",'background-image: url("data:image/svg+xml;base64,'+a+'") !important;')}}}}(jQuery,window,document);
\ No newline at end of file
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6b9fe875c4..05975adac3 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.7-alpha-58996';
+$wp_version = '6.7-alpha-58997';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.