Changeset 40060

Timestamp:

02/15/2017 05:28:54 PM (7 years ago)

Author:

adamsilverstein

Message:

Media: debounce the media grid search, avoiding duplicate requests.

Add a debounce wrapper to the media grid search handler. The search callback is now fired after a 300 ms typing pause.

Remove redundant handlers for 'search' and 'change', preventing multiple/duplicate search callbacks.

Props certainstrings, joemcgill, Kelderic, batmoo.
Fixes #38911.

Location:

trunk

Files:

• src/wp-includes/js/media-views.js (modified) (3 diffs)
• src/wp-includes/js/media/views/search.js (modified) (3 diffs)
• tests/qunit/fixtures/wp-api-generated.js (modified) (2 diffs)

trunk/src/wp-includes/js/media-views.js

@@ -7086 +7086 @@
     events: {
         'input':  'search',
-        'keyup':  'search',
-        'change': 'search',
-        'search': 'search'
+        'keyup':  'search'
     },
 
@@ -7099 +7097 @@
     },
 
-    search: function( event ) {
+    search: function( event ) {
         if ( event.target.value ) {
             this.model.set( 'search', event.target.value );
@@ -7105 +7103 @@
             this.model.unset('search');
         }
-    }
+    }
 });
 

trunk/src/wp-includes/js/media/views/search.js

@@ -22 +22 @@
     events: {
         'input':  'search',
-        'keyup':  'search',
-        'change': 'search',
-        'search': 'search'
+        'keyup':  'search'
     },
 
@@ -35 +33 @@
     },
 
-    search: function( event ) {
+    search: function( event ) {
         if ( event.target.value ) {
             this.model.set( 'search', event.target.value );
@@ -41 +39 @@
             this.model.unset('search');
         }
-    }
+    }
 });
 

trunk/tests/qunit/fixtures/wp-api-generated.js

@@ -13 +13 @@
 mockedApiResponse.oembeds = {"code":"rest_missing_callback_param","message":"Missing parameter(s): url","data":{"status":400,"params":["url"]}};
 
