Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Micro-optimize search #482

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Micro-optimize search #482

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a15e241
Fix references to mocha css and js on test page
trotzig Jan 13, 2017
0f27cb7
Memoize regex pattern in search.js
trotzig Jan 13, 2017
5227a8f
Use memoized RegExp when searching
trotzig Jan 13, 2017
fe31757
Move case-ignoring to RegExp
trotzig Jan 13, 2017
4368a6b
Use RegExp.test instead of String.search when matching
trotzig Jan 13, 2017
a0e12ab
Make templater.clear a bit faster
trotzig Jan 14, 2017
098175b
Use document fragment to speed up list.update()
trotzig Jan 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions dist/list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,11 +430,13 @@ module.exports = function(list) {
};

},{"./item":4}],6:[function(require,module,exports){
var REGEX_CHARACTERS_PATTERN = /[-[\]{}()*+?.,\\^$|#]/g;

module.exports = function(list) {
var item,
text,
columns,
searchString,
searchPattern,
customSearch;

var prepare = {
Expand Down Expand Up @@ -462,10 +464,14 @@ module.exports = function(list) {
columns = (list.searchColumns === undefined) ? prepare.toArray(list.items[0].values()) : list.searchColumns;
}
},
setSearchString: function(s) {
setSearchPattern: function(s) {
s = list.utils.toString(s).toLowerCase();
s = s.replace(/[-[\]{}()*+?.,\\^$|#]/g, "\\$&"); // Escape regular expression characters
searchString = s;
if (s === "") {
searchPattern = undefined;
return;
}
s = s.replace(REGEX_CHARACTERS_PATTERN, "\\$&"); // Escape regular expression characters
searchPattern = new RegExp(s);
},
toArray: function(values) {
var tmpColumn = [];
Expand Down Expand Up @@ -493,7 +499,7 @@ module.exports = function(list) {
values: function(values, column) {
if (values.hasOwnProperty(column)) {
text = list.utils.toString(values[column]).toLowerCase();
if ((searchString !== "") && (text.search(searchString) > -1)) {
if (searchPattern && (text.search(searchPattern) > -1)) {
return true;
}
}
Expand All @@ -509,16 +515,16 @@ module.exports = function(list) {
list.trigger('searchStart');

prepare.resetList();
prepare.setSearchString(str);
prepare.setSearchPattern(str);
prepare.setOptions(arguments); // str, cols|searchFunction, searchFunction
prepare.setColumns();

if (searchString === "" ) {
if (!searchPattern ) {
search.reset();
} else {
list.searched = true;
if (customSearch) {
customSearch(searchString, columns);
customSearch(searchPattern, columns);
} else {
search.list();
}
Expand Down
2 changes: 1 addition & 1 deletion dist/list.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/assets/javascripts/list.min.js
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 14 additions & 8 deletions src/search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
var REGEX_CHARACTERS_PATTERN = /[-[\]{}()*+?.,\\^$|#]/g;

module.exports = function(list) {
var item,
text,
columns,
searchString,
searchPattern,
customSearch;

var prepare = {
Expand Down Expand Up @@ -30,10 +32,14 @@ module.exports = function(list) {
columns = (list.searchColumns === undefined) ? prepare.toArray(list.items[0].values()) : list.searchColumns;
}
},
setSearchString: function(s) {
setSearchPattern: function(s) {
s = list.utils.toString(s).toLowerCase();
s = s.replace(/[-[\]{}()*+?.,\\^$|#]/g, "\\$&"); // Escape regular expression characters
searchString = s;
if (s === "") {
searchPattern = undefined;
return;
}
s = s.replace(REGEX_CHARACTERS_PATTERN, "\\$&"); // Escape regular expression characters
searchPattern = new RegExp(s);
},
toArray: function(values) {
var tmpColumn = [];
Expand Down Expand Up @@ -61,7 +67,7 @@ module.exports = function(list) {
values: function(values, column) {
if (values.hasOwnProperty(column)) {
text = list.utils.toString(values[column]).toLowerCase();
if ((searchString !== "") && (text.search(searchString) > -1)) {
if (searchPattern && (text.search(searchPattern) > -1)) {
return true;
}
}
Expand All @@ -77,16 +83,16 @@ module.exports = function(list) {
list.trigger('searchStart');

prepare.resetList();
prepare.setSearchString(str);
prepare.setSearchPattern(str);
prepare.setOptions(arguments); // str, cols|searchFunction, searchFunction
prepare.setColumns();

if (searchString === "" ) {
if (!searchPattern ) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

searchPattern will never be null:

console.log(new RegExp());
// output: /(?:)/

search.reset();
} else {
list.searched = true;
if (customSearch) {
customSearch(searchString, columns);
customSearch(searchPattern, columns);
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might be a breaking change, depending on how people use the customSearch option.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

searchPattern.source could help.

} else {
search.list();
}
Expand Down
4 changes: 2 additions & 2 deletions test/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<head>
<meta charset="utf-8">
<title>List.js Mocha Tests</title>
<link rel="stylesheet" href="../node_modules/grunt-mocha/node_modules/mocha/mocha.css" />
<link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
<style>
#list,
#parse-list,
Expand All @@ -17,7 +17,7 @@
<script src="../node_modules/jquery/dist/jquery.js"></script>
<script src="../dist/list.js"></script>
<script src="../node_modules/expect.js/index.js"></script>
<script src="../node_modules/grunt-mocha/node_modules/mocha/mocha.js"></script>
<script src="../node_modules/mocha/mocha.js"></script>

<script>
mocha.setup('bdd');
Expand Down