Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
jio_mebibou
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Alexandra Rogova
jio_mebibou
Commits
1d416fef
Commit
1d416fef
authored
Jun 11, 2013
by
Tristan Cavelier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
queries: tool moved to static method
parent
bc1e8a99
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
14 deletions
+24
-14
src/queries/query.js
src/queries/query.js
+18
-2
src/queries/tool.js
src/queries/tool.js
+6
-12
No files found.
src/queries/query.js
View file @
1d416fef
/*jslint indent: 2, maxlen: 80, sloppy: true, nomen: true */
/*jslint indent: 2, maxlen: 80, sloppy: true, nomen: true */
/*global newClass: true, sortFunction: true, parseStringToObject: true,
/*global newClass: true, sortFunction: true, parseStringToObject: true,
_export: true */
_export: true
, stringEscapeRegexpCharacters: true
*/
/**
/**
* The query to use to filter a list of objects.
* The query to use to filter a list of objects.
...
@@ -141,7 +141,23 @@ var Query = newClass(function (spec) {
...
@@ -141,7 +141,23 @@ var Query = newClass(function (spec) {
* @param {String} string The string to parse
* @param {String} string The string to parse
* @return {Object} The json query tree
* @return {Object} The json query tree
*/
*/
"
parseStringToObject
"
:
parseStringToObject
"
parseStringToObject
"
:
parseStringToObject
,
/**
* Convert a search text to a regexp.
*
* @method convertStringToRegExp
* @static
* @param {String} string The string to convert
* @param {String} [wildcard_character=undefined] The wildcard chararter
* @return {RegExp} The search text regexp
*/
"
convertStringToRegExp
"
:
function
(
string
,
wildcard_character
)
{
return
new
RegExp
(
"
^
"
+
stringEscapeRegexpCharacters
(
string
).
replace
(
stringEscapeRegexpCharacters
(
wildcard_character
),
'
.*
'
)
+
"
$
"
);
}
}});
}});
_export
(
"
Query
"
,
Query
);
_export
(
"
Query
"
,
Query
);
src/queries/tool.js
View file @
1d416fef
...
@@ -109,21 +109,15 @@ function stringEscapeRegexpCharacters(string) {
...
@@ -109,21 +109,15 @@ function stringEscapeRegexpCharacters(string) {
}
}
}
}
_export
(
"
stringEscapeRegexpCharacters
"
,
stringEscapeRegexpCharacters
);
/**
/**
*
Convert a search text to a regexp.
*
A sort function to sort items by key
*
*
* @param {String}
string The string to convert
* @param {String}
key The key to sort on
* @param {String} [w
ildcard_character=undefined] The wildcard chararter
* @param {String} [w
ay="ascending"] 'ascending' or 'descending'
* @return {
RegExp} The search text regexp
* @return {
Function} The sort function
*/
*/
function
convertSearchTextToRegExp
(
string
,
wildcard_character
)
{
return
new
RegExp
(
"
^
"
+
stringEscapeRegexpCharacters
(
string
).
replace
(
stringEscapeRegexpCharacters
(
wildcard_character
),
'
.*
'
)
+
"
$
"
);
}
// XXX
function
sortFunction
(
key
,
way
)
{
function
sortFunction
(
key
,
way
)
{
if
(
way
===
'
descending
'
)
{
if
(
way
===
'
descending
'
)
{
return
function
(
a
,
b
)
{
return
function
(
a
,
b
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment