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

reenable splitter dock/undock; improve/fix bug in findNode regarding comparing node at hand and nodeid requested

Browse Source
This commit is contained in:
Klaus Leithoff 2013-05-28 09:32:23 +00:00
parent 681be3af08
commit 4ba51c410a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mail/inc/class.mail_ui.inc.php
View File

@ -144,6 +144,7 @@ class mail_ui
//$content['nm']['path'] = self::get_home_dir(); //$content['nm']['path'] = self::get_home_dir();
} }
} }
$content['nm']['csv_fields'] = false;
if ($msg) if ($msg)
{ {
$content['msg'] = $msg; $content['msg'] = $msg;
@ -545,7 +546,7 @@ class mail_ui
{ {
foreach($_out['item'] as $node) foreach($_out['item'] as $node)
{ {
if ($node['id']==$_nodeID) if (strcmp($node['id'],$_nodeID)===0)
{ {
//error_log(__METHOD__.__LINE__.':'.$_nodeID.'->'.$node['id']); //error_log(__METHOD__.__LINE__.':'.$_nodeID.'->'.$node['id']);
return ($childElements?$node['item']:$node); return ($childElements?$node['item']:$node);
@ -970,7 +971,7 @@ class mail_ui
unset($query['actions']); unset($query['actions']);
//error_log(__METHOD__.__LINE__.array2string($query)); //error_log(__METHOD__.__LINE__.array2string($query));
//error_log(__METHOD__.__LINE__.' SelectedFolder:'.$query['selectedFolder'].' Start:'.$query['start'].' NumRows:'.$query['num_rows']); //error_log(__METHOD__.__LINE__.' SelectedFolder:'.$query['selectedFolder'].' Start:'.$query['start'].' NumRows:'.$query['num_rows']);
//$starttime = microtime(true); $starttime = microtime(true);
//error_log(__METHOD__.__LINE__.array2string($query['search'])); //error_log(__METHOD__.__LINE__.array2string($query['search']));
//$query['search'] is the phrase in the searchbox //$query['search'] is the phrase in the searchbox
@ -1084,7 +1085,7 @@ unset($query['actions']);
if ($GLOBALS['egw_info']['user']['preferences']['common']['select_mode']=='EGW_SELECTMODE_TOGGLE') unset($cols[0]); if ($GLOBALS['egw_info']['user']['preferences']['common']['select_mode']=='EGW_SELECTMODE_TOGGLE') unset($cols[0]);
$rows = $this->header2gridelements($sortResult['header'],$cols, $_folderName, $folderType,$previewMessage); $rows = $this->header2gridelements($sortResult['header'],$cols, $_folderName, $folderType,$previewMessage);
//error_log(__METHOD__.__LINE__.array2string($rows)); //error_log(__METHOD__.__LINE__.array2string($rows));
//$endtime = microtime(true) - $starttime; $endtime = microtime(true) - $starttime;
//error_log(__METHOD__.__LINE__.' SelectedFolder:'.$query['selectedFolder'].' Start:'.$query['start'].' NumRows:'.$query['num_rows'].' Took:'.$endtime); //error_log(__METHOD__.__LINE__.' SelectedFolder:'.$query['selectedFolder'].' Start:'.$query['start'].' NumRows:'.$query['num_rows'].' Took:'.$endtime);
return $rowsFetched['messages']; return $rowsFetched['messages'];

4
mail/js/app.js
View File

@ -151,11 +151,11 @@ app.mail = AppJS.extend(
etemplate2.getByApplication('mail')[0].widgetContainer.getWidgetById('mailPreview').set_disabled(_value); etemplate2.getByApplication('mail')[0].widgetContainer.getWidgetById('mailPreview').set_disabled(_value);
if (_value==true) if (_value==true)
{ {
//splitter.dock(); splitter.dock();
} }
else else
{ {
//splitter.undock(); splitter.undock();
} }
}, },