holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish up preview email display handling TO with one address split out.

Browse Source
This commit is contained in:
Nathan Gray 2013-12-18 18:40:01 +00:00
parent ccae3f71ab
commit 60c9fcd4dd
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mail/js/app.js
View File

@ -508,7 +508,6 @@ app.classes.mail = AppJS.extend(
// Widget ID:data key map of widgets we can directly set from cached data // Widget ID:data key map of widgets we can directly set from cached data
var data_widgets = { var data_widgets = {
'previewFromAddress': 'fromaddress', 'previewFromAddress': 'fromaddress',
'previewToAddress': 'toaddress',
'previewDate': 'date', 'previewDate': 'date',
'previewSubject': 'subject' 'previewSubject': 'subject'
}; };
@ -521,6 +520,7 @@ app.classes.mail = AppJS.extend(
widget.set_value(dataElem.data[data_widgets[id]] || ""); widget.set_value(dataElem.data[data_widgets[id]] || "");
} }
// Leave if we're here and there is nothing selected, too many, or no data // Leave if we're here and there is nothing selected, too many, or no data
if(typeof selected == 'undefined' || selected.length == 0 || selected.length > 1 || typeof dataElem =='undefined') if(typeof selected == 'undefined' || selected.length == 0 || selected.length > 1 || typeof dataElem =='undefined')
{ {
@ -535,19 +535,24 @@ app.classes.mail = AppJS.extend(
// Set up additional addresses. Too bad they weren't all together somewhere. // Set up additional addresses. Too bad they weren't all together somewhere.
// We add a new URL widget for each, so they get all the UI // We add a new URL widget for each, so they get all the UI
// TO addresses have the first one split out, not all together
// list of keys: // list of keys:
var additional_addresses = [ var additional_addresses = [
{data: 'toaddress', widget: 'additionalToAddress', line: 'mailPreviewHeadersTo'}, {data_one: 'toaddress', data: 'additionaltoaddress', widget: 'additionalToAddress', line: 'mailPreviewHeadersTo'},
{data: 'ccaddress', widget: 'additionalCCAddress', line: 'mailPreviewHeadersCC'} {data: 'ccaddress', widget: 'additionalCCAddress', line: 'mailPreviewHeadersCC'}
]; ];
for(var j = 0; j < additional_addresses.length; j++) for(var j = 0; j < additional_addresses.length; j++)
{ {
var field = additional_addresses[j] || []; var field = additional_addresses[j] || [];
var additional = dataElem.data[field.data] || []; var addresses = dataElem.data[field.data] || [];
if(typeof field.data_one != 'undefined')
{
addresses.unshift(dataElem.data[field.data_one]);
}
// Disable whole box if there are none // Disable whole box if there are none
var line = this.et2.getWidgetById(field.line); var line = this.et2.getWidgetById(field.line);
if(line != null) line.set_disabled(additional.length == 0); if(line != null) line.set_disabled(addresses.length == 0);
var widget = this.et2.getWidgetById(field.widget); var widget = this.et2.getWidgetById(field.widget);
if(widget == null) continue; if(widget == null) continue;
@ -562,16 +567,16 @@ app.classes.mail = AppJS.extend(
} }
// Add for current record // Add for current record
for(var i = 0; i < additional.length; i++) for(var i = 0; i < addresses.length; i++)
{ {
var value = additional[i]; var value = addresses[i];
var email = et2_createWidget('url-email',{value:value,readonly:true},widget); var email = et2_createWidget('url-email',{value:value,readonly:true},widget);
email.loadingFinished(); email.loadingFinished();
} }
// Set up button // Set up button
line.iterateOver(function(button) { line.iterateOver(function(button) {
button.set_disabled(additional.length <=1); button.set_disabled(addresses.length <=1);
},this,et2_button); },this,et2_button);
} }

2
mail/templates/default/index.xet
View File

@ -62,7 +62,7 @@
<description value="CC"/> <description value="CC"/>
<hbox id="additionalCCAddress" class="mail_extraEmails"> <hbox id="additionalCCAddress" class="mail_extraEmails">
</hbox> </hbox>
<buttononly class="et2_button ui-button" label="Show all Addresses" image="foldertree_nolines_plus" onclick="var list = jQuery(this).prev(); list.toggleClass('visible');"/> <buttononly class="et2_button ui-button" label="Show all Addresses" image="foldertree_nolines_plus" onclick="app.mail.showAllAddresses"/>
</hbox> </hbox>
<hbox width="100%" id="mailPreviewHeadersDate" class="mailPreviewHeaders"> <hbox width="100%" id="mailPreviewHeadersDate" class="mailPreviewHeaders">
<description value="Date"/> <description value="Date"/>