VAR/VAR.WebFormsCore
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix warnings on javascript code

Browse Source
This commit is contained in:
Valeriano A.R.
2018-03-18 13:39:35 +01:00
parent 2d22ea19a1
commit ca41a75fc5
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
VAR.Focus.Web/Scripts/05. Cards.js
View File

@@ -12,7 +12,7 @@ var Toolbox = function (cfg, container) {
this.StrKeyPosition = "Toolbox_" + cfg.IDBoard + "_Position"; this.StrKeyPosition = "Toolbox_" + cfg.IDBoard + "_Position";
try { try {
var pos = window.localStorage.getItem(this.StrKeyPosition); var pos = window.localStorage.getItem(this.StrKeyPosition);
if (pos && (typeof pos === "string")) { if (pos && typeof pos === "string") {
pos = JSON.parse(pos); pos = JSON.parse(pos);
this.X = parseInt(pos.X); this.X = parseInt(pos.X);
this.Y = parseInt(pos.Y); this.Y = parseInt(pos.Y);
@@ -250,7 +250,7 @@ Card.prototype = {
}, },
MoveFrame: function () { MoveFrame: function () {
if (this.animData) { if (this.animData) {
var f = ((+new Date()) - this.animData.startTime) / this.animData.time; var f = (+new Date() - this.animData.startTime) / this.animData.time;
if (f < 1.0) { if (f < 1.0) {
f = CosineInterpolation(f); f = CosineInterpolation(f);
f = CosineInterpolation(f); f = CosineInterpolation(f);
@@ -710,7 +710,7 @@ function RunCardBoard(cfg) {
var data = { var data = {
"IDBoard": cfg.IDBoard, "IDBoard": cfg.IDBoard,
"IDCardEvent": cfg.IDCardEvent, "IDCardEvent": cfg.IDCardEvent,
"TimePoolData": ((cfg.Connected === false) ? "0" : String(cfg.TimePoolData)), "TimePoolData": cfg.Connected === false ? "0" : String(cfg.TimePoolData),
"TimeStamp": new Date().getTime() "TimeStamp": new Date().getTime()
}; };
SendRequest(cfg.ServiceUrl, data, ReciveCardEventData, ErrorCardEventData); SendRequest(cfg.ServiceUrl, data, ReciveCardEventData, ErrorCardEventData);

13
VAR.Focus.Web/Scripts/10. Chat.js
View File

@@ -36,7 +36,8 @@
cfg.Minimized = false; cfg.Minimized = false;
} else { } else {
cfg.ScrollPosition = cfg.divChat.scrollTop; cfg.ScrollPosition = cfg.divChat.scrollTop;
cfg.ScrollOnRestore = (cfg.divChat.scrollTop > (cfg.divChat.scrollHeight - cfg.divChat.offsetHeight)); var scrollVisible = cfg.divChat.scrollHeight - cfg.divChat.offsetHeight;
cfg.ScrollOnRestore = cfg.divChat.scrollTop > scrollVisible;
cfg.divChatContainer.style.width = 0; cfg.divChatContainer.style.width = 0;
cfg.divChatContainer.style.height = 0; cfg.divChatContainer.style.height = 0;
cfg.divChatContainer.style.opacity = 0; cfg.divChatContainer.style.opacity = 0;
@@ -98,7 +99,8 @@
if (recvMsgs) { if (recvMsgs) {
var msgCount = 0; var msgCount = 0;
var scrollChat = false; var scrollChat = false;
if (cfg.Minimized === false && cfg.divChat.scrollTop > (cfg.divChat.scrollHeight - cfg.divChat.offsetHeight)) { var scrollVisible = cfg.divChat.scrollHeight - cfg.divChat.offsetHeight;
if (cfg.Minimized === false && cfg.divChat.scrollTop > scrollVisible) {
scrollChat = true; scrollChat = true;
} }
@@ -108,8 +110,8 @@
if (cfg.IDMessage < msg.IDMessage) { if (cfg.IDMessage < msg.IDMessage) {
cfg.IDMessage = msg.IDMessage; cfg.IDMessage = msg.IDMessage;
var elemMessage = CreateMessageDOM(msg, var elemMessage = CreateMessageDOM(msg,
(msg.UserName === cfg.UserName), msg.UserName === cfg.UserName,
(cfg.LastUser !== msg.UserName)); cfg.LastUser !== msg.UserName);
cfg.LastUser = msg.UserName; cfg.LastUser = msg.UserName;
frag.appendChild(elemMessage); frag.appendChild(elemMessage);
msgCount++; msgCount++;
@@ -149,10 +151,11 @@
}; };
// Pool data // Pool data
var isImmediate = cfg.FirstMessages || cfg.Connected === false;
var data = { var data = {
"IDMessageBoard": cfg.IDMessageBoard, "IDMessageBoard": cfg.IDMessageBoard,
"IDMessage": cfg.IDMessage, "IDMessage": cfg.IDMessage,
"TimePoolData": ((cfg.FirstMessages || cfg.Connected === false) ? "0" : String(cfg.TimePoolData)), "TimePoolData": isImmediate ? "0" : String(cfg.TimePoolData),
"TimeStamp": new Date().getTime() "TimeStamp": new Date().getTime()
}; };
SendRequest(cfg.ServiceUrl, data, ReciveChatData, ErrorChatData); SendRequest(cfg.ServiceUrl, data, ReciveChatData, ErrorChatData);