holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix category check matching numbers inside other class names

Browse Source
This commit is contained in:
Nathan Gray 2013-03-25 17:17:11 +00:00
parent 8b6e1d92da
commit c5d2b8dc23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etemplate/js/et2_extension_nextmatch_rowProvider.js
View File

@ -461,9 +461,9 @@ var et2_nextmatch_rowProvider = Class.extend({
if(category_location) category_location = category_location[0]; if(category_location) category_location = category_location[0];
// Get actual categories, eg. "cat_15" or "123,456,789", make sure to not match numbers inside other class-names // Get actual categories, eg. "cat_15" or "123,456,789", make sure to not match numbers inside other class-names
cats = classes.match(/(^| |,|cat_)?([0-9]+)( |,|$)/g); cats = classes.match(/(^| |,|cat_)([0-9]+)( |,|$)/g);
if (!cats) cats = []; if (!cats) cats = [];
classes = classes.replace(/(^| |,|cat_)?([0-9]+)( |,|$)/g, ''); classes = classes.replace(/(^| |,|cat_)([0-9]+)( |,|$)/g, '');
// Get category info // Get category info
if(!this.categories) if(!this.categories)
@ -481,7 +481,7 @@ var et2_nextmatch_rowProvider = Class.extend({
{ {
// Need cat_, classes can't start with a number // Need cat_, classes can't start with a number
var cat_id = cats[i]; var cat_id = cats[i];
cat_id = cat_id.replace(/[^0-9]/, ''); cat_id = cat_id.replace(/[^0-9]/g, '');
var cat_class = 'cat_'+cat_id; var cat_class = 'cat_'+cat_id;
// Check for existing class // Check for existing class