Changeset 41010 for branches/4.8

Timestamp:

07/06/2017 12:45:24 AM (7 years ago)

Author:

joemcgill

Message:

Sanity check $uploaderToggler in wp.media.view.UploaderInline.

This ensures $uploaderToggler exists before checking length so any views
extending or scripts accessing this view, won't encounter errors that stop execution.

See #41231.

Merges [41009] to the 4.8 branch.

Location:

branches/4.8

Files:

• . (modified) (1 prop)
• src/wp-includes/js/media-views.js (modified) (2 diffs)
• src/wp-includes/js/media/views/uploader/inline.js (modified) (2 diffs)

branches/4.8/src/wp-includes/js/media-views.js

@@ -8228 +8228 @@
     show: function() {
         this.$el.removeClass( 'hidden' );
-        if ( this.controller.$uploaderToggler.length ) {
+        if ( this.controller.$uploaderToggler && this.controller.$uploaderToggler.length ) {
             this.controller.$uploaderToggler.attr( 'aria-expanded', 'true' );
         }
@@ -8234 +8234 @@
     hide: function() {
         this.$el.addClass( 'hidden' );
-        if ( this.controller.$uploaderToggler.length ) {
+        if ( this.controller.$uploaderToggler && this.controller.$uploaderToggler.length ) {
             this.controller.$uploaderToggler
                 .attr( 'aria-expanded', 'false' )

branches/4.8/src/wp-includes/js/media/views/uploader/inline.js

@@ -120 +120 @@
     show: function() {
         this.$el.removeClass( 'hidden' );
-        if ( this.controller.$uploaderToggler.length ) {
+        if ( this.controller.$uploaderToggler && this.controller.$uploaderToggler.length ) {
             this.controller.$uploaderToggler.attr( 'aria-expanded', 'true' );
         }
@@ -126 +126 @@
     hide: function() {
         this.$el.addClass( 'hidden' );
-        if ( this.controller.$uploaderToggler.length ) {
+        if ( this.controller.$uploaderToggler && this.controller.$uploaderToggler.length ) {
             this.controller.$uploaderToggler
                 .attr( 'aria-expanded', 'false' )