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

Remove reply counter (Closes #227, Closes #221, Closes #202)

Browse source
This commit is contained in:
RainLoop Team 2014-07-17 17:45:57 +04:00
parent cb58103c23
commit cf80b8f21b
5 changed files with 85 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

28
dev/Common/Utils.js
View file

@ -433,12 +433,38 @@ Utils.removeSelection = function ()
}; };
/** /**
* @param {string} sPrefix
* @param {string} sSubject
* @return {string}
*/
Utils.replySubjectAdd = function (sPrefix, sSubject)
{
var
oMatch = null,
sResult = Utils.trim(sSubject)
;
if (null !== (oMatch = (new window.RegExp('^' + sPrefix + '[\\s]?\\:(.*)$', 'gi')).exec(sSubject)) && !Utils.isUnd(oMatch[1]) ||
null !== (oMatch = (new window.RegExp('^' + sPrefix + '[\\s]?[\\[\\(][\\d]+[\\]\\)][\\s]?\\:(.*)$', 'gi')).exec(sSubject)) && !Utils.isUnd(oMatch[1]))
{
sResult = sPrefix + ': ' + Utils.trim(oMatch[1]);
}
else
{
sResult = sPrefix + ': ' + sSubject;
}
return sResult.replace(/[\s]+/g, ' ');
};
/**
* @deprecated
* @param {string} sPrefix * @param {string} sPrefix
* @param {string} sSubject * @param {string} sSubject
* @param {boolean=} bFixLongSubject = true * @param {boolean=} bFixLongSubject = true
* @return {string} * @return {string}
*/ */
Utils.replySubjectAdd = function (sPrefix, sSubject, bFixLongSubject) Utils._replySubjectAdd_ = function (sPrefix, sSubject, bFixLongSubject)
{ {
var var
oMatch = null, oMatch = null,

28
rainloop/v/0.0.0/static/js/admin.js
View file

@ -1231,12 +1231,38 @@ Utils.removeSelection = function ()
}; };
/** /**
* @param {string} sPrefix
* @param {string} sSubject
* @return {string}
*/
Utils.replySubjectAdd = function (sPrefix, sSubject)
{
var
oMatch = null,
sResult = Utils.trim(sSubject)
;
if (null !== (oMatch = (new window.RegExp('^' + sPrefix + '[\\s]?\\:(.*)$', 'gi')).exec(sSubject)) && !Utils.isUnd(oMatch[1]) ||
null !== (oMatch = (new window.RegExp('^' + sPrefix + '[\\s]?[\\[\\(][\\d]+[\\]\\)][\\s]?\\:(.*)$', 'gi')).exec(sSubject)) && !Utils.isUnd(oMatch[1]))
{
sResult = sPrefix + ': ' + Utils.trim(oMatch[1]);
}
else
{
sResult = sPrefix + ': ' + sSubject;
}
return sResult.replace(/[\s]+/g, ' ');
};
/**
* @deprecated
* @param {string} sPrefix * @param {string} sPrefix
* @param {string} sSubject * @param {string} sSubject
* @param {boolean=} bFixLongSubject = true * @param {boolean=} bFixLongSubject = true
* @return {string} * @return {string}
*/ */
Utils.replySubjectAdd = function (sPrefix, sSubject, bFixLongSubject) Utils._replySubjectAdd_ = function (sPrefix, sSubject, bFixLongSubject)
{ {
var var
oMatch = null, oMatch = null,

6
rainloop/v/0.0.0/static/js/admin.min.js vendored
View file

File diff suppressed because one or more lines are too long

28
rainloop/v/0.0.0/static/js/app.js
View file

@ -1234,12 +1234,38 @@ Utils.removeSelection = function ()
}; };
/** /**
* @param {string} sPrefix
* @param {string} sSubject
* @return {string}
*/
Utils.replySubjectAdd = function (sPrefix, sSubject)
{
var
oMatch = null,
sResult = Utils.trim(sSubject)
;
if (null !== (oMatch = (new window.RegExp('^' + sPrefix + '[\\s]?\\:(.*)$', 'gi')).exec(sSubject)) && !Utils.isUnd(oMatch[1]) ||
null !== (oMatch = (new window.RegExp('^' + sPrefix + '[\\s]?[\\[\\(][\\d]+[\\]\\)][\\s]?\\:(.*)$', 'gi')).exec(sSubject)) && !Utils.isUnd(oMatch[1]))
{
sResult = sPrefix + ': ' + Utils.trim(oMatch[1]);
}
else
{
sResult = sPrefix + ': ' + sSubject;
}
return sResult.replace(/[\s]+/g, ' ');
};
/**
* @deprecated
* @param {string} sPrefix * @param {string} sPrefix
* @param {string} sSubject * @param {string} sSubject
* @param {boolean=} bFixLongSubject = true * @param {boolean=} bFixLongSubject = true
* @return {string} * @return {string}
*/ */
Utils.replySubjectAdd = function (sPrefix, sSubject, bFixLongSubject) Utils._replySubjectAdd_ = function (sPrefix, sSubject, bFixLongSubject)
{ {
var var
oMatch = null, oMatch = null,

2
rainloop/v/0.0.0/static/js/app.min.js vendored
View file

File diff suppressed because one or more lines are too long