extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix preview never docks, caused by too early return skipping the hiding.

Browse Source
This commit is contained in:
Nathan Gray 2014-02-10 19:52:23 +00:00
parent 9cd9f22026
commit 74b52fb1da
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mail/js/app.js
View File

@ -642,12 +642,18 @@ app.classes.mail = AppJS.extend(
//get_class does not exist yet //get_class does not exist yet
//var pAAClass = this.et2.getWidgetById('previewAttachmentArea').get_class(); //var pAAClass = this.et2.getWidgetById('previewAttachmentArea').get_class();
//console.log(pAAClass); //console.log(pAAClass);
if (this.et2.getWidgetById('previewAttachmentArea') && typeof _id != 'undefined' && _id !='') if (this.et2.getWidgetById('previewAttachmentArea') && typeof _id != 'undefined' && _id !='' && typeof dataElem !== 'undefined')
{ {
this.et2.getWidgetById('previewAttachmentArea').set_class('previewAttachmentArea'); this.et2.getWidgetById('previewAttachmentArea').set_class('previewAttachmentArea');
} }
else else
{ {
// Leave if we're here and there is nothing selected, too many, or no data
this.et2.getWidgetById('previewAttachmentArea').set_value({content:[]});
this.et2.getWidgetById('previewAttachmentArea').set_class('previewAttachmentArea noContent mail_DisplayNone');
var IframeHandle = this.et2.getWidgetById('messageIFRAME');
IframeHandle.set_src('about:blank');
this.mail_disablePreviewArea(true);
return; return;
} }
@ -666,19 +672,6 @@ 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
if(typeof selected == 'undefined' || selected.length == 0 || selected.length > 1 || typeof dataElem =='undefined')
{
if (this.et2.getWidgetById('button[showAllAddresses]')) this.et2.getWidgetById('button[showAllAddresses]').set_class('et2_button ui-button mail_DisplayNone');
this.et2.getWidgetById('previewAttachmentArea').set_value({content:[]});
this.et2.getWidgetById('previewAttachmentArea').set_class('previewAttachmentArea noContent mail_DisplayNone');
var IframeHandle = this.et2.getWidgetById('messageIFRAME');
IframeHandle.set_src(egw.link('/index.php',{menuaction:'mail.mail_ui.loadEmailBody',_messageID:""}));
this.mail_disablePreviewArea(true);
return;
}
// Blank first, so we don't show previous email while loading // Blank first, so we don't show previous email while loading
var IframeHandle = this.et2.getWidgetById('messageIFRAME'); var IframeHandle = this.et2.getWidgetById('messageIFRAME');
IframeHandle.set_src('about:blank'); IframeHandle.set_src('about:blank');