mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-25 17:33:49 +01:00
Fix mail seen label does not work on mobile template
This commit is contained in:
parent
250a605f56
commit
aa00eb9c27
@ -918,55 +918,59 @@ app.classes.mail = AppJS.extend(
|
|||||||
IframeHandle.set_src('about:blank');
|
IframeHandle.set_src('about:blank');
|
||||||
this.mail_disablePreviewArea(true);
|
this.mail_disablePreviewArea(true);
|
||||||
}
|
}
|
||||||
return;
|
if (!egwIsMobile())return;
|
||||||
}
|
}
|
||||||
|
// Not applied to mobile preview
|
||||||
// Widget ID:data key map of widgets we can directly set from cached data
|
if (!egwIsMobile())
|
||||||
var data_widgets = {
|
|
||||||
'previewFromAddress': 'fromaddress',
|
|
||||||
'previewDate': 'date',
|
|
||||||
'previewSubject': 'subject'
|
|
||||||
};
|
|
||||||
|
|
||||||
// Set widget values from cached data
|
|
||||||
for(var id in data_widgets)
|
|
||||||
{
|
{
|
||||||
var widget = this.et2.getWidgetById(id);
|
|
||||||
if(widget == null) continue;
|
// Widget ID:data key map of widgets we can directly set from cached data
|
||||||
widget.set_value(dataElem.data[data_widgets[id]] || "");
|
var data_widgets = {
|
||||||
|
'previewFromAddress': 'fromaddress',
|
||||||
|
'previewDate': 'date',
|
||||||
|
'previewSubject': 'subject'
|
||||||
|
};
|
||||||
|
|
||||||
|
// Set widget values from cached data
|
||||||
|
for(var id in data_widgets)
|
||||||
|
{
|
||||||
|
var widget = this.et2.getWidgetById(id);
|
||||||
|
if(widget == null) continue;
|
||||||
|
widget.set_value(dataElem.data[data_widgets[id]] || "");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Blank first, so we don't show previous email while loading
|
||||||
|
var IframeHandle = this.et2.getWidgetById('messageIFRAME');
|
||||||
|
IframeHandle.set_src('about:blank');
|
||||||
|
|
||||||
|
// show iframe, in case we hide it from mailvelopes one and remove that
|
||||||
|
jQuery(IframeHandle.getDOMNode()).show()
|
||||||
|
.next(this.mailvelope_iframe_selector).remove();
|
||||||
|
|
||||||
|
// Set up additional content that can be expanded.
|
||||||
|
// We add a new URL widget for each address, so they get all the UI
|
||||||
|
// TO addresses have the first one split out, not all together
|
||||||
|
// list of keys:
|
||||||
|
var expand_content = [
|
||||||
|
{build_children: true, data_one: 'toaddress', data: 'additionaltoaddress', widget: 'additionalToAddress', line: 'mailPreviewHeadersTo'},
|
||||||
|
{build_children: true, data: 'ccaddress', widget: 'additionalCCAddress', line: 'mailPreviewHeadersCC'},
|
||||||
|
{build_children: false, data: 'attachmentsBlock', widget:'previewAttachmentArea', line: 'mailPreviewHeadersAttachments'}
|
||||||
|
];
|
||||||
|
|
||||||
|
dataElem = this.url_email_expandOnClick(expand_content,dataElem);
|
||||||
|
|
||||||
|
|
||||||
|
// Update the internal list of selected mails, if needed
|
||||||
|
if(this.mail_selectedMails.indexOf(_id) < 0)
|
||||||
|
{
|
||||||
|
this.mail_selectedMails.push(_id);
|
||||||
|
}
|
||||||
|
this.mail_disablePreviewArea(false);
|
||||||
|
|
||||||
|
// Request email body from server
|
||||||
|
IframeHandle.set_src(egw.link('/index.php',{menuaction:'mail.mail_ui.loadEmailBody',_messageID:_id}));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Blank first, so we don't show previous email while loading
|
|
||||||
var IframeHandle = this.et2.getWidgetById('messageIFRAME');
|
|
||||||
IframeHandle.set_src('about:blank');
|
|
||||||
|
|
||||||
// show iframe, in case we hide it from mailvelopes one and remove that
|
|
||||||
jQuery(IframeHandle.getDOMNode()).show()
|
|
||||||
.next(this.mailvelope_iframe_selector).remove();
|
|
||||||
|
|
||||||
// Set up additional content that can be expanded.
|
|
||||||
// We add a new URL widget for each address, so they get all the UI
|
|
||||||
// TO addresses have the first one split out, not all together
|
|
||||||
// list of keys:
|
|
||||||
var expand_content = [
|
|
||||||
{build_children: true, data_one: 'toaddress', data: 'additionaltoaddress', widget: 'additionalToAddress', line: 'mailPreviewHeadersTo'},
|
|
||||||
{build_children: true, data: 'ccaddress', widget: 'additionalCCAddress', line: 'mailPreviewHeadersCC'},
|
|
||||||
{build_children: false, data: 'attachmentsBlock', widget:'previewAttachmentArea', line: 'mailPreviewHeadersAttachments'}
|
|
||||||
];
|
|
||||||
|
|
||||||
dataElem = this.url_email_expandOnClick(expand_content,dataElem);
|
|
||||||
|
|
||||||
|
|
||||||
// Update the internal list of selected mails, if needed
|
|
||||||
if(this.mail_selectedMails.indexOf(_id) < 0)
|
|
||||||
{
|
|
||||||
this.mail_selectedMails.push(_id);
|
|
||||||
}
|
|
||||||
this.mail_disablePreviewArea(false);
|
|
||||||
|
|
||||||
// Request email body from server
|
|
||||||
IframeHandle.set_src(egw.link('/index.php',{menuaction:'mail.mail_ui.loadEmailBody',_messageID:_id}));
|
|
||||||
|
|
||||||
var messages = {};
|
var messages = {};
|
||||||
messages['msg'] = [_id];
|
messages['msg'] = [_id];
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user