This commit is contained in:
@@ -270,7 +270,7 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//A number already then parse and return
|
//A number already then parse and return
|
||||||
if (window.$gz._.isNumber(string)) {
|
if (this.isNumeric(string)) {
|
||||||
if (string === NaN) {
|
if (string === NaN) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -459,6 +459,13 @@ export default {
|
|||||||
while (start < end && str[start] === ch) ++start;
|
while (start < end && str[start] === ch) ++start;
|
||||||
while (end > start && str[end - 1] === ch) --end;
|
while (end > start && str[end - 1] === ch) --end;
|
||||||
return start > 0 || end < str.length ? str.substring(start, end) : str;
|
return start > 0 || end < str.length ? str.substring(start, end) : str;
|
||||||
|
},
|
||||||
|
///////////////////////////////////////////////
|
||||||
|
// is numeric replacement for lodash
|
||||||
|
// https://stackoverflow.com/a/52986361/8939
|
||||||
|
//
|
||||||
|
isNumeric: function(n) {
|
||||||
|
return !isNaN(parseFloat(n)) && isFinite(n);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -319,7 +319,7 @@ export default {
|
|||||||
break;
|
break;
|
||||||
case 8:
|
case 8:
|
||||||
case 7:
|
case 7:
|
||||||
if (!window.$gz._.isNumber(ret)) {
|
if (!window.$gz.util.isNumeric(ret)) {
|
||||||
ret = window.$gz.util.stringToFloat(ret);
|
ret = window.$gz.util.stringToFloat(ret);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -107,7 +107,7 @@ export default {
|
|||||||
methods: {
|
methods: {
|
||||||
addTag() {
|
addTag() {
|
||||||
let theTag = this.tagSearchEntry;
|
let theTag = this.tagSearchEntry;
|
||||||
theTag = this.normalizeTag(theTag);
|
theTag = window.$gz.util.normalizeTag(theTag);
|
||||||
//Maybe need to make sure there are no existing of the same tag? Although that shouldn't be possible technically
|
//Maybe need to make sure there are no existing of the same tag? Although that shouldn't be possible technically
|
||||||
this.sourcetags.push(theTag);
|
this.sourcetags.push(theTag);
|
||||||
this.value.push(theTag);
|
this.value.push(theTag);
|
||||||
@@ -115,11 +115,7 @@ export default {
|
|||||||
this.$emit("input", this.value);
|
this.$emit("input", this.value);
|
||||||
},
|
},
|
||||||
normalizeTag(tagName) {
|
normalizeTag(tagName) {
|
||||||
//kebab case takes care of all the things we need for tags in one go
|
return window.$gz.util.normalizeTag(tagName);
|
||||||
tagName = window.$gz._.kebabCase(tagName);
|
|
||||||
//No longer than 255 characters
|
|
||||||
tagName = tagName.length > 255 ? tagName.substr(0, 255 - 1) : tagName;
|
|
||||||
return tagName;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user