extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 00:13:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

handle multiple comma-separated category-ids in class attribute of row and do not match numbers inside class-names

Browse Source
This commit is contained in:
Ralf Becker 2013-02-05 14:15:46 +00:00
parent 8fafb1414a
commit 50c8dd1c07
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
etemplate/js/et2_extension_nextmatch_rowProvider.js
View File

@ -439,18 +439,10 @@ var et2_nextmatch_rowProvider = Class.extend({
var category_location = _data["class"].match(/(cat(_id|egory)?)/);
if(category_location) category_location = category_location[0];
// Get actual category
cats = classes.match(/(cat_)?([0-9]+)/);
if(cats == null)
{
cats = '';
}
else
{
var invalid = typeof cats[1] == 'undefined';
if(invalid) this._rootWidget.egw().debug("warn", "Invalid class '%s', prefixed with 'cat_'",cats[0]);
cats = [cats[2]];
}
// 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);
if (!cats) cats = [];
classes = classes.replace(/(^| |,|cat_)?([0-9]+)( |,|$)/g, '');
// Get category info
if(!this.categories)
@ -467,21 +459,20 @@ var et2_nextmatch_rowProvider = Class.extend({
for(var i = 0; i < cats.length; i++)
{
// Need cat_, classes can't start with a number
var cat_class = 'cat_'+cats[i];
var cat_id = cats[i];
cat_id = cat_id.replace(/[^0-9]/, '');
var cat_class = 'cat_'+cat_id;
// Check for existing class
// TODO
// Create class
if(this.categories)
if(this.categories && this.categories[cat_id] && this.categories[cat_id].color)
{
if(this.categories[cats[i]] && this.categories[cats[i]].color)
{
var cat = this.categories[cats[i]];
this._rootWidget.egw().css('.'+cat_class, "background-color: " + cat.color + ";");
}
var cat = this.categories[cat_id];
this._rootWidget.egw().css('.'+cat_class, "background-color: " + cat.color + ";");
classes += ' '+cat_class;
}
if(invalid) classes = classes.replace(cats[i], cat_class);
}
classes += " row_category";
}