← Back to branch summary

~ubuntu-branches/ubuntu/quantal/lightning-extension/quantal-security

« back to all changes in this revision

Viewing changes to calendar/providers/storage/calStorageCalendar.js

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2012-05-21 16:09:39 UTC
  • mfrom: (1.3.1) (25.1.1 precise-security)
  • Revision ID: package-import@ubuntu.com-20120521160939-0702473a46xfq3tl
Tags: 1.5~b2+build1-0ubuntu1
New upstream release from the beta channel (CALENDAR_1_5b2_BUILD1)

Show diffs side-by-side

added added

removed removed

Lines of Context:
calendar/providers/storage/calStorageCalendar.js
1763
1763
                            }
1764
1764
                        } else {
1765
1765
                            if (row.end_date) {
1766
 
                                ritem.untilDate = newDateTime(row.end_date, "UTC");
 
1766
                                let dtstart = item.startDate || item.entryDate;
 
1767
                                let allday = dtstart.isDate && dtstart.timezone == "floating";
 
1768
                                let untilDate = newDateTime(row.end_date, allday ? "" : "UTC");
 
1769
                                if (allday) {
 
1770
                                    untilDate.isDate = true;
 
1771
                                }
 
1772
                                ritem.untilDate = untilDate;
1767
1773
                            } else {
1768
1774
                                ritem.untilDate = null;
1769
1775
                            }