mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-24 22:21:34 +01:00
- Fix doubling of to address
- Only show display more addresses button if all addresses are not visible.
This commit is contained in:
parent
ba106526b1
commit
ebc4845c64
@ -553,9 +553,15 @@ app.classes.mail = AppJS.extend(
|
|||||||
{
|
{
|
||||||
var field = additional_addresses[j] || [];
|
var field = additional_addresses[j] || [];
|
||||||
var addresses = dataElem.data[field.data] || [];
|
var addresses = dataElem.data[field.data] || [];
|
||||||
|
|
||||||
|
// Add in single address, if there
|
||||||
if(typeof field.data_one != 'undefined')
|
if(typeof field.data_one != 'undefined')
|
||||||
{
|
{
|
||||||
addresses.unshift(dataElem.data[field.data_one]);
|
addresses.unshift(dataElem.data[field.data_one]);
|
||||||
|
// Unique
|
||||||
|
addresses = addresses.filter(function(value, index, self) {
|
||||||
|
return self.indexOf(value) === index;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Disable whole box if there are none
|
// Disable whole box if there are none
|
||||||
@ -584,7 +590,12 @@ app.classes.mail = AppJS.extend(
|
|||||||
|
|
||||||
// Set up button
|
// Set up button
|
||||||
line.iterateOver(function(button) {
|
line.iterateOver(function(button) {
|
||||||
button.set_disabled(addresses.length <=1);
|
button.set_disabled(
|
||||||
|
// Disable if only 1 address
|
||||||
|
addresses.length <=1 ||
|
||||||
|
// Disable if all addresses are visible
|
||||||
|
$j(widget.getDOMNode()).innerWidth() >= widget.getDOMNode().scrollWidth
|
||||||
|
);
|
||||||
},this,et2_button);
|
},this,et2_button);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user