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

Release commit

Browse source
This commit is contained in:
RainLoop Team 2015-02-26 18:47:37 +04:00
parent 19f089d0bf
commit 053fd1c60b
5 changed files with 49 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dev/App/Admin.js
View file

@ -206,7 +206,9 @@
LicenseStore.licenseError('');
Remote.licensing(function (sResult, oData) {
LicenseStore.licensingProcess(false);
if (Enums.StorageResultType.Success === sResult && oData && oData.Result && Utils.isNormal(oData.Result['Expired']))
{
LicenseStore.licenseValid(true);

30
dev/Common/Utils.js
View file

@ -1548,36 +1548,6 @@
}
};
/**
* @param {string} sStr
* @return {string}
*/
Utils.FullHtmlEncode = function (sStr)
{
var
iIndex = 0,
sChr = '',
iChrCode = 0,
sResult = '';
;
for (iIndex = 0; iIndex < sStr.length; iIndex++)
{
sChr = sStr[iIndex];
if (-1 < Utils.inArray(sChr, ['&', '<', '>', '"', '`', '\'']))
{
sResult += _.escape(sChr);
}
else
{
iChrCode = sChr.charCodeAt(0);
sResult += (iChrCode > 128) ? '&#' + iChrCode + ';' : sChr;
}
}
return sResult;
};
/**
* @param {Object|Array} mObjectOrObjects
*/

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

@ -1170,6 +1170,8 @@
{
self.setSignatureFromIdentity(oIdentity);
}
self.setFocusInPopup();
});
}
else if (Enums.ComposeType.Empty === sComposeType)
@ -1192,6 +1194,8 @@
{
self.setSignatureFromIdentity(oIdentity);
}
self.setFocusInPopup();
});
}
else if (Utils.isNonEmptyArray(oMessageOrArray))
@ -1214,6 +1218,8 @@
{
self.setSignatureFromIdentity(oIdentity);
}
self.setFocusInPopup();
});
}
@ -1261,12 +1267,13 @@
this.resizerTrigger();
};
ComposePopupView.prototype.onShowWithDelay = function ()
ComposePopupView.prototype.setFocusInPopup = function ()
{
if (!Globals.bMobileDevice)
{
if ('' === this.to())
{
this.to.focused(false);
this.to.focused(true);
}
else if (this.oEditor)
@ -1274,7 +1281,11 @@
this.oEditor.focus();
}
}
};
ComposePopupView.prototype.onShowWithDelay = function ()
{
this.setFocusInPopup();
this.resizerTrigger();
};