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

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

Browse source
This commit is contained in:
RainLoop Team 2014-12-01 21:34:21 +04:00
parent a57dc3720e
commit ec7324b061
427 changed files with 10909 additions and 3336 deletions
Download patch file Download diff file Expand all files Collapse all files

7
dev/Common/Enums.js
View file

@ -51,7 +51,7 @@
'Gravatar': 'GRAVATAR',
'Themes': 'THEMES',
'UserBackground': 'USER_BACKGROUND',
'Filters': 'FILTERS',
'Sieve': 'SIEVE',
'AdditionalAccounts': 'ADDITIONAL_ACCOUNTS',
'AdditionalIdentities': 'ADDITIONAL_IDENTITIES'
};
@ -291,7 +291,6 @@
*/
Enums.FilterConditionField = {
'From': 'From',
'To': 'To',
'Recipient': 'Recipient',
'Subject': 'Subject'
};
@ -320,8 +319,8 @@
* @enum {string}
*/
Enums.FilterRulesType = {
'And': 'And',
'Or': 'Or'
'All': 'All',
'Any': 'Any'
};
/**

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',
'extraPlugins': 'plain,signature',
'allowedContent': true,
'font_defaultLabel': 'Arial',

19
dev/Common/HtmlEditor.js
View file

@ -62,6 +62,19 @@
return this.editor ? 'wysiwyg' === this.editor.mode : false;
};
/**
* @param {string} sSignature
*/
HtmlEditor.prototype.setSignature = function (sSignature)
{
if (this.editor)
{
this.editor.execCommand('insertSignature', {
'signature': sSignature
});
}
};
/**
* @return {boolean}
*/
@ -172,7 +185,7 @@
bBiti = !!Settings.settingsGet('AllowHtmlEditorBitiButtons')
;
if ((bSource || bBiti) && !oConfig.toolbarGroups.__SourceInited)
if ((bSource || !bBiti) && !oConfig.toolbarGroups.__SourceInited)
{
oConfig.toolbarGroups.__SourceInited = true;
@ -181,9 +194,9 @@
oConfig.removeButtons = oConfig.removeButtons.replace(',Source', '');
}
if (bBiti)
if (!bBiti)
{
oConfig.extraPlugins += (oConfig.extraPlugins ? ',' : '') + 'bidi';
oConfig.removePlugins += (oConfig.removePlugins ? ',' : '') + 'bidi';
}
}

9
dev/Common/Utils.js
View file

@ -1059,6 +1059,7 @@
oData.capaAdditionalAccounts = ko.observable(false);
oData.capaAdditionalIdentities = ko.observable(false);
oData.capaGravatar = ko.observable(false);
oData.capaSieve = ko.observable(false);
oData.determineUserLanguage = ko.observable(false);
oData.determineUserDomain = ko.observable(false);
@ -1561,6 +1562,8 @@
{
sPlain = sPlain.toString().replace(/\r/g, '');
bFindEmailAndLinks = Utils.isUnd(bFindEmailAndLinks) ? false : !!bFindEmailAndLinks;
var
bIn = false,
bDo = true,
@ -1627,7 +1630,6 @@
.replace(/>/g, '&gt;').replace(/</g, '&lt;')
.replace(/~~~blockquote~~~[\s]*/g, '<blockquote>')
.replace(/[\s]*~~~\/blockquote~~~/g, '</blockquote>')
.replace(/ /g, '&nbsp;')
.replace(/\n/g, '<br />')
;
@ -1784,11 +1786,12 @@
for (iIndex = 0, iLen = aList.length; iIndex < iLen; iIndex++)
{
oItem = aList[iIndex];
if (oItem.subScribed() || !oItem.existen || bBuildUnvisible)
// if (oItem.subScribed() || !oItem.existen || bBuildUnvisible)
if ((oItem.subScribed() || !oItem.existen || bBuildUnvisible) && (oItem.selectable || oItem.hasSubScribedSubfolders()))
{
if (fVisibleCallback ? fVisibleCallback.call(null, oItem) : true)
{
if (Enums.FolderType.User === oItem.type() || !bSystem || 0 < oItem.subFolders().length)
if (Enums.FolderType.User === oItem.type() || !bSystem || oItem.hasSubScribedSubfolders())
{
if (bSep && 0 < aResult.length)
{