the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2024-09-20 15:45:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed strange characters in plain text mode (Firefox) (Closes #462)

Browse source
This commit is contained in:
RainLoop Team 2015-02-17 16:04:03 +04:00
parent 2a90664574
commit e3064b10aa
24 changed files with 206 additions and 159 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dev/App/User.js
View file

@ -1151,7 +1151,6 @@
AppUser.prototype.setFolders = function (oData)
{
var
aList = [],
bUpdate = false,
fNormalizeFolder = function (sFolderFullNameRaw) {
return ('' === sFolderFullNameRaw || Consts.Values.UnuseOptionValue === sFolderFullNameRaw ||
@ -1170,8 +1169,7 @@
AppStore.threadsAllowed(!!Settings.settingsGet('UseImapThread') &&
oData.Result.IsThreadsSupported && true);
aList = this.folderResponseParseRec(Data.namespace, oData.Result['@Collection']);
Data.folderList(aList);
Data.folderList(this.folderResponseParseRec(Data.namespace, oData.Result['@Collection']));
if (oData.Result['SystemFolders'] && '' === '' +
Settings.settingsGet('SentFolder') +

2
dev/Common/HtmlEditor.js
View file

@ -101,7 +101,7 @@
*/
HtmlEditor.prototype.clearSignatureSigns = function (sText)
{
return sText.replace(/(\u0002|\u0003|\u0004|\u0005)/g, '');
return sText.replace(/(\u0002|\u0003|\u200C|\u200D)/g, '');
};
/**

1
dev/Common/Selector.js
View file

@ -351,7 +351,6 @@
key('up, shift+up, down, shift+down, home, end, pageup, pagedown, insert, space', sKeyScope, function (event, handler) {
if (event && handler && handler.shortcut)
{
// TODO
var iKey = 0;
switch (handler.shortcut)
{

23
dev/Common/Utils.js
View file

@ -1009,6 +1009,10 @@
;
sText = sHtml
// specials for signature
.replace(/\u0002\u0002/g, '\u200C\u200C')
.replace(/\u0003\u0003/g, '\u200D\u200D')
.replace(/<pre[^>]*>([\s\S\r\n]*)<\/pre>/gmi, convertPre)
.replace(/[\s]+/gm, ' ')
.replace(/((?:href|data)\s?=\s?)("[^"]+?"|'[^']+?')/gmi, fixAttibuteValue)
@ -1154,6 +1158,11 @@
sPlain = aText.join("\n");
sPlain = sPlain
// specials for signature
.replace(/\u200C\u200C/g, '\u0002\u0002')
.replace(/\u200D\u200D/g, '\u0003\u0003')
// .replace(/~~~\/blockquote~~~\n~~~blockquote~~~/g, '\n')
.replace(/&/g, '&amp;')
.replace(/>/g, '&gt;').replace(/</g, '&lt;')
@ -1693,6 +1702,20 @@
}
};
Utils.substr = window.String.substr;
if ('ab'.substr(-1) !== 'b')
{
Utils.substr = function(sStr, iStart, iLength)
{
if (iStart < 0)
{
iStart = sStr.length + iStart;
}
return sStr.substr(iStart, iLength);
};
}
module.exports = Utils;
}());

4
dev/Model/Folder.js
View file

@ -75,6 +75,10 @@
{
var sInboxFolderName = Cache.getFolderInboxName();
this.isInbox = ko.computed(function () {
return Enums.FolderType.Inbox === this.type();
}, this);
this.hasSubScribedSubfolders = ko.computed(function () {
return !!_.find(this.subFolders(), function (oFolder) {
return oFolder.subScribed() && !oFolder.isSystemFolder();

27
dev/Settings/Admin/Domains.js
View file

@ -4,7 +4,6 @@
'use strict';
var
window = require('window'),
_ = require('_'),
ko = require('ko'),
@ -21,37 +20,13 @@
{
this.domains = DomainStore.domains;
this.iDomainForDeletionTimeout = 0;
this.visibility = ko.computed(function () {
return this.domains.loading() ? 'visible' : 'hidden';
}, this);
this.domainForDeletion = ko.observable(null).extend({'toggleSubscribe': [this,
function (oPrev) {
if (oPrev)
{
oPrev.deleteAccess(false);
}
}, function (oNext) {
if (oNext)
{
oNext.deleteAccess(true);
this.startDomainForDeletionTimeout();
}
}
]});
this.domainForDeletion = ko.observable(null).deleteAccessHelper();
}
DomainsAdminSettings.prototype.startDomainForDeletionTimeout = function ()
{
var self = this;
window.clearInterval(this.iDomainForDeletionTimeout);
this.iDomainForDeletionTimeout = window.setTimeout(function () {
self.domainForDeletion(null);
}, 1000 * 3);
};
DomainsAdminSettings.prototype.createDomain = function ()
{
require('Knoin/Knoin').showScreenPopup(require('View/Popup/Domain'));

11
dev/Settings/User/Filters.js
View file

@ -31,11 +31,8 @@
this.serverErrorDesc = ko.observable('');
this.haveChanges = ko.observable(false);
this.processText = ko.observable('');
this.saveErrorText = ko.observable('');
this.visibility = ko.observable(false);
this.filters.subscribe(Utils.windowResizeCallback);
this.serverError.subscribe(function (bValue) {
@ -51,14 +48,6 @@
this.filterRaw.allow = ko.observable(false);
this.filterRaw.error = ko.observable(false);
this.processText = ko.computed(function () {
return this.filters.loading() ? Translator.i18n('SETTINGS_FILTERS/LOADING_PROCESS') : '';
}, this);
this.visibility = ko.computed(function () {
return '' === this.processText() ? 'hidden' : 'visible';
}, this);
this.filterForDeletion = ko.observable(null).extend({'falseTimeout': 3000}).extend(
{'toggleSubscribeProperty': [this, 'deleteAccess']});

39
dev/Settings/User/Folders.js
View file

@ -24,7 +24,7 @@
{
this.folderList = Data.folderList;
this.processText = ko.computed(function () {
this.loading = ko.computed(function () {
var
bLoading = Data.foldersLoading(),
@ -33,44 +33,11 @@
bRenaming = Data.foldersRenaming()
;
if (bCreating)
{
return Translator.i18n('SETTINGS_FOLDERS/CREATING_PROCESS');
}
else if (bDeleting)
{
return Translator.i18n('SETTINGS_FOLDERS/DELETING_PROCESS');
}
else if (bRenaming)
{
return Translator.i18n('SETTINGS_FOLDERS/RENAMING_PROCESS');
}
else if (bLoading)
{
return Translator.i18n('SETTINGS_FOLDERS/LOADING_PROCESS');
}
return '';
return bLoading || bCreating || bDeleting || bRenaming;
}, this);
this.visibility = ko.computed(function () {
return '' === this.processText() ? 'hidden' : 'visible';
}, this);
this.folderForDeletion = ko.observable(null).extend({'falseTimeout': 3000}).extend({'toggleSubscribe': [this,
function (oPrev) {
if (oPrev)
{
oPrev.deleteAccess(false);
}
}, function (oNext) {
if (oNext)
{
oNext.deleteAccess(true);
}
}
]});
this.folderForDeletion = ko.observable(null).deleteAccessHelper();
this.folderForEdit = ko.observable(null).extend({'toggleSubscribe': [this,
function (oPrev) {

14
dev/Settings/User/OpenPgp.js
View file

@ -23,19 +23,7 @@
this.openpgpkeysPublic = PgpStore.openpgpkeysPublic;
this.openpgpkeysPrivate = PgpStore.openpgpkeysPrivate;
this.openPgpKeyForDeletion = ko.observable(null).extend({'falseTimeout': 3000}).extend({'toggleSubscribe': [this,
function (oPrev) {
if (oPrev)
{
oPrev.deleteAccess(false);
}
}, function (oNext) {
if (oNext)
{
oNext.deleteAccess(true);
}
}
]});
this.openPgpKeyForDeletion = ko.observable(null).deleteAccessHelper();
}
OpenPgpUserSettings.prototype.addOpenPgpKey = function ()

7
dev/Storage/User/Data.js
View file

@ -64,6 +64,13 @@
this.foldersDeleting = ko.observable(false);
this.foldersRenaming = ko.observable(false);
this.foldersListWithSingleInboxRootFolder = ko.computed(function () {
var aList = this.folderList();
return !_.find(aList, function (oFolder) {
return oFolder && !oFolder.isSystemFolder() && oFolder.visible();
});
}, this);
this.foldersChanging = ko.computed(function () {
var
bLoading = this.foldersLoading(),

8
dev/Styles/FolderList.less
View file

@ -165,6 +165,14 @@
.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 {
display: none;
}
&.single-root-inbox .i-am-inbox-wrapper > .b-sub-folders .e-item .e-link {
padding-left: @folderItemPadding;
}
}
html.rl-left-panel-disabled {

4
dev/Styles/_BootstrapFix.less
View file

@ -73,6 +73,10 @@ select {
line-height: 11px;
}
.btn.btn-thin {
padding: 3px 9px;
}
.btn.btn-ellipsis {
text-overflow: ellipsis;
overflow: hidden;

1
dev/View/Popup/Template.js
View file

@ -116,7 +116,6 @@
if (this.editor)
{
this.editor.setPlain('', false);
this.editor.setReadOnly(true);
}
};

2
dev/View/User/MailBox/FolderList.js
View file

@ -43,6 +43,8 @@
this.folderListSystem = Data.folderListSystem;
this.foldersChanging = Data.foldersChanging;
this.foldersListWithSingleInboxRootFolder = Data.foldersListWithSingleInboxRootFolder;
this.leftPanelDisabled = Globals.leftPanelDisabled;
this.iDropOverTimer = 0;

2
package.json
View file

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

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

@ -81,7 +81,6 @@ class Template
public function SetPopulateAlways($bPopulateAlways)
{
$this->bPopulateAlways = !!$bPopulateAlways;
}
/**
@ -123,12 +122,18 @@ class Template
}
}
return array(
$aResult = array(
'ID' => $this->Id(),
'Name' => $this->Name(),
'Populated' => $bPopulated,
'Body' => $sBody
);
if ($bAjax)
{
$aResult['Populated'] = $bPopulated;
}
return $aResult;
}
/**

3
rainloop/v/0.0.0/app/templates/Views/User/MailFolderList.html
View file

@ -1,4 +1,5 @@
<div class="b-folders g-ui-user-select-none thm-folders" data-bind="css: {'focused': folderList.focused}">
<div class="b-folders g-ui-user-select-none thm-folders" data-bind="css: {'focused': folderList.focused,
'single-root-inbox': foldersListWithSingleInboxRootFolder}">
<div class="b-toolbar btn-toolbar">
<a class="btn buttonCompose pull-left" data-tooltip-placement="bottom"
data-bind="click: composeClick, tooltip: 'FOLDER_LIST/BUTTON_COMPOSE', css: {'btn-warning': composeInEdit}">

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

@ -1,8 +1,8 @@
<div class="e-item" data-bind="visible: visible">
<div class="e-item" data-bind="visible: visible, css: { 'i-am-inbox-wrapper': isInbox }">
<a class="e-link" data-bind="droppable: function (oEvent, oUi) { $root.messagesDrop($data, oUi); },
droppableOver: function (oEvent, oUi) { $root.messagesDropOver($data, oUi); },
droppableOut: function (oEvent, oUi) { $root.messagesDropOut($data, oUi); },
css: { 'selected': selected() && !isSystemFolder(), 'selectable': selectableForFolderList, 'hidden' : hidden, 'print-count': hasUnreadMessages, 'unread-sub': hasSubScribedUnreadMessagesSubfolders, 'system': isSystemFolder, 'anim-action-class': actionBlink }">
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="name" data-bind="text: name"></span>

13
rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html
View file

@ -59,7 +59,7 @@
<div class="message-fixed-button-toolbar clearfix" data-bind="visible: message">
<nobr>
<div class="btn-group colored-toggle pull-right">
<div class="btn-group pull-right">
<a class="btn btn-dark-disabled-border buttonReply" data-tooltip-placement="bottom"
data-bind="visible: 'reply' === lastReplyAction(), command: replyCommand, tooltip: 'MESSAGE/BUTTON_REPLY'">
<i class="icon-reply"></i>
@ -182,6 +182,17 @@
<i class="icon-pencil icon-white"></i>
</a>
</div>
<!-- <div class="btn-group pull-right" data-bind="visible: true" style="margin-right: 5px">
<a class="btn btn-thin" data-tooltip-placement="bottom">
<i class="icon-left-middle"></i>
</a>
<a class="btn btn-thin" data-tooltip-placement="bottom">
<b>1 / 4</b>
</a>
<a class="btn btn-thin" data-tooltip-placement="bottom">
<i class="icon-right-middle"></i>
</a>
</div>-->
</nobr>
</div>

9
rainloop/v/0.0.0/app/templates/Views/User/SettingsFilters.html
View file

@ -2,6 +2,8 @@
<div class="form-horizontal">
<div class="legend">
<span class="i18n" data-i18n-text="SETTINGS_FILTERS/LEGEND_FILTERS"></span>
&nbsp;&nbsp;&nbsp;
<i class="icon-spinner animated" style="margin-top: 5px" data-bind="visible: filters.loading"></i>
</div>
</div>
<div class="row" data-bind="visible: inited() && !serverError()">
@ -46,13 +48,10 @@
</div>
</div>
</div>
<br />
<br />
<div class="row">
<div class="span8">
<div class="process-place g-ui-user-select-none" data-bind="style: {'visibility': visibility }">
<i class="icon-spinner animated"></i>
&nbsp;&nbsp;
<span data-bind="text: processText"></span>
</div>
<div class="control-group" data-bind="css: {'error': filterRaw.error}, visible: inited() && filterRaw.allow() && filterRaw.active()">
<div class="controls">
<pre style="word-break: break-word;" data-bind="visible: '' !== filterRaw.capa()">

10
rainloop/v/0.0.0/app/templates/Views/User/SettingsFolders.html
View file

@ -2,6 +2,8 @@
<div class="form-horizontal">
<div class="legend">
<span class="i18n" data-i18n-text="SETTINGS_FOLDERS/LEGEND_FOLDERS"></span>
&nbsp;&nbsp;&nbsp;
<i class="icon-spinner animated" style="margin-top: 5px" data-bind="visible: loading"></i>
</div>
</div>
<a class="btn" data-bind="click: createFolder">
@ -24,11 +26,9 @@
<button type="button" class="close" data-bind="click: function () { folderList.error(''); }">&times;</button>
<span data-bind="text: folderList.error"></span>
</div>
<div class="process-place" data-bind="style: {'visibility': visibility }">
<i class="icon-spinner animated"></i>
&nbsp;&nbsp;
<span data-bind="text: processText"></span>
</div>
<br />
<br />
<br />
<table class="table table-hover list-table" data-bind="i18nUpdate: folderList">
<colgroup>
<col />

10
rainloop/v/0.0.0/app/templates/Views/User/SettingsTemplates.html
View file

@ -2,6 +2,8 @@
<div class="form-horizontal">
<div class="legend">
<span class="i18n" data-i18n-text="SETTINGS_TEMPLATES/LEGEND_TEMPLATES"></span>
&nbsp;&nbsp;&nbsp;
<i class="icon-spinner animated" style="margin-top: 5px" data-bind="visible: templates.loading"></i>
</div>
</div>
<a class="btn" data-bind="click: addNewTemplate">
@ -9,11 +11,9 @@
&nbsp;&nbsp;
<span class="i18n" data-i18n-text="SETTINGS_TEMPLATES/BUTTON_ADD_TEMPLATE"></span>
</a>
<div class="process-place" data-bind="style: {'visibility': visibility }">
<i class="icon-spinner animated"></i>
&nbsp;&nbsp;
<span data-bind="text: processText"></span>
</div>
<br />
<br />
<br />
<table class="table table-hover list-table templates-list" data-bind="i18nUpdate: templates">
<colgroup>
<col />

78
rainloop/v/0.0.0/static/ckeditor/plugins/signature/plugin.js
View file

@ -1,10 +1,18 @@
rl_signature_replacer = function (editor, sText, sSignature, bHtml, bInsertBefore)
{
if (!bHtml)
{
sText = sText
.replace(/\u200C\u200C/g, '\u0002\u0002')
.replace(/\u200D\u200D/g, '\u0003\u0003')
;
}
var
sTextWithoutSignature = sText
.replace(/\u0002\u0002[\s\S]*\u0003\u0003/gm, '')
.replace(/\u0004\u0004[\s\S]*\u0005\u0005/gm, ''),
.replace(/\u0002\u0002[\s\S]*\u0002\u0002/gm, '')
.replace(/\u0003\u0003[\s\S]*\u0003\u0003/gm, ''),
bEmptyText = '' === $.trim(sTextWithoutSignature),
sNewLine = (bHtml ? '<br />' : "\n")
;
@ -16,23 +24,31 @@ rl_signature_replacer = function (editor, sText, sSignature, bHtml, bInsertBefor
if (!/\u0002\u0002/gm.test(sText))
{
sText = "\u0002\u0002\u0003\u0003" + sText;
sText = "\u0002\u0002\u0002\u0002" + sText;
}
if (!/\u0004\u0004/gm.test(sText))
if (!/\u0003\u0003/gm.test(sText))
{
sText = sText + "\u0004\u0004\u0005\u0005";
sText = sText + "\u0003\u0003\u0003\u0003";
}
if (bInsertBefore)
{
sText = sText.replace(/\u0002\u0002[\s\S]*\u0003\u0003/gm, "\u0002\u0002" + sSignature + sNewLine + "\u0003\u0003");
sText = sText.replace(/\u0004\u0004[\s\S]*\u0005\u0005/gm, "\u0004\u0004\u0005\u0005");
sText = sText.replace(/\u0002\u0002[\s\S]*\u0002\u0002/gm, "\u0002\u0002" + sSignature + (bEmptyText ? '' : sNewLine) + "\u0002\u0002");
sText = sText.replace(/\u0003\u0003[\s\S]*\u0003\u0003/gm, "\u0003\u0003\u0003\u0003");
}
else
{
sText = sText.replace(/\u0002\u0002[\s\S]*\u0003\u0003/gm, "\u0002\u0002\u0003\u0003");
sText = sText.replace(/\u0004\u0004[\s\S]*\u0005\u0005/gm, "\u0004\u0004" + (bEmptyText ? '' : sNewLine) + sSignature + "\u0005\u0005");
sText = sText.replace(/\u0002\u0002[\s\S]*\u0002\u0002/gm, "\u0002\u0002\u0002\u0002");
sText = sText.replace(/\u0003\u0003[\s\S]*\u0003\u0003/gm, "\u0003\u0003" + (bEmptyText ? '' : sNewLine) + sSignature + "\u0003\u0003");
}
if (!bHtml)
{
sText = sText
.replace(/\u0002\u0002/g, '\u200C\u200C')
.replace(/\u0003\u0003/g, '\u200D\u200D')
;
}
return sText;
@ -42,40 +58,58 @@ CKEDITOR.plugins.add('signature', {
init: function(editor) {
editor.addCommand('insertSignature', {
modes: { wysiwyg: 1, plain: 1 },
exec: function (editor, cfg) {
exec: function (editor, cfg)
{
var
bIsHtml = false,
bInsertBefore = false,
sSignature = ''
sSignature = '',
sResultSignature = ''
;
if (cfg) {
if (cfg)
{
bIsHtml = undefined === cfg.isHtml ? false : !!cfg.isHtml;
bInsertBefore = undefined === cfg.insertBefore ? false : !!cfg.insertBefore;
sSignature = undefined === cfg.signature ? '' : cfg.signature;
}
try {
if ('plain' === editor.mode && editor.__plain && editor.__plainUtils) {
if (bIsHtml && editor.__plainUtils.htmlToPlain) {
sSignature = editor.__plainUtils.htmlToPlain(sSignature);
sResultSignature = sSignature;
try
{
if ('plain' === editor.mode && editor.__plain && editor.__plainUtils)
{
if (editor.__plainUtils && editor.__plainUtils.htmlToPlain)
{
if (bIsHtml)
{
sResultSignature = editor.__plainUtils.htmlToPlain(sResultSignature);
}
}
editor.__plain.setRawData(
rl_signature_replacer(editor,
editor.__plain.getRawData(), sSignature, false, bInsertBefore));
editor.__plain.getRawData(), sResultSignature, false, bInsertBefore));
} else {
if (!bIsHtml && editor.__plainUtils && editor.__plainUtils.plainToHtml) {
sSignature = editor.__plainUtils.plainToHtml(sSignature);
}
else
{
if (editor.__plainUtils && editor.__plainUtils.plainToHtml)
{
if (!bIsHtml)
{
sResultSignature = editor.__plainUtils.plainToHtml(sResultSignature);
}
}
editor.setData(
rl_signature_replacer(editor,
editor.getData(), sSignature, true, bInsertBefore));
editor.getData(), sResultSignature, true, bInsertBefore));
}
} catch (e) {}
}
catch (e) {}
}
});
}

78
vendors/ckeditor-plugins/signature/plugin.js vendored
View file

@ -1,10 +1,18 @@
rl_signature_replacer = function (editor, sText, sSignature, bHtml, bInsertBefore)
{
if (!bHtml)
{
sText = sText
.replace(/\u200C\u200C/g, '\u0002\u0002')
.replace(/\u200D\u200D/g, '\u0003\u0003')
;
}
var
sTextWithoutSignature = sText
.replace(/\u0002\u0002[\s\S]*\u0003\u0003/gm, '')
.replace(/\u0004\u0004[\s\S]*\u0005\u0005/gm, ''),
.replace(/\u0002\u0002[\s\S]*\u0002\u0002/gm, '')
.replace(/\u0003\u0003[\s\S]*\u0003\u0003/gm, ''),
bEmptyText = '' === $.trim(sTextWithoutSignature),
sNewLine = (bHtml ? '<br />' : "\n")
;
@ -16,23 +24,31 @@ rl_signature_replacer = function (editor, sText, sSignature, bHtml, bInsertBefor
if (!/\u0002\u0002/gm.test(sText))
{
sText = "\u0002\u0002\u0003\u0003" + sText;
sText = "\u0002\u0002\u0002\u0002" + sText;
}
if (!/\u0004\u0004/gm.test(sText))
if (!/\u0003\u0003/gm.test(sText))
{
sText = sText + "\u0004\u0004\u0005\u0005";
sText = sText + "\u0003\u0003\u0003\u0003";
}
if (bInsertBefore)
{
sText = sText.replace(/\u0002\u0002[\s\S]*\u0003\u0003/gm, "\u0002\u0002" + sSignature + sNewLine + "\u0003\u0003");
sText = sText.replace(/\u0004\u0004[\s\S]*\u0005\u0005/gm, "\u0004\u0004\u0005\u0005");
sText = sText.replace(/\u0002\u0002[\s\S]*\u0002\u0002/gm, "\u0002\u0002" + sSignature + (bEmptyText ? '' : sNewLine) + "\u0002\u0002");
sText = sText.replace(/\u0003\u0003[\s\S]*\u0003\u0003/gm, "\u0003\u0003\u0003\u0003");
}
else
{
sText = sText.replace(/\u0002\u0002[\s\S]*\u0003\u0003/gm, "\u0002\u0002\u0003\u0003");
sText = sText.replace(/\u0004\u0004[\s\S]*\u0005\u0005/gm, "\u0004\u0004" + (bEmptyText ? '' : sNewLine) + sSignature + "\u0005\u0005");
sText = sText.replace(/\u0002\u0002[\s\S]*\u0002\u0002/gm, "\u0002\u0002\u0002\u0002");
sText = sText.replace(/\u0003\u0003[\s\S]*\u0003\u0003/gm, "\u0003\u0003" + (bEmptyText ? '' : sNewLine) + sSignature + "\u0003\u0003");
}
if (!bHtml)
{
sText = sText
.replace(/\u0002\u0002/g, '\u200C\u200C')
.replace(/\u0003\u0003/g, '\u200D\u200D')
;
}
return sText;
@ -42,40 +58,58 @@ CKEDITOR.plugins.add('signature', {
init: function(editor) {
editor.addCommand('insertSignature', {
modes: { wysiwyg: 1, plain: 1 },
exec: function (editor, cfg) {
exec: function (editor, cfg)
{
var
bIsHtml = false,
bInsertBefore = false,
sSignature = ''
sSignature = '',
sResultSignature = ''
;
if (cfg) {
if (cfg)
{
bIsHtml = undefined === cfg.isHtml ? false : !!cfg.isHtml;
bInsertBefore = undefined === cfg.insertBefore ? false : !!cfg.insertBefore;
sSignature = undefined === cfg.signature ? '' : cfg.signature;
}
try {
if ('plain' === editor.mode && editor.__plain && editor.__plainUtils) {
if (bIsHtml && editor.__plainUtils.htmlToPlain) {
sSignature = editor.__plainUtils.htmlToPlain(sSignature);
sResultSignature = sSignature;
try
{
if ('plain' === editor.mode && editor.__plain && editor.__plainUtils)
{
if (editor.__plainUtils && editor.__plainUtils.htmlToPlain)
{
if (bIsHtml)
{
sResultSignature = editor.__plainUtils.htmlToPlain(sResultSignature);
}
}
editor.__plain.setRawData(
rl_signature_replacer(editor,
editor.__plain.getRawData(), sSignature, false, bInsertBefore));
editor.__plain.getRawData(), sResultSignature, false, bInsertBefore));
} else {
if (!bIsHtml && editor.__plainUtils && editor.__plainUtils.plainToHtml) {
sSignature = editor.__plainUtils.plainToHtml(sSignature);
}
else
{
if (editor.__plainUtils && editor.__plainUtils.plainToHtml)
{
if (!bIsHtml)
{
sResultSignature = editor.__plainUtils.plainToHtml(sResultSignature);
}
}
editor.setData(
rl_signature_replacer(editor,
editor.getData(), sSignature, true, bInsertBefore));
editor.getData(), sResultSignature, true, bInsertBefore));
}
} catch (e) {}
}
catch (e) {}
}
});
}