Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-29 20:19:22 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged from sub repository (updated ckeditor, filters - step 3)

Browse source 
Release commit
This commit is contained in:
RainLoop Team 2014-12-06 01:01:33 +04:00
parent ec7324b061
commit 42b8a446c6
464 changed files with 10395 additions and 1303 deletions
Download patch file Download diff file Expand all files Collapse all files

38
dev/App/User.js
View file

@ -1265,25 +1265,25 @@
bTwitter = Settings.settingsGet('AllowTwitterSocial')
;
Utils.initOnStartOrLangChange(function () {
$.extend(true, $.magnificPopup.defaults, {
'tClose': Utils.i18n('MAGNIFIC_POPUP/CLOSE'),
'tLoading': Utils.i18n('MAGNIFIC_POPUP/LOADING'),
'gallery': {
'tPrev': Utils.i18n('MAGNIFIC_POPUP/GALLERY_PREV'),
'tNext': Utils.i18n('MAGNIFIC_POPUP/GALLERY_NEXT'),
'tCounter': Utils.i18n('MAGNIFIC_POPUP/GALLERY_COUNTER')
},
'image': {
'tError': Utils.i18n('MAGNIFIC_POPUP/IMAGE_ERROR')
},
'ajax': {
'tError': Utils.i18n('MAGNIFIC_POPUP/AJAX_ERROR')
}
});
}, this);
// Utils.initOnStartOrLangChange(function () {
//
// $.extend(true, $.magnificPopup.defaults, {
// 'tClose': Utils.i18n('PREVIEW_POPUP/CLOSE'),
// 'tLoading': Utils.i18n('PREVIEW_POPUP/LOADING'),
// 'gallery': {
// 'tPrev': Utils.i18n('PREVIEW_POPUP/GALLERY_PREV'),
// 'tNext': Utils.i18n('PREVIEW_POPUP/GALLERY_NEXT'),
// 'tCounter': Utils.i18n('PREVIEW_POPUP/GALLERY_COUNTER')
// },
// 'image': {
// 'tError': Utils.i18n('PREVIEW_POPUP/IMAGE_ERROR')
// },
// 'ajax': {
// 'tError': Utils.i18n('PREVIEW_POPUP/AJAX_ERROR')
// }
// });
//
// }, this);
if (SimplePace)
{

2
dev/Common/Globals.js
View file

@ -145,7 +145,7 @@
'removeButtons': 'Format,Undo,Redo,Cut,Copy,Paste,Anchor,Strike,Subscript,Superscript,Image,SelectAll,Source',
'removeDialogTabs': 'link:advanced;link:target;image:advanced;images:advanced',
'extraPlugins': 'plain,signature',
'extraPlugins': 'plain,bidi', // signature
'allowedContent': true,
'font_defaultLabel': 'Arial',

4
dev/Common/HtmlEditor.js
View file

@ -198,6 +198,10 @@
{
oConfig.removePlugins += (oConfig.removePlugins ? ',' : '') + 'bidi';
}
else
{
oConfig.removeButtons = oConfig.removeButtons.replace(',bidi', '');
}
}
oConfig.enterMode = window.CKEDITOR.ENTER_BR;

27
dev/Styles/Login.less
View file

