Fix semver comparison in palette editor

This commit is contained in:
Nick O'Leary 2021-02-27 21:58:05 +00:00
parent 7be7dec19a
commit 3dc696b2a9
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
1 changed files with 16 additions and 29 deletions

View File

@ -34,62 +34,49 @@ RED.palette.editor = (function() {
var semverre = /^(?<major>\d+)(\.(?<minor>\d+))?(\.(?<patch>\d+))?(-(?<pre>[0-9A-Za-z-]+))?(\.(?<build>[0-9A-Za-z-.]+))?$/;
var NUMBERS_ONLY = /^\d+$/;
function SemVerPart ( part ) {
function SemVerPart(part) {
this.number = 0;
this.text = part;
if ( NUMBERS_ONLY.test( toe ) )
{
this.number = parseInt( part );
if ( NUMBERS_ONLY.test(part)){
this.number = parseInt(part);
this.type = "N";
} else
{
} else {
this.type = part == undefined || part.length < 1 ? "E" : "T";
}
}
SemVerPart.prototype.compare = function ( other ) {
const types = this.type + other.type;
switch ( types )
{
SemVerPart.prototype.compare = function(other) {
var types = this.type + other.type;
switch ( types ) {
case "EE": return 0;
case "NT":
case "TE":
case "EN": return -1;
case "NN": return this.number - other.number;
case "TT": return this.text.localeCompare( other.text );
case "ET":
case "TN":
case "NE": return 1;
}
};
function SemVer ( ver ) {
const groups = ver.match( semverre ).groups;
function SemVer(ver) {
var groups = ver.match( semverre ).groups;
this.parts = [ new SemVerPart( groups.major ), new SemVerPart( groups.minor ), new SemVerPart( groups.patch ), new SemVerPart( groups.pre ), new SemVerPart( groups.build ) ];
}
SemVer.prototype.compare = function ( other ) {
let result = 0;
for ( let i = 0, n = this.parts.length; result == 0 && i < n; i++ )
{
SemVer.prototype.compare = function(other) {
var result = 0;
for ( var i = 0, n = this.parts.length; result == 0 && i < n; i++ ) {
result = this.parts[ i ].compare( other.parts[ i ] );
}
return result;
};
function semVerCompare ( ver1, ver2 ) {
const semver1 = new SemVer( ver1 );
const semver2 = new SemVer( ver2 );
const result = semver1.compare( semver2 );
function semVerCompare(ver1, ver2) {
var semver1 = new SemVer(ver1);
var semver2 = new SemVer(ver2);
var result = semver1.compare(semver2);
return result;
}