feat(search): non greedy regexp match

lubber-de · Dec 14, 2023 · e601bc8 · e601bc8
1 parent 35fe604
commit e601bc8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/definitions/modules/dropdown.js b/src/definitions/modules/dropdown.js
@@ -949,7 +949,7 @@
                             var querySplit = query.split(''),
                                 diacriticReg = settings.ignoreDiacritics ? '[\u0300-\u036F]?' : '',
                                 htmlReg = '(?![^<]*>)',
-                                markedRegExp = new RegExp(htmlReg + '(' + querySplit.join(diacriticReg + ')(.*)' + htmlReg +'(') + diacriticReg + ')', regExpIgnore),
+                                markedRegExp = new RegExp(htmlReg + '(' + querySplit.join(diacriticReg + ')(.*?)' + htmlReg +'(') + diacriticReg + ')', regExpIgnore),
                                 markedReplacer = function(){
                                     var args = [].slice.call(arguments,1, querySplit.length * 2).map(function(x, i){
                                         return i & 1 ? x : '<mark>' + x + '</mark>'})

diff --git a/src/definitions/modules/search.js b/src/definitions/modules/search.js
@@ -1100,7 +1100,7 @@
                                 querySplit = module.get.value().split(''),
                                 diacriticReg = settings.ignoreDiacritics ? '[\u0300-\u036F]?' : '',
                                 htmlReg = '(?![^<]*>)',
-                                markedRegExp = new RegExp(htmlReg + '(' + querySplit.join(diacriticReg + ')(.*)' + htmlReg +'(') + diacriticReg + ')', regExpIgnore),
+                                markedRegExp = new RegExp(htmlReg + '(' + querySplit.join(diacriticReg + ')(.*?)' + htmlReg +'(') + diacriticReg + ')', regExpIgnore),
                                 markedReplacer = function(){
                                     var args = [].slice.call(arguments,1, querySplit.length * 2).map(function(x, i){
                                         return i & 1 ? x : '<mark>' + x + '</mark>'})