Skip to content

Commit 294914f

Browse files
zombieFoxzombieFox
committed
[refactor] improve string handling
1 parent ef64359 commit 294914f

12 files changed

Lines changed: 115 additions & 84 deletions

File tree

‎src/js/background.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ var background = (function() {
172172

173173
render.feedback = {
174174
init: function() {
175-
if (state.get.current().background.image.file.name != "") {
175+
if (helper.checkValueString(state.get.current().background.image.file.name)) {
176176
render.feedback.current();
177177
} else {
178178
render.feedback.empty();

‎src/js/bookmarks.js‎

Lines changed: 27 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var bookmarks = (function() {
1111
show: true
1212
},
1313
items: [{
14-
visual:{
14+
visual: {
1515
display: "icon",
1616
letter: "AS",
1717
image: null,
@@ -53,7 +53,7 @@ var bookmarks = (function() {
5353
searchMatch: false,
5454
timeStamp: 1546453104010
5555
}, {
56-
visual:{
56+
visual: {
5757
display: "letter",
5858
letter: "AZ",
5959
image: null,
@@ -95,7 +95,7 @@ var bookmarks = (function() {
9595
searchMatch: false,
9696
timeStamp: 1546453107633
9797
}, {
98-
visual:{
98+
visual: {
9999
display: "letter",
100100
letter: "GM",
101101
image: null,
@@ -137,7 +137,7 @@ var bookmarks = (function() {
137137
searchMatch: false,
138138
timeStamp: 1546453110265
139139
}, {
140-
visual:{
140+
visual: {
141141
display: "icon",
142142
letter: "R",
143143
image: null,
@@ -179,7 +179,7 @@ var bookmarks = (function() {
179179
searchMatch: false,
180180
timeStamp: 1546453111491
181181
}, {
182-
visual:{
182+
visual: {
183183
display: "icon",
184184
letter: "N",
185185
image: null,
@@ -221,7 +221,7 @@ var bookmarks = (function() {
221221
searchMatch: false,
222222
timeStamp: 1546453104460
223223
}, {
224-
visual:{
224+
visual: {
225225
display: "letter",
226226
letter: "DR",
227227
image: null,
@@ -272,7 +272,7 @@ var bookmarks = (function() {
272272
show: true
273273
},
274274
items: [{
275-
visual:{
275+
visual: {
276276
display: "icon",
277277
letter: "DEV",
278278
image: null,
@@ -314,7 +314,7 @@ var bookmarks = (function() {
314314
searchMatch: false,
315315
timeStamp: 1546453101749
316316
}, {
317-
visual:{
317+
visual: {
318318
display: "icon",
319319
letter: "GIT",
320320
image: null,
@@ -387,34 +387,30 @@ var bookmarks = (function() {
387387

388388
mod.add = {
389389
link: function(data) {
390-
if (data.position.group.new) {
391-
mod.add.group({
392-
position: {
393-
origin: null,
394-
destination: data.position.destination.group
395-
},
396-
group: {
397-
name: {
398-
text: data.position.group.name.text,
399-
show: data.position.group.name.show
400-
},
401-
openAll: {
402-
show: data.position.group.openAll.show
390+
if (data) {
391+
if (data.position.group.new) {
392+
mod.add.group({
393+
position: {
394+
origin: null,
395+
destination: data.position.destination.group
403396
},
404-
items: []
405-
}
406-
});
397+
group: {
398+
name: {
399+
text: data.position.group.name.text,
400+
show: data.position.group.name.show
401+
},
402+
openAll: {
403+
show: data.position.group.openAll.show
404+
},
405+
items: []
406+
}
407+
});
408+
};
409+
mod.all[data.position.destination.group].items.splice(data.position.destination.item, 0, data.link);
407410
};
408-
mod.all[data.position.destination.group].items.splice(data.position.destination.item, 0, data.link);
409411
},
410412
group: function(data) {
411413
if (data) {
412-
if (data.group.name.text == null) {
413-
data.group.name.text = "";
414-
};
415-
if (typeof data.group.name.text == "string") {
416-
data.group.name.text = data.group.name.text.trim();
417-
};
418414
mod.all.splice(data.position.destination, 0, data.group);
419415
};
420416
}

‎src/js/clock.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,9 @@ var clock = (function() {
112112
};
113113
if (state.get.current().header.clock.separator.show) {
114114
var separatorCharacter;
115-
if (typeof state.get.current().header.clock.separator.text == "string" && state.get.current().header.clock.separator.text != "") {
116-
separatorCharacter = state.get.current().header.clock.separator.text.trim().replace(/\s\s+/g, " ");
117-
};
118-
if (separatorCharacter == "" || separatorCharacter == " " || separatorCharacter == undefined) {
115+
if (helper.checkValueString(state.get.current().header.clock.separator.text)) {
116+
separatorCharacter = helper.trimString(state.get.current().header.clock.separator.text);
117+
} else {
119118
separatorCharacter = ":";
120119
};
121120
var parts = clock.querySelectorAll("span");

‎src/js/control.js‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2225,8 +2225,25 @@ var control = (function() {
22252225
path: "header.search.engine.custom.queryName",
22262226
type: "text",
22272227
func: function() {
2228-
console.log("hit");
2228+
header.render.item.clear();
2229+
header.render.item.all();
2230+
header.render.search.width.size();
2231+
greeting.render.clear();
2232+
greeting.render.all();
2233+
clock.render.clear();
2234+
clock.render.all();
2235+
transitional.render.clear();
2236+
transitional.render.all();
2237+
date.render.clear();
2238+
date.render.all();
2239+
render.class();
2240+
render.dependents();
2241+
render.update.control.header();
2242+
bind.control.header();
22292243
search.render.engine();
2244+
search.bind.input();
2245+
search.bind.clear();
2246+
dropdown.bind.editAdd();
22302247
}
22312248
}, {
22322249
element: ".control-header-search-text-justify-left",

‎src/js/date.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,10 @@ var date = (function() {
129129
};
130130
if (state.get.current().header.date.separator.show) {
131131
var separatorCharacter;
132-
if (typeof state.get.current().header.date.separator.text == "string" && state.get.current().header.date.separator.text != "") {
133-
separatorCharacter = state.get.current().header.date.separator.text.trim().replace(/\s\s+/g, " ");
134-
};
135-
if (separatorCharacter == "" || separatorCharacter == " " || separatorCharacter == undefined) {
136-
separatorCharacter = "/";
132+
if (helper.checkValueString(state.get.current().header.date.separator.text)) {
133+
separatorCharacter = helper.trimString(state.get.current().header.date.separator.text);
134+
} else {
135+
separatorCharacter = ":";
137136
};
138137
var parts = date.querySelectorAll("span");
139138
if (parts.length > 1) {

‎src/js/greeting.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ var greeting = (function() {
3737
}
3838
};
3939
var string = message[state.get.current().header.greeting.type]();
40-
if (state.get.current().header.greeting.name != "" && state.get.current().header.greeting.name != undefined) {
41-
string = string + ", " + state.get.current().header.greeting.name;
40+
if (helper.checkValueString(state.get.current().header.greeting.name)) {
41+
string = string + ", " + helper.trimString(state.get.current().header.greeting.name)
4242
};
4343
var greetingItem = helper.node("span|class:greeting-item");
4444
var greetingItemText = helper.node("span:" + string + "|class:greeting-item-text");

‎src/js/header.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,8 +373,8 @@ var header = (function() {
373373
var headerSearchBody = helper.node("div|class:search-wrapper");
374374
var form = helper.node("form|class:search,action,method:get");
375375
var searchInput;
376-
if (typeof state.get.current().header.search.engine.custom.queryName == "string" && state.get.current().header.search.engine.custom.queryName != "") {
377-
searchInput = helper.node("input|class:search-input,type:search,placeholder:Find or Search,name:" + state.get.current().header.search.engine.custom.queryName.trim() + ",autocomplete:off,autocorrect:off,autocapitalize:off,spellcheck:false,tabindex:1");
376+
if (helper.checkValueString(state.get.current().header.search.engine.custom.queryName)) {
377+
searchInput = helper.node("input|class:search-input,type:search,placeholder:Find or Search,name:" + helper.trimString(state.get.current().header.search.engine.custom.queryName) + ",autocomplete:off,autocorrect:off,autocapitalize:off,spellcheck:false,tabindex:1");
378378
} else {
379379
searchInput = helper.node("input|class:search-input,type:search,placeholder:Find or Search,name:q,autocomplete:off,autocorrect:off,autocapitalize:off,spellcheck:false,tabindex:1");
380380
};

‎src/js/helper.js‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -767,6 +767,25 @@ var helper = (function() {
767767
};
768768
};
769769

770+
var checkValueString = function(value) {
771+
var result = false;
772+
if (typeof value == "string") {
773+
value = value.trim().replace(/\s/g, "");
774+
if (value != "") {
775+
result = true;
776+
};
777+
};
778+
return result;
779+
};
780+
781+
var trimString = function(value) {
782+
if (typeof value == "string") {
783+
return value.trim().replace(/\s\s+/g, " ");
784+
} else {
785+
return value;
786+
};
787+
};
788+
770789
// exposed methods
771790
return {
772791
e: e,
@@ -792,7 +811,9 @@ var helper = (function() {
792811
ordinalNumber: ordinalNumber,
793812
isJsonString: isJsonString,
794813
isHexNumber: isHexNumber,
795-
convertColor: convertColor
814+
convertColor: convertColor,
815+
checkValueString: checkValueString,
816+
trimString: trimString
796817
};
797818

798819
})();

‎src/js/layout.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ var layout = (function() {
2424

2525
render.title = function() {
2626
var title = helper.e("title");
27-
if (typeof state.get.current().layout.title == "string" && state.get.current().layout.title != "") {
28-
title.textContent = state.get.current().layout.title.trim().replace(/\s\s+/g, " ");
27+
if (helper.checkValueString(state.get.current().layout.title)) {
28+
title.textContent = helper.trimString(state.get.current().layout.title);
2929
} else {
3030
title.textContent = "New tab";
3131
};

‎src/js/link.js‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ var link = (function() {
709709
});
710710

711711
groupHeader.appendChild(groupHeaderItemControl);
712-
if (stagedGroup.group.name.show && stagedGroup.group.name.text.replace(/\s/g, "") != "") {
712+
if (stagedGroup.group.name.show && helper.checkValueString(stagedGroup.group.name.text)) {
713713
helper.addClass(groupHeader, "group-header-name");
714714
groupHeader.appendChild(groupHeaderItemName);
715715
};
@@ -916,7 +916,7 @@ var link = (function() {
916916
value: "link-item"
917917
}]
918918
};
919-
if (stagedLink.link.accent.by == "custom" || stagedLink.link.color.by == "custom" || (stagedLink.link.image != null && typeof stagedLink.link.image == "string" && stagedLink.link.image != "")) {
919+
if (stagedLink.link.accent.by == "custom" || stagedLink.link.color.by == "custom" || helper.checkValueString(stagedLink.link.image)) {
920920
linkItemOptions.attr.push({
921921
key: "style",
922922
value: ""
@@ -940,8 +940,8 @@ var link = (function() {
940940
"--link-item-color: " + stagedLink.link.color.rgb.r + ", " + stagedLink.link.color.rgb.g + ", " + stagedLink.link.color.rgb.b + ";" +
941941
"--link-item-color-focus-hover: " + stagedLink.link.color.rgb.r + ", " + stagedLink.link.color.rgb.g + ", " + stagedLink.link.color.rgb.b + ";";
942942
};
943-
if (stagedLink.link.image != null && stagedLink.link.image != "") {
944-
linkItemOptions.attr[1].value = linkItemOptions.attr[1].value + "--link-image-url: url(" + stagedLink.link.image.trim() + ");"
943+
if (helper.checkValueString(stagedLink.link.image)) {
944+
linkItemOptions.attr[1].value = linkItemOptions.attr[1].value + "--link-image-url: url(" + helper.trimString(stagedLink.link.image) + ");"
945945
};
946946
};
947947
var linkItem = helper.makeNode(linkItemOptions);
@@ -993,15 +993,17 @@ var link = (function() {
993993
value: "link-display-image"
994994
}, {
995995
key: "style",
996-
value: "--link-display-image-url: url(" + stagedLink.link.visual.image.trim() + ")"
996+
value: "--link-display-image-url: url(" + helper.trimString(stagedLink.link.visual.image) + ")"
997997
}]
998998
});
999999
};
1000-
var nameText = "";
1001-
if (typeof stagedLink.link.name == "string" && stagedLink.link.name != "") {
1002-
nameText = stagedLink.link.name.trim().replace(/\s\s+/g, " ");
1000+
1001+
var linkDisplayName;
1002+
if (helper.checkValueString(stagedLink.link.name)) {
1003+
linkDisplayName = helper.node("p:" + helper.trimString(stagedLink.link.name) + "|class:link-display-name");
1004+
} else {
1005+
linkDisplayName = helper.node("p|class:link-display-name");
10031006
};
1004-
var linkDisplayName = helper.node("p:" + nameText + "|class:link-display-name");
10051007

10061008
var linkUrl = helper.node("div|class:link-url");
10071009
var url = "";
@@ -1043,11 +1045,11 @@ var link = (function() {
10431045
linkDisplay.appendChild(linkDisplayVisual);
10441046
};
10451047

1046-
if (stagedLink.link.name != null && stagedLink.link.name != "") {
1048+
if (helper.checkValueString(stagedLink.link.name)) {
10471049
linkDisplay.appendChild(linkDisplayName);
10481050
};
10491051

1050-
if (stagedLink.link.image != null && stagedLink.link.image != "") {
1052+
if (helper.checkValueString(stagedLink.link.image)) {
10511053
linkPanelFront.appendChild(linkImage);
10521054
};
10531055
linkPanelFront.appendChild(linkDisplay);
@@ -2898,7 +2900,7 @@ var link = (function() {
28982900
useStagedLink: true
28992901
});
29002902
var heading;
2901-
if (stagedLink.link.name != null && stagedLink.link.name != "") {
2903+
if (helper.checkValueString(stagedLink.link.name)) {
29022904
heading = "Edit " + stagedLink.link.name;
29032905
} else {
29042906
heading = "Edit unnamed bookmark";
@@ -3003,7 +3005,7 @@ var link = (function() {
30033005
stagedLink.link = JSON.parse(JSON.stringify(copyStagedLink.link));
30043006
stagedLink.position = JSON.parse(JSON.stringify(copyStagedLink.position));
30053007
var heading;
3006-
if (stagedLink.link.name != null && stagedLink.link.name != "") {
3008+
if (helper.checkValueString(stagedLink.link.name)) {
30073009
heading = "Remove " + stagedLink.link.name;
30083010
} else {
30093011
heading = "Remove unnamed bookmark";

0 commit comments

Comments
 (0)