Commit db980db3 authored by CardBook's avatar CardBook

version 34.9

parent 3a6a1c4c
......@@ -128,7 +128,7 @@ if ("undefined" == typeof(cardbookAutocomplete)) {
var color = cardbookRepository.cardbookCategoryColors[category];
var oppositeColor = cardbookRepository.getTextColorFromBackgroundColor(color);
for (type of cardbookRepository.getABIconType("ALL")) {
var myStyle = type + "_color_category_" + category;
var myStyle = type + "_color_category_" + category.replace(/ /g, "_");
if (Services.vc.compare(Services.appinfo.version, "60") >= 0) {
if (useColor == "text" && autocompleteWithColor) {
cardbookAutocomplete.createCssMsgAccountRules60(styleSheet, myStyle, color, OSName, "color");
......@@ -142,7 +142,7 @@ if ("undefined" == typeof(cardbookAutocomplete)) {
cardbookAutocomplete.createCssMsgAccountSelectedRules60(styleSheet, myStyle, "HighlightText", OSName, "color");
}
} else {
var myFocusedStyle = type + "_color_category_" + category + ", selected";
var myFocusedStyle = type + "_color_category_" + category.replace(/ /g, "_") + ", selected";
if (useColor == "text" && autocompleteWithColor) {
cardbookAutocomplete.createCssMsgAccountRules(styleSheet, myStyle, color, OSName, "-moz-tree-cell-text", "color");
cardbookAutocomplete.createCssMsgAccountRules(styleSheet, myStyle, oppositeColor, OSName, "-moz-tree-cell", "background-color");
......
......@@ -38,7 +38,7 @@ if ("undefined" == typeof(cardbookDirTree)) {
getCellProperties: function(idx, column) {
if (column.id == "accountColor" && this.visibleData[idx][6] != "SEARCH") {
if (this.visibleData[idx][6] == "CAT") {
return "color_category_" + this.visibleData[idx][0];
return "color_category_" + this.visibleData[idx][0].replace(/ /g, "_");
} else {
return "color_" + this.visibleData[idx][4];
}
......
......@@ -44,7 +44,7 @@ if ("undefined" == typeof(cardbookElementTools)) {
if (category in cardbookRepository.cardbookCategoryColors && useColor != "nothing") {
aLabel.setAttribute('class', 'tagvalue cardbookCategoryClass');
}
aLabel.setAttribute('type', 'category_' + category);
aLabel.setAttribute('type', 'category_' + category.replace(/ /g, "_"));
}
},
......
......@@ -202,13 +202,13 @@ if ("undefined" == typeof(wdw_cardbook)) {
myStyle = "color_" + aCardList[row].dirPrefId;
for (var category in cardbookRepository.cardbookCategoryColors) {
if (aCardList[row].categories.includes(category)) {
myStyle = "color_category_" + category;
myStyle = "color_category_" + category.replace(/ /g, "_");
break;
}
}
} else {
if (cardbookRepository.cardbookCategoryColors[cardbookRepository.cardbookUncategorizedCards]) {
myStyle = "color_category_" + cardbookRepository.cardbookUncategorizedCards;
myStyle = "color_category_" + cardbookRepository.cardbookUncategorizedCards.replace(/ /g, "_");
} else {
myStyle = "color_" + aCardList[row].dirPrefId;
}
......@@ -2119,9 +2119,9 @@ if ("undefined" == typeof(wdw_cardbook)) {
}
for (category in cardbookRepository.cardbookCategoryColors) {
var color = cardbookRepository.cardbookCategoryColors[category];
cardbookRepository.createCssAccountRules(styleSheet, 'category_' + category, color);
cardbookRepository.createCssCategoryRules(styleSheet, 'category_' + category, color);
cardbookRepository.createCssCardRules(styleSheet, 'category_' + category, color);
cardbookRepository.createCssAccountRules(styleSheet, 'category_' + category.replace(/ /g, "_"), color);
cardbookRepository.createCssCategoryRules(styleSheet, 'category_' + category.replace(/ /g, "_"), color);
cardbookRepository.createCssCardRules(styleSheet, 'category_' + category.replace(/ /g, "_"), color);
}
cardbookRepository.reloadCss(styleSheet.href);
}
......
......@@ -386,13 +386,13 @@ cardbookAutocompleteSearch.prototype = {
myStyle = myType + "_color_" + myDirPrefId;
for (var category in cardbookRepository.cardbookCategoryColors) {
if (myCard.categories.includes(category)) {
myStyle = myType + "_color_category_" + category;
myStyle = myType + "_color_category_" + category.replace(/ /g, "_");
break;
}
}
} else {
if (cardbookRepository.cardbookCategoryColors[cardbookRepository.cardbookUncategorizedCards]) {
myStyle = myType + "_color_category_" + cardbookRepository.cardbookUncategorizedCards;
myStyle = myType + "_color_category_" + cardbookRepository.cardbookUncategorizedCards.replace(/ /g, "_");
} else {
myStyle = myType + "_color_" + myDirPrefId;
}
......@@ -472,7 +472,7 @@ cardbookAutocompleteSearch.prototype = {
}
}
if (cardbookRepository.cardbookCategoryColors[myCategory]) {
var myStyle = myType + "_color_category_" + myCategory;
var myStyle = myType + "_color_category_" + myCategory.replace(/ /g, "_");
} else {
var myStyle = myType + "_color_" + myDirPrefId;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment