Changeset 5048

Timestamp:

03/02/2017 09:16:02 PM (10 years ago)

Author:

ocean90

Message:

Rosetta Roles: Don't use the escaped search term for calculating the match score.

Fixes #2540.

Location:

sites/trunk/global.wordpress.org/public_html/wp-content/mu-plugins/roles

Files:

• js/rosetta-roles.js (modified) (3 diffs)
• rosetta-roles.php (modified) (1 diff)

sites/trunk/global.wordpress.org/public_html/wp-content/mu-plugins/roles/js/rosetta-roles.js

@@ -187 +187 @@
                 // @uses RegExp
                 search: function( term ) {
-                        var match, results;
+                        var match, results, escapedTerm;
 
                         // Start with a full collection
@@ -193 +193 @@
 
                         // Escape the term string for RegExp meta characters
-                        term = term.replace( /[-\/\\^$*+?.()|[\]{}]/g, '\\$&' );
+                        escapedTerm = term.replace( /[-\/\\^$*+?.()|[\]{}]/g, '\\$&' );
 
                         // Consider spaces as word delimiters and match the whole string
                         // so matching terms can be combined
-                        term = term.replace( / /g, ')(?=.*' );
-                        match = new RegExp( '^(?=.*' + term + ').+', 'i' );
+                        escapedTerm = escapedTerm.replace( / /g, ')(?=.*' );
+                        match = new RegExp( '^(?=.*' + escapedTerm + ').+', 'i' );
 
                         results = this.filter( function( project ) {
@@ -204 +204 @@
                                 if ( match.test( haystack ) ) {
                                         _.each( haystack, function( word ) {
-                                                var score = word.score( term );
+                                                var score = word.score( term, .5 );
                                                 project.set( 'matchScore', Math.max( score, project.get( 'matchScore' ) ) );
                                         });

sites/trunk/global.wordpress.org/public_html/wp-content/mu-plugins/roles/rosetta-roles.php

@@ -109 +109 @@
         public static function enqueue_scripts() {
                 wp_enqueue_script( 'string_score', plugins_url( '/js/string_score.min.js', __FILE__ ), array(), '0.1.22', true );
-                wp_enqueue_script( 'rosetta-roles', plugins_url( '/js/rosetta-roles.js', __FILE__ ), array( 'jquery', 'wp-backbone', 'string_score' ), '10', true );
+                wp_enqueue_script( 'rosetta-roles', plugins_url( '/js/rosetta-roles.js', __FILE__ ), array( 'jquery', 'wp-backbone', 'string_score' ), '11', true );
         }