Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-06 16:07:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small fixes

Browse source
This commit is contained in:
RainLoop Team 2015-02-22 22:25:34 +04:00
parent 8be7e720f3
commit 13d4c769e2
5 changed files with 33 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

3
dev/Model/Message.js
View file

@ -97,9 +97,6 @@
case 'certificate': case 'certificate':
sClass = 'icon-file-certificate'; sClass = 'icon-file-certificate';
break; break;
// case 'pdf':
// sClass = 'icon-file-pdf';
// break;
} }
} }
return sClass; return sClass;

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

@ -33,7 +33,6 @@
function MessageUserStore() function MessageUserStore()
{ {
this.staticMessage = new MessageModel(); this.staticMessage = new MessageModel();
this.staticMessageList = [];
this.messageList = ko.observableArray([]).extend({'rateLimit': 0}); this.messageList = ko.observableArray([]).extend({'rateLimit': 0});
@ -621,7 +620,6 @@
iOffset = 0, iOffset = 0,
aList = [], aList = [],
iUtc = moment().unix(), iUtc = moment().unix(),
aStaticList = this.staticMessageList,
oJsonMessage = null, oJsonMessage = null,
oMessage = null, oMessage = null,
oFolder = null, oFolder = null,
@ -674,12 +672,7 @@
oJsonMessage = oData.Result['@Collection'][iIndex]; oJsonMessage = oData.Result['@Collection'][iIndex];
if (oJsonMessage && 'Object/Message' === oJsonMessage['@Object']) if (oJsonMessage && 'Object/Message' === oJsonMessage['@Object'])
{ {
oMessage = aStaticList[iIndex]; oMessage = MessageModel.newInstanceFromJson(oJsonMessage);
if (!oMessage || !oMessage.initByJson(oJsonMessage))
{
oMessage = MessageModel.newInstanceFromJson(oJsonMessage);
}
if (oMessage) if (oMessage)
{ {
if (Cache.hasNewMessageAndRemoveFromCache(oMessage.folderFullNameRaw, oMessage.uid) && 5 >= iNewCount) if (Cache.hasNewMessageAndRemoveFromCache(oMessage.folderFullNameRaw, oMessage.uid) && 5 >= iNewCount)
@ -699,6 +692,7 @@
Cache.storeMessageFlagsToCache(oMessage); Cache.storeMessageFlagsToCache(oMessage);
} }
oMessage.lastInCollapsedThreadLoading(false);
oMessage.lastInCollapsedThread(mLastCollapsedThreadUids && -1 < Utils.inArray(Utils.pInt(oMessage.uid), mLastCollapsedThreadUids) ? true : false); oMessage.lastInCollapsedThread(mLastCollapsedThreadUids && -1 < Utils.inArray(Utils.pInt(oMessage.uid), mLastCollapsedThreadUids) ? true : false);
aList.push(oMessage); aList.push(oMessage);
@ -717,11 +711,6 @@
this.messageList(aList); this.messageList(aList);
this.messageListIsNotCompleted(false); this.messageListIsNotCompleted(false);
if (aStaticList.length < aList.length)
{
this.staticMessageList = aList;
}
Cache.clearNewMessageCache(); Cache.clearNewMessageCache();
if (oFolder && (bCached || bUnreadCountChange || SettingsStore.useThreads())) if (oFolder && (bCached || bUnreadCountChange || SettingsStore.useThreads()))

37
dev/Styles/FolderList.less
View file

@ -144,35 +144,40 @@
.b-sub-folders .e-item .e-link { .b-sub-folders .e-item .e-link {
padding-left: @subPadding * 1 + @folderItemPadding; padding-left: @subPadding * 1 + @folderItemPadding;
} }
.b-sub-folders.unpaddig-folder .e-item .e-link {
padding-left: @folderItemPadding;
}
.b-sub-folders .b-sub-folders .e-item .e-link { .b-sub-folders .b-sub-folders .e-item .e-link {
padding-left: @subPadding * 2 + @folderItemPadding; padding-left: @subPadding * 2 + @folderItemPadding;
} }
.b-sub-folders.unpaddig-folder .b-sub-folders .e-item .e-link {
padding-left: @subPadding * 1 + @folderItemPadding;
}
.b-sub-folders .b-sub-folders .b-sub-folders .e-item .e-link { .b-sub-folders .b-sub-folders .b-sub-folders .e-item .e-link {
padding-left: @subPadding * 3 + @folderItemPadding; padding-left: @subPadding * 3 + @folderItemPadding;
} }
.b-sub-folders.unpaddig-folder .b-sub-folders .b-sub-folders .e-item .e-link {
padding-left: @subPadding * 2 + @folderItemPadding;
}
.b-sub-folders .b-sub-folders .b-sub-folders .b-sub-folders .e-item .e-link { .b-sub-folders .b-sub-folders .b-sub-folders .b-sub-folders .e-item .e-link {
padding-left: @subPadding * 4 + @folderItemPadding; padding-left: @subPadding * 4 + @folderItemPadding;
} }
.b-sub-folders.unpaddig-folder .b-sub-folders .b-sub-folders .b-sub-folders .e-item .e-link {
padding-left: @subPadding * 3 + @folderItemPadding;
}
/** /**/
&.single-root-inbox .i-am-inbox.e-link { &.single-root-inbox .i-am-inbox.e-link {
display: none; display: none !important;
} }
&.single-root-inbox .i-am-inbox-wrapper + .b-sub-folders .e-item .e-link { &.single-root-inbox .i-am-inbox-wrapper > .b-sub-folders {
padding-left: @folderItemPadding; max-height: none !important;
height: inherit !important;
display: block !important;
}
&.single-root-inbox .i-am-inbox-wrapper {
.b-sub-folders .e-item .e-link {
padding-left: @folderItemPadding;
}
.b-sub-folders .b-sub-folders .e-item .e-link {
padding-left: @subPadding * 1 + @folderItemPadding;
}
.b-sub-folders .b-sub-folders .b-sub-folders .e-item .e-link {
padding-left: @subPadding * 2 + @folderItemPadding;
}
.b-sub-folders .b-sub-folders .b-sub-folders .b-sub-folders .e-item .e-link {
padding-left: @subPadding * 3 + @folderItemPadding;
}
} }
/**/ /**/
} }

2
package.json
View file

@ -2,7 +2,7 @@
"name": "RainLoop", "name": "RainLoop",
"title": "RainLoop Webmail", "title": "RainLoop Webmail",
"version": "1.8.1", "version": "1.8.1",
"release": "267", "release": "271",
"description": "Simple, modern & fast web-based email client", "description": "Simple, modern & fast web-based email client",
"homepage": "http://rainloop.net", "homepage": "http://rainloop.net",
"main": "gulpfile.js", "main": "gulpfile.js",

17
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -1013,6 +1013,9 @@ class Actions
$sRand = \MailSo\Base\Utils::Md5Rand(); $sRand = \MailSo\Base\Utils::Md5Rand();
if (!$this->Cacher()->Set(\RainLoop\KeyPathHelper::SessionAdminKey($sRand), \time())) if (!$this->Cacher()->Set(\RainLoop\KeyPathHelper::SessionAdminKey($sRand), \time()))
{ {
$this->oLogger->Write('Cannot store an admin token',
\MailSo\Log\Enumerations\Type::WARNING);
$sRand = ''; $sRand = '';
} }
@ -1037,12 +1040,9 @@ class Actions
{ {
$bResult = true; $bResult = true;
} }
else if ($bThrowExceptionOnFalse)
{
throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError);
}
} }
else if ($bThrowExceptionOnFalse)
if (!$bResult && $bThrowExceptionOnFalse)
{ {
throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError); throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError);
} }
@ -3264,9 +3264,10 @@ class Actions
throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError); throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError);
} }
$this->setAdminAuthToken($this->getAdminToken()); $sToken = $this->getAdminToken();
$this->setAdminAuthToken($sToken);
return $this->TrueResponse(__FUNCTION__); return $this->DefaultResponse(__FUNCTION__, $sToken ? true : false);
} }
/** /**
@ -3322,7 +3323,7 @@ class Actions
{ {
$sDomain = \strtolower(\trim($sDomain)); $sDomain = \strtolower(\trim($sDomain));
$sTempDomain = \preg_replace('/^(webmail|email|mail|www|ssl)\./', '', $sDomain); $sTempDomain = \preg_replace('/^(webmail|email|mail)\./', '', $sDomain);
if (false === \strpos($sTempDomain, '.')) if (false === \strpos($sTempDomain, '.'))
{ {
$sTempDomain = $sDomain; $sTempDomain = $sDomain;