@ -30,14 +30,15 @@
color: #333;
margin: 0;
float: none;
width: 303px;
}
.control-label {
/* .control-label {
font-size: 16px;
line-height: 30px;
}
}*/
.control-group {
.controls, .control-group {
margin-bottom: 25px;
}
@ -50,10 +51,20 @@
border-radius: 3px;
}
.inputLoginForm, .inputEmail, .inputLogin, .inputPassword, .inputAdditionalCode {
font-size: 18px;
height: 30px;
line-height: 29px;
.control-group {
.inputLoginForm, .inputEmail, .inputLogin, .inputPassword, .inputAdditionalCode {
font-size: 18px;
height: 30px;
line-height: 29px;
}
}
.controls {
.inputLoginForm, .inputEmail, .inputLogin, .inputPassword, .inputAdditionalCode {
font-size: 18px;
height: 40px;
line-height: 39px;
}
}
.signMeLabel, .languageLabel {
@ -79,7 +90,7 @@
color: #999;
}
.control-group.error .add-on i {
.controls.error .add-on i, .control-group.error .add-on i {
color: #b94a48;
}
}

17
dev/Styles/MessageView.less
View file

@ -33,7 +33,7 @@ html.rl-no-preview-pane {
left: -1px;
overflow: hidden;
border: @rlLowBorderSize solid @rlMainDarkColor;
.border-top-right-radius(@rlLowBorderRadius);
.border-bottom-right-radius(@rlLowBorderRadius);
@ -218,7 +218,9 @@ html.rl-no-preview-pane {
.attachmentsPlace {
padding: 10px;
padding: 10px 10px 6px 10px;
background: #eee;
border-bottom: 1px solid #ddd;
.attachmentList {
@ -235,17 +237,20 @@ html.rl-no-preview-pane {
cursor: pointer;
list-style: none;
line-height: 24px;
border: 2px solid grey;
/*border: 2px solid grey;*/
border: 0;
background-color: #fff;
box-shadow: 1px 1px 5px #ccc;
box-shadow: 1px 1px 5px rgba(0,0,0,0.1);
box-shadow: 0 1px 5px #ccc;
box-shadow: 0 1px 5px rgba(0, 0, 0, 0.2);
box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.04), 0 1px 5px rgba(0, 0, 0, 0.1);
border-radius: 6px;
border-radius: 2px;
.attachmentIcon {
font-size: 23px;
width: 23px;
height: 23px;
color: #666;
}
.attachmentPreview {

2
dev/Styles/SettingsIdentities.less
View file

@ -10,7 +10,7 @@
.e-signature-place {
display: inline-block;
width: 680px;
width: 725px;
width: 730px;
height: 250px;
}

2
dev/Styles/SettingsIdentity.less
View file

@ -3,7 +3,7 @@
.e-signature-place {
display: inline-block;
width: 680px;
width: 725px;
width: 730px;
height: 250px;
}
}

2
dev/Styles/_CkeFix.less
View file

@ -27,7 +27,7 @@
}
.cke_combo_button {
background: #FBFBFB !important;
/*background: #FBFBFB !important;*/
}
.cke_source {

11
dev/Styles/_End.less
View file

@ -10,4 +10,15 @@
.mfp-container .mfp-figure {
min-height: 300px;
min-width: 300px;
}
.pswp__error-msg {
color: #ccc;
a, a:hover {
color: #fff;
}
}
.pswp__img--placeholder {
opacity: 0;
}

15
dev/View/Popup/Compose.js
View file

@ -461,9 +461,12 @@
var
oIDs = {},
sResult = '',
sEmail = '',
fFindHelper = function (oItem) {
if (oItem && oItem.email && oIDs[oItem.email])
{
sEmail = oItem.email;
sResult = oIDs[oItem.email];
return true;
}
@ -507,9 +510,10 @@
if ('' === sResult)
{
sResult = Data.accountEmail();
sEmail = sResult;
}
return sResult;
return [sResult, sEmail];
};
ComposePopupView.prototype.selectIdentity = function (oIdentity)
@ -744,6 +748,7 @@
sReplyTitle = '',
aResplyAllParts = [],
oExcludeEmail = {},
oIdResult = null,
mEmail = Data.accountEmail(),
sSignature = Data.signature(),
bSignatureToAll = Data.signatureToAll(),
@ -780,7 +785,13 @@
oExcludeEmail[mEmail] = true;
}
this.currentIdentityID(this.findIdentityIdByMessage(sComposeType, oMessage));
oIdResult = this.findIdentityIdByMessage(sComposeType, oMessage);
if (oIdResult && oIdResult[0])
{
oExcludeEmail[oIdResult[1]] = true;
this.currentIdentityID(oIdResult[0]);
}
this.reset();
if (Utils.isNonEmptyArray(aToEmails))

23
dev/View/User/Login.js
View file

@ -13,6 +13,8 @@
Utils = require('Common/Utils'),
Links = require('Common/Links'),
Plugins = require('Common/Plugins'),
Settings = require('Storage/Settings'),
Data = require('Storage/User/Data'),
Remote = require('Storage/User/Remote'),
@ -111,6 +113,27 @@
return false;
}
var
iPluginResultCode = 0,
sPluginResultMessage = '',
fSubmitResult = function (iResultCode, sResultMessage) {
iPluginResultCode = iResultCode || 0;
sPluginResultMessage = sResultMessage || '';
}
;
Plugins.runHook('user-login-submit', [fSubmitResult]);
if (0 < iPluginResultCode)
{
this.submitError(Utils.getNotification(iPluginResultCode));
return false;
}
else if ('' !== sPluginResultMessage)
{
this.submitError(sPluginResultMessage);
return false;
}
this.submitRequest(true);
var

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

@ -9,6 +9,9 @@
ko = require('ko'),
key = require('key'),
PhotoSwipe = require('PhotoSwipe'),
PhotoSwipeUI_Default = require('PhotoSwipeUI_Default'),
Consts = require('Common/Consts'),
Enums = require('Common/Enums'),
Globals = require('Common/Globals'),
@ -43,6 +46,8 @@
this.oMessageScrollerDom = null;
this.pswp = null;
this.message = Data.message;
this.currentMessage = Data.currentMessage;
this.messageListChecked = Data.messageListChecked;
@ -323,7 +328,11 @@
MessageViewMailBoxUserView.prototype.onBuild = function (oDom)
{
var self = this;
var
self = this,
sErrorMessage = Utils.i18n('PREVIEW_POPUP/IMAGE_ERROR')
;
this.fullScreenMode.subscribe(function (bValue) {
if (bValue)
{
@ -331,25 +340,89 @@
}
}, this);
$('.attachmentsPlace', oDom).magnificPopup({
'delegate': '.magnificPopupImage:visible',
'type': 'image',
'gallery': {
'enabled': true,
'preload': [1, 1],
'navigateByImgClick': true
},
'callbacks': {
'open': function() {
Globals.useKeyboardShortcuts(false);
},
'close': function() {
Globals.useKeyboardShortcuts(true);
}
},
'mainClass': 'mfp-fade',
'removalDelay': 400
});
// $('.attachmentsPlace', oDom).magnificPopup({
// 'delegate': '.attachmentImagePreview:visible',
// 'type': 'image',
// 'gallery': {
// 'enabled': true,
// 'preload': [1, 1],
// 'navigateByImgClick': true
// },
// 'callbacks': {
// 'open': function() {
// Globals.useKeyboardShortcuts(false);
// },
// 'close': function() {
// Globals.useKeyboardShortcuts(true);
// }
// },
// 'mainClass': 'mfp-fade',
// 'removalDelay': 400
// });
this.pswpDom = $('.pswp', oDom)[0];
if (this.pswpDom)
{
oDom
.on('click', 'a.attachmentImagePreview[data-index]:visible', function (oEvent) {
var
oPs = null,
oEl = oEvent.currentTarget || null,
aItems = []
;
oDom.find('a.attachmentImagePreview:visible').each(function (index, oSubElement) {
var $oItem = $(oSubElement);
aItems.push({
w: 600, h: 400,
'src': $oItem.attr('href'),
'title': $oItem.attr('title') || ''
});
});
if (aItems && 0 < aItems.length)
{
Globals.useKeyboardShortcuts(false);
oPs = new PhotoSwipe(self.pswpDom, PhotoSwipeUI_Default, aItems, {
'index': Utils.pInt($(oEl).data('index')),
'bgOpacity': 0.85,
'loadingIndicatorDelay': 500,
'errorMsg': '<div class="pswp__error-msg">' + sErrorMessage + '</div>',
'showHideOpacity': true,
'tapToToggleControls': false,
'timeToIdle': 0,
'timeToIdleOutside': 0,
'history': false,
'arrowEl': 1 < aItems.length,
'counterEl': 1 < aItems.length,
'shareEl': false
});
oPs.listen('imageLoadComplete', function(index, item) {
if (item && item.img && item.img.width && item.img.height)
{
item.w = item.img.width;
item.h = item.img.height;
oPs.updateSize();
}
});
oPs.listen('close', function() {
Globals.useKeyboardShortcuts(true);
});
oPs.init();
}
return false;
});
}
oDom
.on('click', 'a', function (oEvent) {