extern/nightTab
1
0
Fork 0
mirror of https://github.com/zombieFox/nightTab.git synced 2025-01-25 07:19:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

[refactor] improve string handling

Browse Source
This commit is contained in:
zombieFox 2020-06-13 11:06:29 +01:00
parent 3317489845
commit ce68335117
2 changed files with 43 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/js/link.js
View File

@ -977,25 +977,12 @@ var link = (function() {
var linkDisplayIcon = null; var linkDisplayIcon = null;
var linkDisplayImage = null; var linkDisplayImage = null;
if (stagedLink.link.visual.display == "letter") { if (stagedLink.link.visual.display == "letter" && helper.checkIfValidString(stagedLink.link.visual.letter)) {
var letterText = stagedLink.link.visual.letter; linkDisplayLetter = helper.node("p:" + helper.trimString(stagedLink.link.visual.letter) + "|class:link-display-letter");
if (letterText == null) { } else if (stagedLink.link.visual.display == "icon" && helper.checkIfValidString(stagedLink.link.visual.icon.prefix) && helper.checkIfValidString(stagedLink.link.visual.icon.name)) {
letterText = "";
};
linkDisplayLetter = helper.node("p:" + letterText + "|class:link-display-letter");
} else if (stagedLink.link.visual.display == "icon" && stagedLink.link.visual.icon.prefix != null && stagedLink.link.visual.icon.name != null) {
linkDisplayIcon = helper.node("div|class:link-display-icon " + stagedLink.link.visual.icon.prefix + " fa-" + stagedLink.link.visual.icon.name); linkDisplayIcon = helper.node("div|class:link-display-icon " + stagedLink.link.visual.icon.prefix + " fa-" + stagedLink.link.visual.icon.name);
} else if (stagedLink.link.visual.display == "image" && stagedLink.link.visual.image != null && typeof stagedLink.link.visual.image == "string") { } else if (stagedLink.link.visual.display == "image" && helper.checkIfValidString(stagedLink.link.visual.image)) {
linkDisplayImage = helper.makeNode({ linkDisplayImage = helper.node("div|class:link-display-image,style:--link-display-image-url: url(" + helper.trimString(stagedLink.link.visual.image) + ")");
tag: "div",
attr: [{
key: "class",
value: "link-display-image"
}, {
key: "style",
value: "--link-display-image-url: url(" + helper.trimString(stagedLink.link.visual.image) + ")"
}]
});
}; };
var linkDisplayName; var linkDisplayName;
@ -1006,9 +993,11 @@ var link = (function() {
}; };
var linkUrl = helper.node("div|class:link-url"); var linkUrl = helper.node("div|class:link-url");
var url = ""; var url;
if (stagedLink.link.url != null) { if (helper.checkIfValidString(stagedLink.link.url)) {
url = stagedLink.link.url.replace(/^https?\:\/\//i, "").replace(/\/$/, ""); url = helper.trimString(stagedLink.link.url.replace(/^https?\:\/\//i, "").replace(/\/+$/, ""));
} else {
url = "";
}; };
var linkUrlText = helper.makeNode({ var linkUrlText = helper.makeNode({
tag: "p", tag: "p",
@ -1650,7 +1639,8 @@ var link = (function() {
displayImageInput.removeAttribute("disabled"); displayImageInput.removeAttribute("disabled");
helper.removeClass(displayImageHelperItem, "disabled"); helper.removeClass(displayImageHelperItem, "disabled");
}; };
if (stagedLink.link.visual.icon.name != null && stagedLink.link.visual.icon.prefix != null && stagedLink.link.visual.icon.label != null) {
if (helper.checkIfValidString(stagedLink.link.visual.icon.prefix) && helper.checkIfValidString(stagedLink.link.visual.icon.name) && helper.checkIfValidString(stagedLink.link.visual.icon.label)) {
displayIconFormGroupText.appendChild(helper.node("span|class:link-form-icon " + stagedLink.link.visual.icon.prefix + " fa-" + stagedLink.link.visual.icon.name)); displayIconFormGroupText.appendChild(helper.node("span|class:link-form-icon " + stagedLink.link.visual.icon.prefix + " fa-" + stagedLink.link.visual.icon.name));
}; };
displayLetterInput.value = stagedLink.link.visual.letter; displayLetterInput.value = stagedLink.link.visual.letter;
@ -1707,22 +1697,20 @@ var link = (function() {
colorRgbBRange.setAttribute("disabled", ""); colorRgbBRange.setAttribute("disabled", "");
colorRgbBNumber.setAttribute("disabled", ""); colorRgbBNumber.setAttribute("disabled", "");
}; };
if (stagedLink.link.color.rgb.r != null && stagedLink.link.color.rgb.g != null && stagedLink.link.color.rgb.b != null) { colorColorPicker.value = helper.convertColor.rgb.hex(stagedLink.link.color.rgb);
colorColorPicker.value = helper.convertColor.rgb.hex(stagedLink.link.color.rgb); colorColorHex.value = helper.convertColor.rgb.hex(stagedLink.link.color.rgb);
colorColorHex.value = helper.convertColor.rgb.hex(stagedLink.link.color.rgb); colorHslHRange.value = stagedLink.link.color.hsl.h;
colorHslHRange.value = stagedLink.link.color.hsl.h; colorHslHNumber.value = stagedLink.link.color.hsl.h;
colorHslHNumber.value = stagedLink.link.color.hsl.h; colorHslSRange.value = stagedLink.link.color.hsl.s;
colorHslSRange.value = stagedLink.link.color.hsl.s; colorHslSNumber.value = stagedLink.link.color.hsl.s;
colorHslSNumber.value = stagedLink.link.color.hsl.s; colorHslLRange.value = stagedLink.link.color.hsl.l;
colorHslLRange.value = stagedLink.link.color.hsl.l; colorHslLNumber.value = stagedLink.link.color.hsl.l;
colorHslLNumber.value = stagedLink.link.color.hsl.l; colorRgbRRange.value = stagedLink.link.color.rgb.r;
colorRgbRRange.value = stagedLink.link.color.rgb.r; colorRgbRNumber.value = stagedLink.link.color.rgb.r;
colorRgbRNumber.value = stagedLink.link.color.rgb.r; colorRgbGRange.value = stagedLink.link.color.rgb.g;
colorRgbGRange.value = stagedLink.link.color.rgb.g; colorRgbGNumber.value = stagedLink.link.color.rgb.g;
colorRgbGNumber.value = stagedLink.link.color.rgb.g; colorRgbBRange.value = stagedLink.link.color.rgb.b;
colorRgbBRange.value = stagedLink.link.color.rgb.b; colorRgbBNumber.value = stagedLink.link.color.rgb.b;
colorRgbBNumber.value = stagedLink.link.color.rgb.b;
};
if (stagedLink.link.accent.by == "custom") { if (stagedLink.link.accent.by == "custom") {
accentThemeRadio.checked = false; accentThemeRadio.checked = false;
accentCustomRadio.checked = true; accentCustomRadio.checked = true;
@ -1772,22 +1760,20 @@ var link = (function() {
accentRgbBRange.setAttribute("disabled", ""); accentRgbBRange.setAttribute("disabled", "");
accentRgbBNumber.setAttribute("disabled", ""); accentRgbBNumber.setAttribute("disabled", "");
}; };
if (stagedLink.link.accent.rgb.r != null && stagedLink.link.accent.rgb.g != null && stagedLink.link.accent.rgb.b != null) { accentColorPicker.value = helper.convertColor.rgb.hex(stagedLink.link.accent.rgb);
accentColorPicker.value = helper.convertColor.rgb.hex(stagedLink.link.accent.rgb); accentColorHex.value = helper.convertColor.rgb.hex(stagedLink.link.accent.rgb);
accentColorHex.value = helper.convertColor.rgb.hex(stagedLink.link.accent.rgb); accentHslHRange.value = stagedLink.link.accent.hsl.h;
accentHslHRange.value = stagedLink.link.accent.hsl.h; accentHslHNumber.value = stagedLink.link.accent.hsl.h;
accentHslHNumber.value = stagedLink.link.accent.hsl.h; accentHslSRange.value = stagedLink.link.accent.hsl.s;
accentHslSRange.value = stagedLink.link.accent.hsl.s; accentHslSNumber.value = stagedLink.link.accent.hsl.s;
accentHslSNumber.value = stagedLink.link.accent.hsl.s; accentHslLRange.value = stagedLink.link.accent.hsl.l;
accentHslLRange.value = stagedLink.link.accent.hsl.l; accentHslLNumber.value = stagedLink.link.accent.hsl.l;
accentHslLNumber.value = stagedLink.link.accent.hsl.l; accentRgbRRange.value = stagedLink.link.accent.rgb.r;
accentRgbRRange.value = stagedLink.link.accent.rgb.r; accentRgbRNumber.value = stagedLink.link.accent.rgb.r;
accentRgbRNumber.value = stagedLink.link.accent.rgb.r; accentRgbGRange.value = stagedLink.link.accent.rgb.g;
accentRgbGRange.value = stagedLink.link.accent.rgb.g; accentRgbGNumber.value = stagedLink.link.accent.rgb.g;
accentRgbGNumber.value = stagedLink.link.accent.rgb.g; accentRgbBRange.value = stagedLink.link.accent.rgb.b;
accentRgbBRange.value = stagedLink.link.accent.rgb.b; accentRgbBNumber.value = stagedLink.link.accent.rgb.b;
accentRgbBNumber.value = stagedLink.link.accent.rgb.b;
};
imageInput.value = stagedLink.link.image; imageInput.value = stagedLink.link.image;
}; };

6
src/js/search.js
View File

@ -43,13 +43,13 @@ var search = (function() {
}, },
get: function() { get: function() {
var searchInput = helper.e(".search-input"); var searchInput = helper.e(".search-input");
var string = searchInput.value.toLowerCase().replace(/\s/g, ""); var string = helper.trimString(searchInput.value).toLowerCase();
if (state.get.current().search) { if (state.get.current().search) {
bookmarks.get().forEach(function(arrayItem, index) { bookmarks.get().forEach(function(arrayItem, index) {
arrayItem.items.forEach(function(arrayItem, index) { arrayItem.items.forEach(function(arrayItem, index) {
var matchUrl = (arrayItem.url != null) && (arrayItem.url.replace(/^https?\:\/\//i, "").replace(/\/$/, "").toLowerCase().includes(string));
var matchName = (arrayItem.name != null) && (arrayItem.name.toLowerCase().replace(/\s/g, "").includes(string));
arrayItem.searchMatch = false; arrayItem.searchMatch = false;
var matchUrl = helper.checkIfValidString(arrayItem.url) && (arrayItem.url.toLowerCase().includes(string));
var matchName = helper.checkIfValidString(arrayItem.name) && (helper.trimString(arrayItem.name).toLowerCase().includes(string));
if (matchUrl || matchName) { if (matchUrl || matchName) {
arrayItem.searchMatch = true; arrayItem.searchMatch = true;
}; };