Changeset 36580

Timestamp:

02/18/2016 09:20:33 PM (11 years ago)

Author:

ocean90

Message:

Themes: After [36546] restore theme search functionality.

• Correct several incorrect uses of _.union. Since Underscore 1.7.0 _.union supports only arrays and not variadic args.
• Use a namespaced event themes:update. Backbone 1.2 added a built in update event that triggers after any amount of models are added or removed from a collection.

Props adamsilverstein.
See #34350.

File:

• trunk/src/wp-admin/js/theme.js (modified) (6 diffs)

trunk/src/wp-admin/js/theme.js

@@ -159 +159 @@
                 }
 
-                // Trigger an 'update' event
-                this.trigger( 'update' );
+                // Trigger a 'themes:update' event
+                this.trigger( 'themes:update' );
         },
 
@@ -186 +186 @@
                         author      = data.get( 'author' ).replace( /(<([^>]+)>)/ig, '' );
 
-                        haystack = _.union( name, data.get( 'id' ), description, author, data.get( 'tags' ) );
+                        haystack = _.union( [ name, data.get( 'id' ), description, author, data.get( 'tags' ) ] );
 
                         if ( match.test( data.get( 'author' ) ) && term.length > 2 ) {
@@ -265 +265 @@
                                 // Trigger a collection refresh event
                                 // and a `query:success` event with a `count` argument.
-                                self.trigger( 'update' );
+                                self.trigger( 'themes:update' );
                                 self.trigger( 'query:success', count );
 
@@ -309 +309 @@
                         }
 
-                        this.trigger( 'update' );
+                        this.trigger( 'themes:update' );
                         this.trigger( 'query:success', this.count );
                 }
@@ -864 +864 @@
 
                 // When the collection is updated by user input...
-                this.listenTo( self.collection, 'update', function() {
+                this.listenTo( self.collection, 'themes:update', function() {
                         self.parent.page = 0;
                         self.currentTheme();
                         self.render( this );
-                });
+                } );
 
                 // Update theme count to full result set when available.
@@ -1479 +1479 @@
                 // Construct the filter request
                 // using the default values
-                filter = _.union( filter, this.filtersChecked() );
+                filter = _.union( [ filter, this.filtersChecked() ] );
                 request = { tag: [ filter ] };