Skip to content
This repository has been archived by the owner on Jul 2, 2024. It is now read-only.

attachment-view.js: update toolbar default items to latest Lightning #12

Closed
wants to merge 2 commits into from
Closed

attachment-view.js: update toolbar default items to latest Lightning #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c127312
attachment-view.js: update toolbar default items to latest Ligthning
Trim Jun 7, 2017
df408da
Fix code formatting
advancingu Jun 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions chrome/content/attachments-view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,32 +239,38 @@ exchAttachments.prototype = {
var args = this._window.arguments[0];
var item = args.calendarEvent;

//this.globalFunctions.LOG(" -- onLoad 2 ("+this.globalFunctions.STACKshort()+")");
this.attachmentListboxVisible = false;

if ((item.calendar) && (item.calendar.type == "exchangecalendar")) {
this.globalFunctions.LOG(" -- It is an Exchange Calendar event:"+item.title);


try {
// Hide Lightning URL button
this._document.getElementById("button-url").hidden = true;
this._document.getElementById("event-toolbar").setAttribute("currentset", "button-save,button-attendees,button-privacy,button-url,exchWebService-add-attachment-button,button-delete");
this._document.getElementById("exchWebService-add-attachment-button").hidden = false;
if(this._document.getElementById("options-attachments-menuitem")){
let eventToolbar = this._document.getElementById("event-toolbar");

// If add url button was enabled, hidde it and show exchangecalendar attachment
this._document.getElementById("button-url").hidden = true;

let currentSet = eventToolbar.getAttribute("currentset");
if (currentSet.indexOf("button-url") === 1
&& currentSet.indexOf("exchWebService-add-attachment-button") === -1) {
currentSet = currentSet + "exchWebService-add-attachment-button";
}

this._document.getElementById("exchWebService-add-attachment-button").hidden = false;

if (this._document.getElementById("options-attachments-menuitem")) {
this._document.getElementById("options-attachments-menuitem").setAttribute("label", this._document.getElementById("exchWebService-add-attachment-button").getAttribute("label"));
this._document.getElementById("options-attachments-menuitem").setAttribute("command", "exchWebService_addAttachmentDialog");
}
}
catch (ex) {this.globalFunctions.LOG(" -- Could not add exchange attachment buttons:"+ex.toString());}

// calendar-event-dialog (hide existing attachment view)
try {
this._document.getElementById("event-grid-attachment-row").setAttribute("collapsed", "true");
}
catch (ex) {}
this._document.getElementById("event-grid-attachment-row").collapsed = true;

this.addAttachmentsFromItem(item);
} else {
this._document.getElementById("button-url").hidden = false;
this._document.getElementById("exchWebService-add-attachment-button").hidden = true;

this._document.getElementById("event-grid-attachment-row").collapsed = false ;
}
},

Expand Down Expand Up @@ -584,6 +590,6 @@ exchAttachments.prototype = {
}

var tmpAttachment = new exchAttachments(document, window);
window.addEventListener("load", function _onLoad() { window.removeEventListener("load",arguments.callee,false); tmpAttachment.onLoad(); }, true);
window.addEventListener("load", function _onLoad() { tmpAttachment.onLoad(); }, false);


7 changes: 5 additions & 2 deletions chrome/content/attachments-view.xul
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,13 @@
disable-on-readonly="true"
removable="true"
command="exchWebService_addAttachmentDialog"
oncommand="tmpAttachment.addAttachmentDialog();"
hidden="true"/>
</toolbarpalette>
<toolbar id="event-toolbar" defaultset="button-save,button-attendees,button-privacy,button-url,exchWebService-add-attachment-button,button-delete">

// Add exchangecalendar attachment button
// Note: defaultset needs to be synced with common-central/calendar/base/content/dialogs/calendar-event-dialog.xul
<toolbar id="event-toolbar"
defaultset="button-saveandclose,button-attendees,button-privacy,button-url,exchWebService-add-attachment-button,button-delete" >
</toolbar>


Expand Down