the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2025-02-04 13:08:15 +08:00
Code Issues Projects Releases Packages Wiki Activity

Beta 1.8.2 (for testing)

Browse source
This commit is contained in:
RainLoop Team 2015-03-06 21:11:41 +04:00
parent b6ca9e357e
commit 7750587be1
6 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dev/Remote/User/Ajax.js
View file

@ -359,7 +359,7 @@
'Limit': iLimit,
'Search': sSearch,
'UidNext': Cache.getFolderInboxName() === sFolderFullNameRaw ? Cache.getFolderUidNext(sFolderFullNameRaw) : '',
'UseThreads': AppStore.threadsAllowed() && SettingsStore.useThreads() ? '1' : '0',
'UseThreads': AppStore.threadsAllowed() && SettingsStore.useThreads() ? '1' : '0'
}, '' === sSearch ? Consts.Defaults.DefaultAjaxTimeout : Consts.Defaults.SearchAjaxTimeout, '', bSilent ? [] : ['MessageList']);
}
};

2
dev/Stores/User/Message.js
View file

@ -483,7 +483,7 @@
Cache.initMessageFlagsFromCache(oMessage);
this.message(this.staticMessage.populateByMessageListItem(oMessage));
oMessage = this.message(),
oMessage = this.message();
bNew = true;
}

2
dev/View/User/MailBox/MessageView.js
View file

@ -252,7 +252,7 @@
if (-1 < iIndex)
{
aResult[0] = true;
aResult[1] = (iIndex + 1) + '&nbsp;/&nbsp;' + iLen;
aResult[1] = (iIndex + 1) + '/' + iLen;
aResult[2] = aThreads[iIndex];
aResult[3] = 0 < iIndex && aThreads[iIndex - 1] ? aThreads[iIndex - 1] : '';
aResult[4] = aThreads[iIndex + 1] ? aThreads[iIndex + 1] : '';

4
package.json
View file

@ -1,8 +1,8 @@
{
"name": "RainLoop",
"title": "RainLoop Webmail",
"version": "1.8.1",
"release": "281",
"version": "1.8.2",
"release": "284",
"description": "Simple, modern & fast web-based email client",
"homepage": "http://rainloop.net",
"main": "gulpfile.js",

10
rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
View file

@ -1424,7 +1424,6 @@ class MailClient
* @param string $sFolderHash
* @param array $aIndexOrUids
* @param \MailSo\Cache\CacheClient $oCacher
* @param int $iThreadLimit = 50
* @param bool $bCacheOnly = false
*
* @return array
@ -1433,9 +1432,9 @@ class MailClient
* @throws \MailSo\Net\Exceptions\Exception
* @throws \MailSo\Imap\Exceptions\Exception
*/
public function MessageListThreadsMap($sFolderName, $sFolderHash, $aIndexOrUids, $oCacher, $iThreadLimit = 50, $bCacheOnly = false)
public function MessageListThreadsMap($sFolderName, $sFolderHash, $aIndexOrUids, $oCacher, $bCacheOnly = false)
{
$iThreadLimit = \is_int($iThreadLimit) && 0 < $iThreadLimit ? $iThreadLimit : 0;
$iThreadLimit = \MailSo\Config::$LargeThreadLimit;
$sSearchHash = '';
if (0 < \MailSo\Config::$MessageListDateFilter)
@ -1829,8 +1828,7 @@ class MailClient
$aResult = array();
if (0 < \strlen($sFolderName) && 0 < \strlen($sFolderHash) && 0 < \strlen($sUid) && $oCacher && $oCacher->IsInited())
{
$mThreads = $this->MessageListThreadsMap($sFolderName, $sFolderHash, array(), $oCacher,
\MailSo\Config::$LargeThreadLimit, true);
$mThreads = $this->MessageListThreadsMap($sFolderName, $sFolderHash, array(), $oCacher, true);
if (\is_array($mThreads))
{
@ -1957,7 +1955,7 @@ class MailClient
$aThreads = $this->MessageListThreadsMap(
$oMessageCollection->FolderName, $oMessageCollection->FolderHash,
$aIndexOrUids, $oCacher, \MailSo\Config::$LargeThreadLimit);
$aIndexOrUids, $oCacher);
$aNewIndexOrUids = array();
foreach ($aIndexOrUids as $iUid)

10
rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html
View file

@ -186,8 +186,8 @@
<a class="btn btn-thin" data-tooltip-placement="bottom" data-bind="command: threadForwardCommand">
<i class="icon-left-middle"></i>
</a>
<a class="btn btn-thin" data-tooltip-placement="bottom">
<b data-bind="html: viewThreadsControlDesc"></b>
<a class="btn btn-thin" data-tooltip-placement="bottom" style="display: none">
<b data-bind="text: viewThreadsControlDesc"></b>
</a>
<a class="btn btn-thin" data-tooltip-placement="bottom" data-bind="command: threadBackCommand">
<i class="icon-right-middle"></i>
@ -205,7 +205,10 @@
<span class="flagParent">
<i class="icon-star-empty flagOff" data-bind="css: {'icon-star flagOn': viewIsFlagged, 'icon-star-empty flagOff': !viewIsFlagged()}"></i>
</span>
<b style="color:red;margin-right:5px" data-bind="visible: viewIsImportant">!</b>
<span class="thread-counter" data-bind="visible: viewThreadsControlVisibility"
style="font-weight: normal; margin-right: 5px">(<span
data-bind="text: viewThreadsControlDesc"></span>)</span>
<b style="color: red; margin-right: 5px" data-bind="visible: viewIsImportant">!</b>
<span class="subject" data-bind="text: viewSubject, title: viewSubject"></span>
<span class="i18n emptySubjectText" data-i18n-text="MESSAGE/EMPTY_SUBJECT_TEXT"></span>
</div>
@ -276,6 +279,7 @@
<div class="content g-scrollbox" tabindex="0" data-bind="hasfocus: messageDomFocused">
<div class="content-wrapper">
<div>
<span class="buttonUp" data-bind="click: scrollMessageToTop">
<i class="icon-up"></i>
</span>