mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-08-07 22:33:50 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1249 from felixhayashi/patch-1

Browse Source 
make checkVersions consider build version
This commit is contained in:
Jeremy Ruston 2014-12-24 12:43:30 +00:00
commit 7abe9aa53d
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
boot/boot.js
View File

@ -362,21 +362,20 @@ Returns true if the version string A is greater than the version string B. Retur
*/ */
$tw.utils.checkVersions = function(versionStringA,versionStringB) { $tw.utils.checkVersions = function(versionStringA,versionStringB) {
var defaultVersion = { var defaultVersion = {
major: 0, major: 0,
minor: 0, minor: 0,
patch: 0 patch: 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
]; ];
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);
}; };
/* /*
@ -1966,4 +1965,4 @@ if(typeof(exports) !== "undefined") {
exports.TiddlyWiki = _boot; exports.TiddlyWiki = _boot;
} else { } else {
_boot(window.$tw); _boot(window.$tw);
} }