small fixes

This commit is contained in:
RainLoop Team 2014-02-27 19:34:05 +04:00
parent 0f856b421c
commit ca84bbb807
7 changed files with 41 additions and 8 deletions

View file

@ -7,6 +7,7 @@ function MessageModel()
{
this.folderFullNameRaw = '';
this.uid = '';
this.hash = '';
this.requestHash = '';
this.subject = ko.observable('');
this.size = ko.observable(0);
@ -221,6 +222,7 @@ MessageModel.prototype.clear = function ()
{
this.folderFullNameRaw = '';
this.uid = '';
this.hash = '';
this.requestHash = '';
this.subject('');
this.size(0);
@ -302,6 +304,7 @@ MessageModel.prototype.initByJson = function (oJsonMessage)
{
this.folderFullNameRaw = oJsonMessage.Folder;
this.uid = oJsonMessage.Uid;
this.hash = oJsonMessage.Hash;
this.requestHash = oJsonMessage.RequestHash;
this.size(Utils.pInt(oJsonMessage.Size));
@ -788,6 +791,7 @@ MessageModel.prototype.populateByMessageListItem = function (oMessage)
{
this.folderFullNameRaw = oMessage.folderFullNameRaw;
this.uid = oMessage.uid;
this.hash = oMessage.hash;
this.requestHash = oMessage.requestHash;
this.subject(oMessage.subject());
this.size(oMessage.size());

View file

@ -744,7 +744,7 @@ WebMailDataStorage.prototype.setMessage = function (oData, bCached)
oMessagesBodiesDom = oMessagesBodiesDom && oMessagesBodiesDom[0] ? oMessagesBodiesDom : null;
if (oMessagesBodiesDom)
{
sId = 'rl-' + oMessage.requestHash.replace(/[^a-zA-Z0-9]/g, '');
sId = 'rl-mgs-' + oMessage.hash.replace(/[^a-zA-Z0-9]/g, '');
oTextBody = oMessagesBodiesDom.find('#' + sId);
if (!oTextBody || !oTextBody[0])
{

View file

@ -481,7 +481,9 @@ MailBoxMessageListViewModel.prototype.onMessageResponse = function (sResult, oDa
{
var oRainLoopData = RL.data();
oRainLoopData.hideMessageBodies();
oRainLoopData.messageLoading(false);
if (Enums.StorageResultType.Success === sResult && oData && oData.Result)
{
oRainLoopData.setMessage(oData, bCached);