From 540f7b8c28ce06ed754b991ef648d4c7aeccde0a Mon Sep 17 00:00:00 2001 From: Adam Silverstein Date: Sun, 31 Jan 2021 21:07:01 -0700 Subject: [PATCH 1/3] Changes from ticket patch. --- package-lock.json | 17 ----------------- src/js/media/views/uploader/inline.js | 1 + src/js/media/views/uploader/status.js | 1 + src/wp-includes/media-template.php | 8 ++++---- 4 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package-lock.json b/package-lock.json index 543d29787d2a3..86403af04a4ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5631,23 +5631,6 @@ "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", "dev": true }, - "browser-resolve": { - "version": "1.11.3", - "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz", - "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==", - "dev": true, - "requires": { - "resolve": "1.1.7" - }, - "dependencies": { - "resolve": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", - "dev": true - } - } - }, "browserify-aes": { "version": "1.2.0", "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", diff --git a/src/js/media/views/uploader/inline.js b/src/js/media/views/uploader/inline.js index bd2cff0dccc3c..c6bc5fa068fb1 100644 --- a/src/js/media/views/uploader/inline.js +++ b/src/js/media/views/uploader/inline.js @@ -115,6 +115,7 @@ UploaderInline = View.extend(/** @lends wp.media.view.UploaderInline.prototype * $browser.detach().text( $placeholder.text() ); $browser[0].className = $placeholder[0].className; + $browser[0].setAttribute( 'aria-labelledby', $browser[0].id + ' ' + $placeholder[0].getAttribute('aria-labelledby') ); $placeholder.replaceWith( $browser.show() ); } diff --git a/src/js/media/views/uploader/status.js b/src/js/media/views/uploader/status.js index 0be6f15f5d935..1d8930dd145ba 100644 --- a/src/js/media/views/uploader/status.js +++ b/src/js/media/views/uploader/status.js @@ -118,6 +118,7 @@ UploaderStatus = View.extend(/** @lends wp.media.view.UploaderStatus.prototype * // Can show additional info here while retrying to create image sub-sizes. this.views.add( '.upload-errors', statusError, { at: 0 } ); + this.$el.attr( 'tabindex', '-1' ).trigger( 'focus' ); }, dismiss: function() { diff --git a/src/wp-includes/media-template.php b/src/wp-includes/media-template.php index 2b887c475aa0f..e7ae50eee9641 100644 --- a/src/wp-includes/media-template.php +++ b/src/wp-includes/media-template.php @@ -252,12 +252,12 @@ function wp_print_media_templates() {

- +
-
+
-
+
–
-
+
From f0827bf3bfb4b4acef245a9424050893b4a40797 Mon Sep 17 00:00:00 2001 From: Adam Silverstein Date: Sun, 31 Jan 2021 21:10:03 -0700 Subject: [PATCH 2/3] restore package.json --- package-lock.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/package-lock.json b/package-lock.json index 86403af04a4ca..543d29787d2a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5631,6 +5631,23 @@ "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", "dev": true }, + "browser-resolve": { + "version": "1.11.3", + "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz", + "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==", + "dev": true, + "requires": { + "resolve": "1.1.7" + }, + "dependencies": { + "resolve": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", + "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", + "dev": true + } + } + }, "browserify-aes": { "version": "1.2.0", "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", From 39e41a3d3c68890f9a3807e50df426219edc8796 Mon Sep 17 00:00:00 2001 From: Adam Silverstein Date: Mon, 1 Feb 2021 08:21:45 -0700 Subject: [PATCH 3/3] Ticket patch --- src/js/media/views/uploader/status.js | 4 +- src/wp-includes/functions.php | 120 ++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 2 deletions(-) diff --git a/src/js/media/views/uploader/status.js b/src/js/media/views/uploader/status.js index 1d8930dd145ba..a1ab019bda7f9 100644 --- a/src/js/media/views/uploader/status.js +++ b/src/js/media/views/uploader/status.js @@ -111,14 +111,14 @@ UploaderStatus = View.extend(/** @lends wp.media.view.UploaderStatus.prototype * * @param {Backbone.Model} error */ error: function( error ) { + console.log('error!'); var statusError = new wp.media.view.UploaderStatusError( { filename: this.filename( error.get( 'file' ).name ), message: error.get( 'message' ) } ); // Can show additional info here while retrying to create image sub-sizes. - this.views.add( '.upload-errors', statusError, { at: 0 } ); - this.$el.attr( 'tabindex', '-1' ).trigger( 'focus' ); + this.$el.attr( 'tabindex', '-1' ).focus() }; }, dismiss: function() { diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php index 536f195b14875..a6c63681f8be2 100644 --- a/src/wp-includes/functions.php +++ b/src/wp-includes/functions.php @@ -7781,3 +7781,123 @@ function is_php_version_compatible( $required ) { function wp_fuzzy_number_match( $expected, $actual, $precision = 1 ) { return abs( (float) $expected - (float) $actual ) <= $precision; } + +/** + * Sanitizes an attributes array into an attributes string to be placed inside a `\n", wp_sanitize_script_attributes( $attributes ) ); +} + +/** + * Prints formatted `\n", wp_sanitize_script_attributes( $attributes ), $javascript ); +} + +/** + * Prints inline JavaScript wrapped in `