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

* eMail: fix refresh behavior, regarding the reading of an eMail in previewMessageArea; timed refresh of Message list, now only refreshes the messageList Area, not the preview area; fix reload behavior on MailDeletion in preview mode (click on delete Icon within previewArea)

Browse Source
This commit is contained in:
Klaus Leithoff 2011-08-02 15:39:59 +00:00
parent 13afee536c
commit 8009e30086
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
felamimail/inc/class.ajaxfelamimail.inc.php
View File

@ -497,7 +497,7 @@ class ajaxfelamimail
} }
function generateMessageList($_folderName,$modifyoffset=0) function generateMessageList($_folderName,$modifyoffset=0,$listOnly=false)
{ {
if($this->_debug) error_log("ajaxfelamimail::generateMessageList with $_folderName,$modifyoffset".function_backtrace()); if($this->_debug) error_log("ajaxfelamimail::generateMessageList with $_folderName,$modifyoffset".function_backtrace());
$response = new xajaxResponse(); $response = new xajaxResponse();
@ -505,6 +505,9 @@ class ajaxfelamimail
$response->addScript("activeServerID=".$this->imapServerID.";"); $response->addScript("activeServerID=".$this->imapServerID.";");
$response->addScript("activeFolder = \"".$_folderName."\";"); $response->addScript("activeFolder = \"".$_folderName."\";");
$response->addScript("activeFolderB64 = \"".base64_encode($_folderName)."\";"); $response->addScript("activeFolderB64 = \"".base64_encode($_folderName)."\";");
$sentFolder = $this->bofelamimail->getSentFolder(false);
$response->addScript("sentFolder = \"".($sentFolder?$sentFolder:'')."\";");
$response->addScript("sentFolderB64 = \"".($sentFolder?base64_encode($sentFolder):'')."\";");
$draftFolder = $this->bofelamimail->getDraftFolder(false); $draftFolder = $this->bofelamimail->getDraftFolder(false);
$response->addScript("draftFolder = \"".($draftFolder?$draftFolder:'')."\";"); $response->addScript("draftFolder = \"".($draftFolder?$draftFolder:'')."\";");
$response->addScript("draftFolderB64 = \"".($draftFolder?base64_encode($draftFolder):'')."\";"); $response->addScript("draftFolderB64 = \"".($draftFolder?base64_encode($draftFolder):'')."\";");
@ -599,7 +602,7 @@ class ajaxfelamimail
$response->addAssign("messageCounter", "innerHTML", '<b>'.$shortName.': </b>'.lang('Viewing messages').($maxMessages>0?" <b>$firstMessage</b> - <b>$lastMessage</b>":"")." ($totalMessage ".lang("total").')'); $response->addAssign("messageCounter", "innerHTML", '<b>'.$shortName.': </b>'.lang('Viewing messages').($maxMessages>0?" <b>$firstMessage</b> - <b>$lastMessage</b>":"")." ($totalMessage ".lang("total").')');
} }
$response->addAssign("divMessageList", "innerHTML", $headerJs.$headerTable); $response->addAssign("divMessage".($listOnly?'Table':'')."List", "innerHTML", $headerJs.$headerTable);
$response->addAssign("skriptGridOnFirstLoad","innerHTML",""); $response->addAssign("skriptGridOnFirstLoad","innerHTML","");
if($quota = $this->bofelamimail->getQuotaRoot()) { if($quota = $this->bofelamimail->getQuotaRoot()) {
@ -932,7 +935,7 @@ class ajaxfelamimail
function refreshMessageList() function refreshMessageList()
{ {
return $this->generateMessageList($this->sessionData['mailbox']); return $this->generateMessageList($this->sessionData['mailbox'],0,$listOnly=true);
} }
function refreshFolder($injectIntoResponse = false) function refreshFolder($injectIntoResponse = false)

4
felamimail/inc/class.uiwidgets.inc.php
View File

@ -1596,8 +1596,8 @@ $j(document).ready(function() {
'action' => ($_forceNewWindow ? "window.open('$deleteURL','_blank','dependent=yes,width=100,height=100,toolbar=no,scrollbars=no,status=no')": "window.location.href = '$deleteURL'"), 'action' => ($_forceNewWindow ? "window.open('$deleteURL','_blank','dependent=yes,width=100,height=100,toolbar=no,scrollbars=no,status=no')": "window.location.href = '$deleteURL'"),
'tooltip' => ($_headerData['deleted']?lang('undelete'):lang('delete')), 'tooltip' => ($_headerData['deleted']?lang('undelete'):lang('delete')),
), ),
'delete' => array( 'delete' => array(// json_encode(array('msg'=>array($_headerData['uid']))) may be used for {msg:[".$_headerData['uid']."]}
'action' => ($_forceNewWindow ? "window.open('$deleteURL','_blank','dependent=yes,width=100,height=100,toolbar=no,scrollbars=no,status=no')": "window.location.href = '$deleteURL'"), 'action' => ($_forceNewWindow ? "mail_deleteMessages({msg:[".$_headerData['uid']."]});": "window.location.href = '$deleteURL'"),
'tooltip' => ($_headerData['deleted']?lang('undelete'):lang('delete')), 'tooltip' => ($_headerData['deleted']?lang('undelete'):lang('delete')),
), ),
); );

1
felamimail/js/jscode/viewMainScreen.js
View File

@ -760,7 +760,6 @@ var searchesPending=0;
function refresh() { function refresh() {
//searchesPending++; //searchesPending++;
//document.title=searchesPending; //document.title=searchesPending;
mail_resetMessageSelect();
egw_appWindow('felamimail').xajax_doXMLHTTP('felamimail.ajaxfelamimail.refreshMessageList'); egw_appWindow('felamimail').xajax_doXMLHTTP('felamimail.ajaxfelamimail.refreshMessageList');
} }