changeset 48c4aedeccdc in sao:default
details: https://hg.tryton.org/sao?cmd=changeset;node=48c4aedeccdc
description:
Compare date, datetime and number per value
issue9972
review309051002
diffstat:
src/common.js | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diffs (29 lines):
diff -r 3357e86c8ccd -r 48c4aedeccdc src/common.js
--- a/src/common.js Thu Feb 11 11:19:51 2021 +0100
+++ b/src/common.js Fri Feb 12 20:29:02 2021 +0100
@@ -26,11 +26,22 @@
return false;
}
for (var i = 0; i < arr1.length; i++) {
- if (arr1[i] instanceof Array && arr2[i] instanceof Array) {
- if (!Sao.common.compare(arr1[i], arr2[i])) {
+ var a = arr1[i], b = arr2[i];
+ if ((a instanceof Array) && (b instanceof Array)) {
+ if (!Sao.common.compare(a, b)) {
return false;
}
- } else if (arr1[i] != arr2[i]) {
+ } else if (moment.isMoment(a) && moment.isMoment(b)) {
+ if ((a.isDate != b.isDate) &&
+ (a.isDateTime != b.isDateTime) &&
+ (a.valueOf() != b.valueOf())) {
+ return false;
+ }
+ } else if ((a instanceof Number) || (b instanceof Number)) {
+ if (Number(a) !== Number(b)) {
+ return false;
+ }
+ } else if (a != b) {
return false;
}
}