LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix display of category of events 

Fixes #2703
pull/34/head
Francis Lachapelle 2014-04-10 12:25:42 -04:00
parent d200629b01
commit c345fc2b8d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -18,6 +18,7 @@ Bug fixes
- fixed SmartReply/Forward when ReplaceMime was omitted (#2680) - fixed SmartReply/Forward when ReplaceMime was omitted (#2680)
- fixed wrong generation of weekly repetitive events with ActiveSync (#2654) - fixed wrong generation of weekly repetitive events with ActiveSync (#2654)
- fixed incorrect XML data conversion with ActiveSync (#2695) - fixed incorrect XML data conversion with ActiveSync (#2695)
- fixed display of events having a category with HTML entities (#2703)
2.2.3 (2014-04-03) 2.2.3 (2014-04-03)
------------------ ------------------

5
UI/WebServerResources/SchedulerUI.js
View File

@ -1794,10 +1794,11 @@ function newBaseEventDIV(eventRep, event, eventText) {
createElement("img", null, null, {src: ResourcesURL + "/alarm.png"}, null, iconSpan); createElement("img", null, null, {src: ResourcesURL + "/alarm.png"}, null, iconSpan);
if (event[10] != null) { if (event[10] != null) {
var categoryStyle = categoriesStyles.get(event[10]); var category = event[10].decodeEntities();
var categoryStyle = categoriesStyles.get(category);
if (!categoryStyle) { if (!categoryStyle) {
categoryStyle = 'category_' + categoriesStyles.keys().length; categoryStyle = 'category_' + categoriesStyles.keys().length;
categoriesStyles.set([event[10]], categoryStyle); categoriesStyles.set([category], categoryStyle);
} }
innerDiv.addClassName(categoryStyle); innerDiv.addClassName(categoryStyle);
} }