the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2025-10-27 14:37:12 +08:00
Code Issues Projects Releases Packages Wiki Activity

Small improvements

Browse source
This commit is contained in:
RainLoop Team 2015-10-13 19:36:43 +03:00
parent 1b86e85df2
commit 7b5d00ff01
12 changed files with 52 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dev/Common/ClientStorageDriver/Cookie.js
View file

@ -44,7 +44,7 @@
{
mResult = null === mStorageValue ? null : JSON.parse(mStorageValue);
}
catch (oException) {}
catch (e) {}
if (!mResult)
{
@ -61,7 +61,7 @@
bResult = true;
}
catch (oException) {}
catch (e) {}
return bResult;
};
@ -89,7 +89,7 @@
mResult = null;
}
}
catch (oException) {}
catch (e) {}
return mResult;
};

6
dev/Common/ClientStorageDriver/LocalStorage.js
View file

@ -44,7 +44,7 @@
{
mResult = null === mStorageValue ? null : JSON.parse(mStorageValue);
}
catch (oException) {}
catch (e) {}
if (!mResult)
{
@ -59,7 +59,7 @@
bResult = true;
}
catch (oException) {}
catch (e) {}
return bResult;
};
@ -87,7 +87,7 @@
mResult = null;
}
}
catch (oException) {}
catch (e) {}
return mResult;
};

8
dev/Common/Utils.js
View file

@ -365,7 +365,7 @@
return false;
};
Utils.removeInFocus = function ()
Utils.removeInFocus = function (force)
{
if (window.document && window.document.activeElement && window.document.activeElement.blur)
{
@ -374,6 +374,12 @@
{
window.document.activeElement.blur();
}
else if (force)
{
try {
window.document.activeElement.blur();
} catch (e) {}
}
}
};

5
dev/Stores/User/Pgp.js
View file

@ -240,7 +240,10 @@
return true;
}
}
catch (e) {}
catch (e)
{
Utils.log(e);
}
}
fCallback(null, aSigningKeyIds);

16
dev/Styles/FolderList.less
View file

@ -72,6 +72,17 @@
cursor: not-allowed;
font-size: 14px;
.focused-poiner {
float: left;
display: inline-block;
background-color: transparent;
height: 100%;
width: 3px;
position: absolute;
top: 0;
left: 0;
}
padding: 0;
padding-left: @folderItemPadding;
padding-right: @folderItemPadding;
@ -96,8 +107,13 @@
&.focused {
background-color: #888;
.focused-poiner {
background-color: #fff;
}
}
&.system {
cursor: default;
color: grey;

4
dev/Styles/MessageView.less
View file

@ -376,8 +376,8 @@ html.rl-no-preview-pane {
&.html {
div[data-x-div-type=body] {
padding: 15px;
// margin: 15px;
/*padding: 15px;*/
margin: 15px;
}
pre, code {

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

@ -618,6 +618,7 @@
{
oDiv.on('onBeforeOpen.lg', function () {
Globals.useKeyboardShortcuts(false);
Utils.removeInFocus(true);
});
oDiv.on('onCloseAfter.lg', function () {

2
package.json
View file

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

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

@ -2294,6 +2294,13 @@ class Actions
throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError);
}
}
else if ('sleep@sleep.dev' === $sEmail && 0 < \strlen($sPassword) &&
\is_numeric($sPassword) && $this->Config()->Get('debug', 'enable', false)
)
{
\sleep((int) $sPassword);
throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError);
}
try
{
@ -7227,7 +7234,7 @@ class Actions
try
{
$sHash = $this->MailClient()->FolderHash($sFromFolder);
$sHash = $this->MailClient()->FolderHash($sFolder);
}
catch (\Exception $oException)
{
@ -8288,6 +8295,8 @@ class Actions
$mResult = $this->MailClient()->MessageMimeStream(function($rResource, $sContentType, $sFileName, $sMimeIndex = '')
use ($oAccount, $oFileProvider, $sFileNameIn, $sContentTypeIn, &$sResultHash) {
unset($sContentType, $sFileName, $sMimeIndex);
if ($oAccount && \is_resource($rResource))
{
$sHash = \MailSo\Base\Utils::Md5Rand($sFileNameIn.'~'.$sContentTypeIn);

1
rainloop/v/0.0.0/app/templates/Views/User/MailFolderListItem.html
View file

@ -5,6 +5,7 @@
css: { 'i-am-inbox': isInbox, 'selected': selected() && !isSystemFolder(), 'selectable': selectableForFolderList, 'hidden' : hidden, 'print-count': hasUnreadMessages, 'unread-sub': hasSubScribedUnreadMessagesSubfolders, 'system': isSystemFolder, 'anim-action-class': actionBlink }">
<span class="badge pull-right count" data-bind="text: printableUnreadCount"></span>
<i data-bind="css: collapsedCss()"></i>
<span class="focused-poiner"></span>
<span class="name" data-bind="text: name"></span>
</a>
<div class="b-sub-folders" data-bind="template: { name: 'MailFolderListItem', foreach: subFolders }, css: { 'collapsed': collapsed() }"></div>

1
rainloop/v/0.0.0/app/templates/Views/User/MailFolderListSystemItem.html
View file

@ -2,6 +2,7 @@
<a class="e-link" data-bind="droppable: function (oEvent, oUi) { $root.messagesDrop($data, oUi); }, css: { 'selected': selected, 'selectable': selectable, 'print-count': 0 < printableUnreadCount().length, 'anim-action-class': actionBlink }">
<span class="badge pull-right count" data-bind="text: printableUnreadCount"></span>
&nbsp;
<span class="focused-poiner"></span>
<span class="name" data-bind="text: localName()"></span>
</a>
</div>

5
rainloop/v/0.0.0/app/templates/Views/User/SystemDropDown.html
View file

@ -31,18 +31,19 @@
</a>
</li>
<!-- /ko -->
<li class="divider" role="presentation"></li>
<!-- /ko -->
<!-- ko if: capaAdditionalAccounts -->
<li class="divider" role="presentation"></li>
<li class="e-item" role="presentation">
<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: addAccountClick">
<i class="icon-user-add"></i>
<i class="icon-plus"></i>
&nbsp;&nbsp;
<span class="i18n" data-i18n="TOP_TOOLBAR/BUTTON_ADD_ACCOUNT"></span>
</a>
</li>
<!-- /ko -->
<li class="divider" role="presentation"></li>
<li class="e-item" role="presentation" data-bind="visible: allowSettings">
<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: settingsClick">
<i class="icon-cog"></i>