-mockedApiResponse.PostsCollection = [{"id":1368,"date":"2017-02-14T04:05:35","date_gmt":"2017-02-14T04:05:35","guid":{"rendered":"http:\/\/example.org\/?p=1368"},"modified":"2017-02-14T04:05:35","modified_gmt":"2017-02-14T04:05:35","slug":"post-title-6208","type":"post","link":"http:\/\/example.org\/?p=1368","title":{"rendered":"Post title 6208"},"content":{"rendered":"<p>Updated content.<\/p>\n","protected":false},"excerpt":{"rendered":"<p>Post excerpt 6208<\/p>\n","protected":false},"author":354,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"test_single":"","test_multi":[],"test_bad_auth":"","test_bad_auth_multi":[],"test_custom_schema":0,"test_custom_schema_multi":[],"new_name":"","new_name_multi":[],"test_string":"","test_number":0,"test_bool":false,"my_meta_key":[]},"categories":[1],"tags":[],"_links":{"self":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/posts\/1368"}],"collection":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/users\/354"}],"replies":[{"embeddable":true,"href":"http:\/\/example.org\/?rest_route=%2Fwp%2Fv2%2Fcomments&post=1368"}],"version-history":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/posts\/1368\/revisions"}],"wp:attachment":[{"href":"http:\/\/example.org\/?rest_route=%2Fwp%2Fv2%2Fmedia&parent=1368"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/example.org\/?rest_route=%2Fwp%2Fv2%2Fcategories&post=1368"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/example.org\/?rest_route=%2Fwp%2Fv2%2Ftags&post=1368"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}];
+mockedApiResponse.PostsCollection = [{"id":"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}];
 
-mockedApiResponse.PostModel = {"id":1368,"date":"2017-02-14T04:05:35","date_gmt":"2017-02-14T04:05:35","guid":{"rendered":"http:\/\/example.org\/?p=1368"},"modified":"2017-02-14T04:05:35","modified_gmt":"2017-02-14T04:05:35","slug":"post-title-6208","type":"post","link":"http:\/\/example.org\/?p=1368","title":{"rendered":"Post title 6208"},"content":{"rendered":"<p>Updated content.<\/p>\n","protected":false},"excerpt":{"rendered":"<p>Post excerpt 6208<\/p>\n","protected":false},"author":354,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"test_single":"","test_multi":[],"test_bad_auth":"","test_bad_auth_multi":[],"test_custom_schema":0,"test_custom_schema_multi":[],"new_name":"","new_name_multi":[],"test_string":"","test_number":0,"test_bool":false,"my_meta_key":[]},"categories":[1],"tags":[]};
+mockedApiResponse.PostModel = {"id":,"categories":[1],"tags":[]};
 
-mockedApiResponse.postRevisions = [{"author":"354","date":"2017-02-14T04:05:35","date_gmt":"2017-02-14T04:05:35","id":1371,"modified":"2017-02-14T04:05:35","modified_gmt":"2017-02-14T04:05:35","parent":1368,"slug":"1368-revision-v1","guid":{"rendered":"http:\/\/example.org\/?p=1371"},"title":{"rendered":"Post title 6208"},"content":{"rendered":"<p>Updated content.<\/p>\n"},"excerpt":{"rendered":"<p>Post excerpt 6208<\/p>\n"},"_links":{"parent":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/posts\/1368"}]}}];
+mockedApiResponse.postRevisions = [{"author":""}]}}];
 
 mockedApiResponse.revision = {"code":"rest_post_invalid_id","message":"Invalid revision ID.","data":{"status":404}};
 
-mockedApiResponse.PagesCollection = [{"id":1369,"date":"2017-02-14T04:05:35","date_gmt":"2017-02-14T04:05:35","guid":{"rendered":"http:\/\/example.org\/?page_id=1369"},"modified":"2017-02-14T04:05:35","modified_gmt":"2017-02-14T04:05:35","slug":"post-title-6209","type":"page","link":"http:\/\/example.org\/?page_id=1369","title":{"rendered":"Post title 6209"},"content":{"rendered":"<p>Updated content.<\/p>\n","protected":false},"excerpt":{"rendered":"<p>Post excerpt 6209<\/p>\n","protected":false},"author":354,"featured_media":0,"parent":0,"menu_order":0,"comment_status":"closed","ping_status":"closed","template":"","meta":{"test_single":"","test_multi":[],"test_bad_auth":"","test_bad_auth_multi":[],"test_custom_schema":0,"test_custom_schema_multi":[],"new_name":"","new_name_multi":[],"test_string":"","test_number":0,"test_bool":false,"my_meta_key":[]},"_links":{"self":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/pages\/1369"}],"collection":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/pages"}],"about":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/types\/page"}],"author":[{"embeddable":true,"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/users\/354"}],"replies":[{"embeddable":true,"href":"http:\/\/example.org\/?rest_route=%2Fwp%2Fv2%2Fcomments&post=1369"}],"version-history":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/pages\/1369\/revisions"}],"wp:attachment":[{"href":"http:\/\/example.org\/?rest_route=%2Fwp%2Fv2%2Fmedia&parent=1369"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}];
+mockedApiResponse.PagesCollection = [{"id":"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}];
 
-mockedApiResponse.PageModel = {"id":1369,"date":"2017-02-14T04:05:35","date_gmt":"2017-02-14T04:05:35","guid":{"rendered":"http:\/\/example.org\/?page_id=1369"},"modified":"2017-02-14T04:05:35","modified_gmt":"2017-02-14T04:05:35","slug":"post-title-6209","type":"page","link":"http:\/\/example.org\/?page_id=1369","title":{"rendered":"Post title 6209"},"content":{"rendered":"<p>Updated content.<\/p>\n","protected":false},"excerpt":{"rendered":"<p>Post excerpt 6209<\/p>\n","protected":false},"author":354,"featured_media":0,"parent":0,"menu_order":0,"comment_status":"closed","ping_status":"closed","template":"","meta":{"test_single":"","test_multi":[],"test_bad_auth":"","test_bad_auth_multi":[],"test_custom_schema":0,"test_custom_schema_multi":[],"new_name":"","new_name_multi":[],"test_string":"","test_number":0,"test_bool":false,"my_meta_key":[]}};
+mockedApiResponse.PageModel = {"id":};
 
-mockedApiResponse.pageRevisions = [{"author":"354","date":"2017-02-14T04:05:35","date_gmt":"2017-02-14T04:05:35","id":1372,"modified":"2017-02-14T04:05:35","modified_gmt":"2017-02-14T04:05:35","parent":1369,"slug":"1369-revision-v1","guid":{"rendered":"http:\/\/example.org\/?p=1372"},"title":{"rendered":"Post title 6209"},"content":{"rendered":"<p>Updated content.<\/p>\n"},"excerpt":{"rendered":"<p>Post excerpt 6209<\/p>\n"},"_links":{"parent":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/pages\/1369"}]}}];
+mockedApiResponse.pageRevisions = [{"author":""}]}}];
 
 mockedApiResponse.pageRevision = {"code":"rest_post_invalid_id","message":"Invalid revision ID.","data":{"status":404}};
 
-mockedApiResponse.MediaCollection = [{"id":1370,"date":"2017-02-14T04:05:35","date_gmt":"2017-02-14T04:05:35","guid":{"rendered":"http:\/\/example.org\/?attachment_id=1370"},"modified":"2017-02-14T04:05:35","modified_gmt":"2017-02-14T04:05:35","slug":"1370","type":"attachment","link":"http:\/\/example.org\/?attachment_id=1370","title":{"rendered":""},"author":354,"comment_status":"open","ping_status":"closed","template":"","meta":{"test_single":"","test_multi":[],"test_bad_auth":"","test_bad_auth_multi":[],"test_custom_schema":0,"test_custom_schema_multi":[],"new_name":"","new_name_multi":[],"test_string":"","test_number":0,"test_bool":false,"my_meta_key":[]},"description":{"rendered":"<p class=\"attachment\"><a href='http:\/\/example.org\/wp-content\/uploads\/\/tmp\/canola.jpg'><img width=\"1\" height=\"1\" src=\"http:\/\/example.org\/wp-content\/uploads\/\/tmp\/canola.jpg\" class=\"attachment-medium size-medium\" alt=\"\" \/><\/a><\/p>\n"},"caption":{"rendered":"<p>A sample caption<\/p>\n"},"alt_text":"","media_type":"image","mime_type":"image\/jpeg","media_details":{},"post":null,"source_url":"http:\/\/example.org\/wp-content\/uploads\/\/tmp\/canola.jpg","_links":{"self":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/media\/1370"}],"collection":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/media"}],"about":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/types\/attachment"}],"author":[{"embeddable":true,"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/users\/354"}],"replies":[{"embeddable":true,"href":"http:\/\/example.org\/?rest_route=%2Fwp%2Fv2%2Fcomments&post=1370"}]}}];
+mockedApiResponse.MediaCollection = [{"id":"}]}}];
 
-mockedApiResponse.MediaModel = {"id":1370,"date":"2017-02-14T04:05:35","date_gmt":"2017-02-14T04:05:35","guid":{"rendered":"http:\/\/example.org\/?attachment_id=1370"},"modified":"2017-02-14T04:05:35","modified_gmt":"2017-02-14T04:05:35","slug":"1370","type":"attachment","link":"http:\/\/example.org\/?attachment_id=1370","title":{"rendered":""},"author":354,"comment_status":"open","ping_status":"closed","template":"","meta":{"test_single":"","test_multi":[],"test_bad_auth":"","test_bad_auth_multi":[],"test_custom_schema":0,"test_custom_schema_multi":[],"new_name":"","new_name_multi":[],"test_string":"","test_number":0,"test_bool":false,"my_meta_key":[]},"description":{"rendered":"<p class=\"attachment\"><a href='http:\/\/example.org\/wp-content\/uploads\/\/tmp\/canola.jpg'><img width=\"1\" height=\"1\" src=\"http:\/\/example.org\/wp-content\/uploads\/\/tmp\/canola.jpg\" class=\"attachment-medium size-medium\" alt=\"\" \/><\/a><\/p>\n"},"caption":{"rendered":"<p>A sample caption<\/p>\n"},"alt_text":"","media_type":"image","mime_type":"image\/jpeg","media_details":{},"post":null,"source_url":"http:\/\/example.org\/wp-content\/uploads\/\/tmp\/canola.jpg"};
+mockedApiResponse.MediaModel = {"id":,"description":{"rendered":"<p class=\"attachment\"><a href='http:\/\/example.org\/wp-content\/uploads\/\/tmp\/canola.jpg'><img width=\"1\" height=\"1\" src=\"http:\/\/example.org\/wp-content\/uploads\/\/tmp\/canola.jpg\" class=\"attachment-medium size-medium\" alt=\"\" \/><\/a><\/p>\n"},"caption":{"rendered":"<p>A sample caption<\/p>\n"},"alt_text":"","media_type":"image","mime_type":"image\/jpeg","media_details":{},"post":null,"source_url":"http:\/\/example.org\/wp-content\/uploads\/\/tmp\/canola.jpg"};
 
 mockedApiResponse.TypesCollection = {"post":{"description":"","hierarchical":false,"name":"Posts","slug":"post","taxonomies":["category","post_tag"],"rest_base":"posts","_links":{"collection":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/types"}],"wp:items":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/posts"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}},"page":{"description":"","hierarchical":true,"name":"Pages","slug":"page","taxonomies":[],"rest_base":"pages","_links":{"collection":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/types"}],"wp:items":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/pages"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}},"attachment":{"description":"","hierarchical":false,"name":"Media","slug":"attachment","taxonomies":[],"rest_base":"media","_links":{"collection":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/types"}],"wp:items":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/media"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}};
@@ -49 +49 @@
 mockedApiResponse.CategoryModel = {"id":1,"count":1,"description":"","link":"http:\/\/example.org\/?cat=1","name":"Uncategorized","slug":"uncategorized","taxonomy":"category","parent":0,"meta":[]};
 
-mockedApiResponse.TagsCollection = [{"id":685,"count":0,"description":"Term description 6210","link":"http:\/\/example.org\/?tag=test","name":"test","slug":"test","taxonomy":"post_tag","meta":[],"_links":{"self":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/tags\/685"}],"collection":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/tags"}],"about":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/taxonomies\/post_tag"}],"wp:post_type":[{"href":"http:\/\/example.org\/?rest_route=%2Fwp%2Fv2%2Fposts&tags=685"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}];
+mockedApiResponse.TagsCollection = [{"id":"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}];
 
-mockedApiResponse.TagModel = {"id":685,"count":0,"description":"Term description 6210","link":"http:\/\/example.org\/?tag=test","name":"test","slug":"test","taxonomy":"post_tag","meta":[]};
+mockedApiResponse.TagModel = {"id":","link":"http:\/\/example.org\/?tag=test","name":"test","slug":"test","taxonomy":"post_tag","meta":[]};
 
-mockedApiResponse.UsersCollection = [{"id":1,"name":"admin","url":"","description":"","link":"http:\/\/example.org\/?author=1","slug":"admin","avatar_urls":{"24":"http:\/\/0.gravatar.com\/avatar\/96614ec98aa0c0d2ee75796dced6df54?s=24&d=mm&r=g","48":"http:\/\/0.gravatar.com\/avatar\/96614ec98aa0c0d2ee75796dced6df54?s=48&d=mm&r=g","96":"http:\/\/0.gravatar.com\/avatar\/96614ec98aa0c0d2ee75796dced6df54?s=96&d=mm&r=g"},"meta":[],"_links":{"self":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/users\/1"}],"collection":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/users"}]}},{"id":354,"name":"User 6207","url":"","description":"","link":"http:\/\/example.org\/?author=354","slug":"user-6207","avatar_urls":{"24":"http:\/\/0.gravatar.com\/avatar\/3d42d2573c72bce413cf299f434ccf19?s=24&d=mm&r=g","48":"http:\/\/0.gravatar.com\/avatar\/3d42d2573c72bce413cf299f434ccf19?s=48&d=mm&r=g","96":"http:\/\/0.gravatar.com\/avatar\/3d42d2573c72bce413cf299f434ccf19?s=96&d=mm&r=g"},"meta":[],"_links":{"self":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/users\/354"}],"collection":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/users"}]}}];
+mockedApiResponse.UsersCollection = [{"id":1,"name":"admin","url":"","description":"","link":"http:\/\/example.org\/?author=1","slug":"admin","avatar_urls":{"24":"http:\/\/0.gravatar.com\/avatar\/96614ec98aa0c0d2ee75796dced6df54?s=24&d=mm&r=g","48":"http:\/\/0.gravatar.com\/avatar\/96614ec98aa0c0d2ee75796dced6df54?s=48&d=mm&r=g","96":"http:\/\/0.gravatar.com\/avatar\/96614ec98aa0c0d2ee75796dced6df54?s=96&d=mm&r=g"},"meta":[],"_links":{"self":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/users\/1"}],"collection":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/users"}]}},{"id":"}],"collection":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/users"}]}}];
 
 mockedApiResponse.UserModel = {"id":1,"name":"admin","url":"","description":"","link":"http:\/\/example.org\/?author=1","slug":"admin","avatar_urls":{"24":"http:\/\/0.gravatar.com\/avatar\/96614ec98aa0c0d2ee75796dced6df54?s=24&d=mm&r=g","48":"http:\/\/0.gravatar.com\/avatar\/96614ec98aa0c0d2ee75796dced6df54?s=48&d=mm&r=g","96":"http:\/\/0.gravatar.com\/avatar\/96614ec98aa0c0d2ee75796dced6df54?s=96&d=mm&r=g"},"meta":[]};
 
-mockedApiResponse.me = {"id":354,"name":"User 6207","url":"","description":"","link":"http:\/\/example.org\/?author=354","slug":"user-6207","avatar_urls":{"24":"http:\/\/0.gravatar.com\/avatar\/3d42d2573c72bce413cf299f434ccf19?s=24&d=mm&r=g","48":"http:\/\/0.gravatar.com\/avatar\/3d42d2573c72bce413cf299f434ccf19?s=48&d=mm&r=g","96":"http:\/\/0.gravatar.com\/avatar\/3d42d2573c72bce413cf299f434ccf19?s=96&d=mm&r=g"},"meta":[]};
+mockedApiResponse.me = {"id":?s=96&d=mm&r=g"},"meta":[]};
 
-mockedApiResponse.CommentsCollection = [{"id":1103,"post":1368,"parent":0,"author":0,"author_name":"Commenter 6211","author_url":"http:\/\/example.com\/6211\/","date":"2017-02-14T04:05:35","date_gmt":"2017-02-14T04:05:35","content":{"rendered":"<p>This is a comment<\/p>\n"},"link":"http:\/\/example.org\/?p=1368#comment-1103","status":"approved","type":"comment","author_avatar_urls":{"24":"http:\/\/1.gravatar.com\/avatar\/?s=24&d=mm&r=g","48":"http:\/\/0.gravatar.com\/avatar\/?s=48&d=mm&r=g","96":"http:\/\/1.gravatar.com\/avatar\/?s=96&d=mm&r=g"},"meta":[],"_links":{"self":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/comments\/1103"}],"collection":[{"href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/comments"}],"up":[{"embeddable":true,"post_type":"post","href":"http:\/\/example.org\/?rest_route=\/wp\/v2\/posts\/1368"}]}}];
+mockedApiResponse.CommentsCollection = [{"id":"}]}}];
 
 mockedApiResponse.CommentModel = {"code":"rest_comment_invalid_id","message":"Invalid comment ID.","data":{"status":404}};