Skip to content

Commit

Permalink
fix #459 #426 #466 #464 #462 remove extra info
Browse files Browse the repository at this point in the history
  • Loading branch information
@bavincen
bavincen committed Apr 26, 2016
1 parent 1d4b8b4 commit d9f170f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 134 deletions.
110 changes: 3 additions & 107 deletions chrome/content/calendar-event-dialog.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,112 +279,8 @@ exchWebService.eventDialog = {
onLoad: function _onLoad() {
if (this._initialized) return;

exchWebService.eventDialog.updateAttendees();
},


updateAttendees: function _updateAttendees() {
// let attendeeRow = document.getElementById("event-grid-attendee-row");
// attendeeRow.setAttribute('collapsed', 'true');
// let attendeeRow2 = document.getElementById("event-grid-attendee-row-2");
let optAttendeeRow = document.getElementById("event-grid-attendee-row-4");
let reqAttendeeRow = document.getElementById("event-grid-attendee-row-3");
if (window.attendees && window.attendees.length > 0) {
if (isEvent(window.calendarItem)) { // sending email invitations currently only supported for events
// attendeeRow2.removeAttribute('collapsed');
} else {
// attendeeRow2.setAttribute('collapsed', 'true');
}

let attendeeNames = [];
let attendeeEmails = [];
let reqAttendeeNames = [];
let reqAttendeeEmails = [];
let optAttendeeNames = [];
let optAttendeeEmails = [];
let numAttendees = window.attendees.length;
let emailRE = new RegExp("^mailto:(.*)", "i");
for (let i = 0; i < numAttendees; i++) {
let attendee = window.attendees[i];
let name = attendee.commonName;
if (attendee.role == "OPT-PARTICIPANT") {
if (name && name.length) {
optAttendeeNames.push(name);
let email = attendee.id;
if (email && email.length) {
if (emailRE.test(email)) {
name += ' <' + RegExp.$1 + '>';
} else {
name += ' <' + email + '>';
}
optAttendeeEmails.push(name);
}
} else if (attendee.id && attendee.id.length) {
let email = attendee.id;
if (emailRE.test(email)) {
optAttendeeNames.push(RegExp.$1);
} else {
optAttendeeNames.push(email);
}
} else {
continue;
}

} else {

if (name && name.length) {
reqAttendeeNames.push(name);
let email = attendee.id;
if (email && email.length) {
if (emailRE.test(email)) {
name += ' <' + RegExp.$1 + '>';
} else {
name += ' <' + email + '>';
}
reqAttendeeEmails.push(name);
}
} else if (attendee.id && attendee.id.length) {
let email = attendee.id;
if (emailRE.test(email)) {
reqAttendeeNames.push(RegExp.$1);
} else {
reqAttendeeNames.push(email);
}
} else {
continue;
}

}
}
if (reqAttendeeNames.length > 0) {
reqAttendeeRow.removeAttribute('collapsed');
} else {
reqAttendeeRow.setAttribute('collapsed', 'true');
}
if (optAttendeeNames.length > 0) {
optAttendeeRow.removeAttribute('collapsed');
} else {
optAttendeeRow.setAttribute('collapsed', 'true');
}

let attendeeList = document.getElementById("attendee-list");
let reqAttendeeList = document.getElementById("req-attendee-list-3");
let optAttendeeList = document.getElementById("opt-attendee-list-4");

let callback = function func() {
reqAttendeeList.setAttribute('value', reqAttendeeNames.join(', '));
reqAttendeeList.setAttribute('tooltiptext', reqAttendeeEmails.join(', '));
optAttendeeList.setAttribute('value', optAttendeeNames.join(', '));
optAttendeeList.setAttribute('tooltiptext', optAttendeeEmails.join(', '));
};
setTimeout(callback, 1);
} else {

// attendeeRow2.setAttribute('collapsed', 'true');
optAttendeeRow.setAttribute('collapsed', 'true');
reqAttendeeRow.setAttribute('collapsed', 'true');
}
},
// exchWebService.eventDialog.updateAttendees();
},

editAttendees: function _editAttendees() {
let savedWindow = window;
Expand Down Expand Up @@ -426,7 +322,7 @@ exchWebService.eventDialog = {
gStartTime = startTime.getInTimezone(kDefaultTimezone);
gEndTime = endTime.getInTimezone(kDefaultTimezone);
gItemDuration = duration;
exchWebService.eventDialog.updateAttendees();
// exchWebService.eventDialog.updateAttendees();
updateDateTime();
updateAllDay();
if (isAllDay != gStartTime.isDate) {
Expand Down
28 changes: 1 addition & 27 deletions chrome/content/calendar-event-dialog.xul
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,33 +142,7 @@
flex="1"
insertafter="item-description"
disable-on-readonly="true"/>
</tabpanel>
<tabpanel id="event-grid-tabpanel-attendees">
<vbox flex="1">
<hbox pack="start" id="event-grid-attendee-row-3" insertbefore = "notify-options">
<label value="Required Attendees (I):"
accesskey="&event.attendees.accesskey;"
control="attendee-list"
disable-on-readonly="true"/>
<label id="req-attendee-list-3"
class="text-link"
crop="right"
tooltiptext=""
onclick="showAttendeePopup(event)"/>
</hbox>
<hbox pack="start" id="event-grid-attendee-row-4" insertbefore = "notify-options">
<label value="Optional Attendees (I):"
accesskey="&event.attendees.accesskey;"
control="attendee-list"
disable-on-readonly="true"/>
<label id="opt-attendee-list-4"
class="text-link"
crop="right"
tooltiptext=""
onclick="showAttendeePopup(event)"/>
</hbox>
</vbox>
</tabpanel>
</tabpanel>
</tabpanels>
</tabbox>
</overlay>

0 comments on commit d9f170f

Please sign in to comment.