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

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';
}
}