vitalif
/
likeopera-frontend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix two crashes

master
Vitaliy Filippov 2019-05-14 13:57:17 +03:00
parent 16ec9ec90b
commit 5433f05542
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
MessageView.js
View File

@ -12,19 +12,19 @@ class MessageView extends React.PureComponent
{
if (!(dt instanceof Date))
dt = new Date(dt.replace(' ', 'T'));
var h = dt.getHours();
var m = dt.getMinutes();
var s = dt.getSeconds();
return Util.WeekDays[dt.getDay()]+' '+dt.getDate()+' '+Util.Months[dt.getMonth()]+' '+dt.getFullYear()+' '+(h < 10 ? '0' : '')+h+':'+(m < 10 ? '0' : '')+m+':'+(s < 10 ? '0' : '')+s
//return dt.toLocaleString();
let h = dt.getHours();
let m = dt.getMinutes();
let s = dt.getSeconds();
return Util.WeekDays[dt.getDay()]+' '+dt.getDate()+' '+Util.Months[dt.getMonth()]+' '+
dt.getFullYear()+' '+(h < 10 ? '0' : '')+h+':'+(m < 10 ? '0' : '')+m+':'+(s < 10 ? '0' : '')+s;
}
componentWillReceiveProps(nextProps)
{
if (nextProps.msg != this.props.msg)
{
var ns = { showImages: false, blockedImages: false };
if (/<img[^>]*>/i.exec(nextProps.msg.body_html))
let ns = { showImages: false, blockedImages: false };
if (nextProps.msg && /<img[^>]*>/i.exec(nextProps.msg.body_html))
{
ns.blockedImages = true;
}
@ -39,9 +39,9 @@ class MessageView extends React.PureComponent
render()
{
var showImages = this.state.showImages;
var msg = this.props.msg;
var html;
let showImages = this.state.showImages;
let msg = this.props.msg;
let html;
if (msg)
{
html = msg.body_html;

6
Util.js
View File

@ -31,7 +31,7 @@ export default class Util
}
else if (dt.getTime() < tod.getTime())
{
return WeekDays[dt.getDay()]+' '+dt.getDate()+' '+Months[dt.getMonth()];
return Util.WeekDays[dt.getDay()]+' '+dt.getDate()+' '+Util.Months[dt.getMonth()];
}
var h = dt.getHours();
var m = dt.getMinutes();
@ -46,7 +46,7 @@ export default class Util
}
else if (k[0] == 'd')
{
return WeekDays[k.substr(1)%7];
return Util.WeekDays[k.substr(1)%7];
}
else if (k == 'pw')
{
@ -54,7 +54,7 @@ export default class Util
}
else if (k[0] == 'm')
{
return Months[k.substr(1)-1];
return Util.Months[k.substr(1)-1];
}
return k;
}