mirror of
https://github.com/Jermolene/TiddlyWiki5
synced 2025-02-02 12:19:11 +00:00
another suggestion
in case of equal versions, use the incoming and replace the existing.
This commit is contained in:
parent
5f50f9b29d
commit
9fad60beb3
10
boot/boot.js
10
boot/boot.js
@ -364,22 +364,18 @@ $tw.utils.checkVersions = function(versionStringA,versionStringB) {
|
|||||||
var defaultVersion = {
|
var defaultVersion = {
|
||||||
major: 0,
|
major: 0,
|
||||||
minor: 0,
|
minor: 0,
|
||||||
patch: 0,
|
patch: 0
|
||||||
build: 0
|
|
||||||
},
|
},
|
||||||
versionA = $tw.utils.parseVersion(versionStringA) || defaultVersion,
|
versionA = $tw.utils.parseVersion(versionStringA) || defaultVersion,
|
||||||
versionB = $tw.utils.parseVersion(versionStringB) || defaultVersion,
|
versionB = $tw.utils.parseVersion(versionStringB) || defaultVersion,
|
||||||
diff = [
|
diff = [
|
||||||
versionA.major - versionB.major,
|
versionA.major - versionB.major,
|
||||||
versionA.minor - versionB.minor,
|
versionA.minor - versionB.minor,
|
||||||
versionA.patch - versionB.patch,
|
versionA.patch - versionB.patch
|
||||||
versionA.build - versionB.build
|
|
||||||
];
|
];
|
||||||
return (diff[0] > 0) ||
|
return (diff[0] > 0) ||
|
||||||
(diff[0] === 0 && diff[1] > 0) ||
|
(diff[0] === 0 && diff[1] > 0) ||
|
||||||
(diff[0] === 0 && diff[1] === 0 && diff[2] > 0) ||
|
(diff[0] === 0 && diff[1] === 0 && diff[2] > 0);
|
||||||
(diff[0] === 0 && diff[1] === 0 && diff[2] === 0 && diff[3] > 0) ||
|
|
||||||
(diff[0] === 0 && diff[1] === 0 && diff[2] === 0 && diff[3] === 0);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
Reference in New Issue
Block a user