Changeset 2780

Timestamp:

03/22/2016 07:37:41 PM (8 years ago)

Author:

coffee2code

Message:

developer.wordpress.org: Remove duplicate autocomplete items and add focus back to searchfield after clicking autocomplete item.

Props keesiemeijer.
Fixes #542.

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer

Files:

• inc/autocomplete.php (modified) (3 diffs)
• js/autocomplete.js (modified) (4 diffs)
• js/awesomplete.min.js (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/autocomplete.php

@@ -66 +66 @@
         check_ajax_referer( 'autocomplete_nonce', 'nonce' );
 
+        $parser_post_types = DevHub\get_parsed_post_types();
+        $defaults          = array(
+            's'         => '',
+            'post_type' => $parser_post_types,
+            'posts'     => array(),
+        );
+
         if ( !( isset( $_POST['data'] ) && $_POST['data'] ) ) {
-            wp_send_json_error();
+            wp_send_json_error( $defaults );
         }
 
         // Parse the search form fields.
         wp_parse_str( $_POST['data'], $form_data );
+        $form_data = array_merge( $defaults, $form_data );
 
-        if ( !isset( $form_data['post_type'] ) || !isset( $form_data['s'] ) ) {
-            wp_send_json_error();
+        // No search query.
+        if ( empty( $form_data['s'] ) ) {
+            wp_send_json_error( $defaults );
         }
 
-        $post_types        = array();
-        $parser_post_types = DevHub\get_parsed_post_types();
-
-        foreach ( $form_data['post_type'] as $post_type ) {
-            if ( in_array( $post_type , $parser_post_types ) ) {
-                $post_types[] = $post_type;
+        foreach ( $form_data['post_type'] as $key => $post_type ) {
+            if ( !in_array( $post_type , $parser_post_types ) ) {
+                unset( $form_data['post_type'][ $key ] );
             }
         }
+
+        $post_types = !empty( $form_data['post_type'] ) ? $form_data['post_type'] : $parser_post_types;
 
         $args = array(
@@ -97 +105 @@
         $search = get_posts( $args );
 
-        $form_data['posts'] = array();
         if ( !empty( $search ) ) {
-            $form_data['posts'] = wp_list_pluck( $search, 'post_title' );
+            $titles = wp_list_pluck( $search, 'post_title' );
+            $form_data['posts'] = array_values( array_unique( $titles ) );
         }
 
@@ -105 +113 @@
     }
 
-
 }
 

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/js/autocomplete.js

@@ -19 +19 @@
     var awesome = new Awesomplete( searchfield.get( 0 ), {
         maxItems: 9999,
+        minChars: 3,
         filter: function( text, input ) {
             // Filter autocomplete matches
@@ -57 +58 @@
 
             return false;
-        }
+        },
     } );
 
@@ -66 +67 @@
         //     if there are more than 2 characters
         //     and it's not already processing an Ajax request
-        if ( !processing && $( this ).val().length > 2 ) {
+        if ( !processing && $( this ).val().trim().length > 2 ) {
             search = $( this ).val();
             autocomplete_update();
@@ -93 +94 @@
                 }
 
-                if ( typeof response.data.posts === 'undefined' ) {
+                if ( typeof response.data === 'undefined' ) {
                     return false;
                 }

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/js/awesomplete.min.js

@@ -3 +3 @@
 "off");this.input.setAttribute("aria-autocomplete","list");b=b||{};m.call(this,{minChars:2,maxItems:10,autoFirst:!1,filter:f.FILTER_CONTAINS,sort:f.SORT_BYLENGTH,item:function(a,b){var c=""===b?a:a.replace(RegExp(d.regExpEscape(b.trim()),"gi"),"<mark>$&</mark>");return d.create("li",{innerHTML:c,"aria-selected":"false"})},replace:function(a){this.input.value=a}},b);this.index=-1;this.container=d.create("div",{className:"awesomplete",around:a});this.ul=d.create("ul",{hidden:"hidden",inside:this.container});
 this.status=d.create("span",{className:"visually-hidden",role:"status","aria-live":"assertive","aria-relevant":"additions",inside:this.container});d.bind(this.input,{input:this.evaluate.bind(this),blur:this.close.bind(this),keydown:function(a){var b=a.keyCode;if(c.opened)if(13===b&&c.selected)a.preventDefault(),c.select();else if(27===b)c.close();else if(38===b||40===b)a.preventDefault(),c[38===b?"previous":"next"]()}});d.bind(this.input.form,{submit:this.close.bind(this)});d.bind(this.ul,{mousedown:function(a){var b=
-a.target;if(b!==this){for(;b&&!/li/i.test(b.nodeName);)b=b.parentNode;b&&0===a.button&&c.select(b,a)}}});this.input.hasAttribute("list")?(this.list="#"+this.input.getAttribute("list"),this.input.removeAttribute("list")):this.list=this.input.getAttribute("data-list")||b.list||[];f.all.push(this)};f.prototype={set list(a){Array.isArray(a)?this._list=a:"string"===typeof a&&-1<a.indexOf(",")?this._list=a.split(/\s*,\s*/):(a=d(a))&&a.children&&(this._list=k.apply(a.children).map(function(a){return a.textContent.trim()}));
+a.target;if(b!==this){for(;b&&!/li/i.test(b.nodeName);)b=b.parentNode;b&&0===a.button&&(a.preventDefault(),c.select(b,a))}}});this.input.hasAttribute("list")?(this.list="#"+this.input.getAttribute("list"),this.input.removeAttribute("list")):this.list=this.input.getAttribute("data-list")||b.list||[];f.all.push(this)};f.prototype={set list(a){Array.isArray(a)?this._list=a:"string"===typeof a&&-1<a.indexOf(",")?this._list=a.split(/\s*,\s*/):(a=d(a))&&a.children&&(this._list=k.apply(a.children).map(function(a){return a.textContent.trim()}));
 document.activeElement===this.input&&this.evaluate()},get selected(){return-1<this.index},get opened(){return this.ul&&null==this.ul.getAttribute("hidden")},close:function(){this.ul.setAttribute("hidden","");this.index=-1;d.fire(this.input,"awesomplete-close")},open:function(){this.ul.removeAttribute("hidden");this.autoFirst&&-1===this.index&&this["goto"](0);d.fire(this.input,"awesomplete-open")},next:function(){this["goto"](this.index<this.ul.children.length-1?this.index+1:-1)},previous:function(){var a=
 this.ul.children.length;this["goto"](this.selected?this.index-1:a-1)},"goto":function(a){var b=this.ul.children;this.selected&&b[this.index].setAttribute("aria-selected","false");this.index=a;-1<a&&0<b.length&&(b[a].setAttribute("aria-selected","true"),this.status.textContent=b[a].textContent);d.fire(this.input,"awesomplete-highlight")},select:function(a,b){if(a=a||this.ul.children[this.index]){var c;d.fire(this.input,"awesomplete-select",{text:a.textContent,preventDefault:function(){c=!0},originalEvent:b});