Skip to content

Commit 8bb24e7

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

File tree

11 files changed

+44
-44
lines changed

11 files changed

+44
-44
lines changed

‎src/js/auto-suggest.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ var autoSuggest = (function(){
153153
document.removeEventListener("keydown",bind.navigateResults,false);
154154
},
155155
clickOut: function(event){
156-
if(!(event.target.classList.contains("auto-suggest"))&&!(event.target.classList.contains("auto-suggest-list"))&&!(event.target.classList.contains("auto-suggest-input"))){
156+
if(!(event.target.classList.contains("auto-suggest"))&&!(event.target.classList.contains("auto-suggest-list"))&&!(event.target.classList.contains("auto-suggest-input"))){
157157
render.close();
158158
};
159159
}
@@ -239,29 +239,29 @@ var autoSuggest = (function(){
239239
};
240240

241241
render.suggestItems=function(){
242-
varsearchTerm=_currentInputOptions.input.value.replace(/^\s+/,"").replace(/\s+$/,"").toLowerCase();
242+
varsearchTerm=helper.trimString(_currentInputOptions.input.value);
243243
varaction={
244244
fontawesomeIcon: function(){
245-
if(searchTerm==""||searchTerm==undefined){
246-
returnfontawesome.icons;
247-
}else{
245+
if(helper.checkIfValidString(searchTerm)){
248246
returnfontawesome.icons.filter(function(item){
249247
varmatch=false;
250-
if(item.name.toLowerCase().includes(searchTerm)||item.label.toLowerCase().includes(searchTerm)){
248+
if(item.name.toLowerCase().includes(searchTerm.toLowerCase())||item.label.toLowerCase().includes(searchTerm.toLowerCase())){
251249
match=true;
252250
};
253251
item.search.forEach(function(item,index){
254-
if(item.toLowerCase().includes(searchTerm)){
252+
if(item.toLowerCase().includes(searchTerm.toLowerCase())){
255253
match=true;
256254
};
257255
});
258256
item.styles.forEach(function(item,index){
259-
if(item.toLowerCase().includes(searchTerm)){
257+
if(item.toLowerCase().includes(searchTerm.toLowerCase())){
260258
match=true;
261259
};
262260
});
263261
returnmatch;
264262
});
263+
}else{
264+
returnfontawesome.icons;
265265
};
266266
}
267267
};

‎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(helper.checkValueString(state.get.current().background.image.file.name)){
175+
if(helper.checkIfValidString(state.get.current().background.image.file.name)){
176176
render.feedback.current();
177177
}else{
178178
render.feedback.empty();

‎src/js/clock.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ var clock = (function(){
112112
};
113113
if(state.get.current().header.clock.separator.show){
114114
varseparatorCharacter;
115-
if(helper.checkValueString(state.get.current().header.clock.separator.text)){
115+
if(helper.checkIfValidString(state.get.current().header.clock.separator.text)){
116116
separatorCharacter=helper.trimString(state.get.current().header.clock.separator.text);
117117
}else{
118118
separatorCharacter=":";

‎src/js/date.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ var date = (function(){
129129
};
130130
if(state.get.current().header.date.separator.show){
131131
varseparatorCharacter;
132-
if(helper.checkValueString(state.get.current().header.date.separator.text)){
132+
if(helper.checkIfValidString(state.get.current().header.date.separator.text)){
133133
separatorCharacter=helper.trimString(state.get.current().header.date.separator.text);
134134
}else{
135135
separatorCharacter=":";

‎src/js/greeting.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ var greeting = (function(){
3737
}
3838
};
3939
varstring=message[state.get.current().header.greeting.type]();
40-
if(helper.checkValueString(state.get.current().header.greeting.name)){
40+
if(helper.checkIfValidString(state.get.current().header.greeting.name)){
4141
string=string+", "+helper.trimString(state.get.current().header.greeting.name)
4242
};
4343
vargreetingItem=helper.node("span|class:greeting-item");

‎src/js/header.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ var header = (function(){
373373
varheaderSearchBody=helper.node("div|class:search-wrapper");
374374
varform=helper.node("form|class:search,action,method:get");
375375
varsearchInput;
376-
if(helper.checkValueString(state.get.current().header.search.engine.custom.queryName)){
376+
if(helper.checkIfValidString(state.get.current().header.search.engine.custom.queryName)){
377377
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");

‎src/js/helper.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,7 @@ var helper = (function(){
767767
};
768768
};
769769

770-
varcheckValueString=function(value){
770+
varcheckIfValidString=function(value){
771771
varresult=false;
772772
if(typeofvalue=="string"){
773773
value=value.trim().replace(/\s/g,"");
@@ -812,7 +812,7 @@ var helper = (function(){
812812
isJsonString: isJsonString,
813813
isHexNumber: isHexNumber,
814814
convertColor: convertColor,
815-
checkValueString: checkValueString,
815+
checkIfValidString: checkIfValidString,
816816
trimString: trimString
817817
};
818818

‎src/js/layout.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var layout = (function(){
2424

2525
render.title=function(){
2626
vartitle=helper.e("title");
27-
if(helper.checkValueString(state.get.current().layout.title)){
27+
if(helper.checkIfValidString(state.get.current().layout.title)){
2828
title.textContent=helper.trimString(state.get.current().layout.title);
2929
}else{
3030
title.textContent="New tab";

‎src/js/link.js‎

Lines changed: 17 additions & 17 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&&helper.checkValueString(stagedGroup.group.name.text)){
712+
if(stagedGroup.group.name.show&&helper.checkIfValidString(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"||helper.checkValueString(stagedLink.link.image)){
919+
if(stagedLink.link.accent.by=="custom"||stagedLink.link.color.by=="custom"||helper.checkIfValidString(stagedLink.link.image)){
920920
linkItemOptions.attr.push({
921921
key: "style",
922922
value: ""
@@ -940,7 +940,7 @@ 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(helper.checkValueString(stagedLink.link.image)){
943+
if(helper.checkIfValidString(stagedLink.link.image)){
944944
linkItemOptions.attr[1].value=linkItemOptions.attr[1].value+"--link-image-url: url("+helper.trimString(stagedLink.link.image)+");"
945945
};
946946
};
@@ -999,7 +999,7 @@ var link = (function(){
999999
};
10001000

10011001
varlinkDisplayName;
1002-
if(helper.checkValueString(stagedLink.link.name)){
1002+
if(helper.checkIfValidString(stagedLink.link.name)){
10031003
linkDisplayName=helper.node("p:"+helper.trimString(stagedLink.link.name)+"|class:link-display-name");
10041004
}else{
10051005
linkDisplayName=helper.node("p|class:link-display-name");
@@ -1045,11 +1045,11 @@ var link = (function(){
10451045
linkDisplay.appendChild(linkDisplayVisual);
10461046
};
10471047

1048-
if(helper.checkValueString(stagedLink.link.name)){
1048+
if(helper.checkIfValidString(stagedLink.link.name)){
10491049
linkDisplay.appendChild(linkDisplayName);
10501050
};
10511051

1052-
if(helper.checkValueString(stagedLink.link.image)){
1052+
if(helper.checkIfValidString(stagedLink.link.image)){
10531053
linkPanelFront.appendChild(linkImage);
10541054
};
10551055
linkPanelFront.appendChild(linkDisplay);
@@ -1556,10 +1556,10 @@ var link = (function(){
15561556
if(bookmarks.get().length>0){
15571557
bookmarks.get().forEach(function(arrayItem,index){
15581558
varname;
1559-
if(arrayItem.name.text==null||arrayItem.name.text==""){
1560-
name="Unnamed group "+(index+1);
1561-
}else{
1559+
if(helper.checkIfValidString(arrayItem.name.text)){
15621560
name=arrayItem.name.text;
1561+
}else{
1562+
name="Unnamed group "+(index+1);
15631563
};
15641564
varoption=helper.makeNode({
15651565
tag: "option",
@@ -2900,7 +2900,7 @@ var link = (function(){
29002900
useStagedLink: true
29012901
});
29022902
varheading;
2903-
if(helper.checkValueString(stagedLink.link.name)){
2903+
if(helper.checkIfValidString(stagedLink.link.name)){
29042904
heading="Edit "+stagedLink.link.name;
29052905
}else{
29062906
heading="Edit unnamed bookmark";
@@ -2954,10 +2954,10 @@ var link = (function(){
29542954
useStagedGroup: true
29552955
});
29562956
varheading;
2957-
if(stagedGroup.group.name.text==null||stagedGroup.group.name.text==""){
2958-
heading="Edit unnamed group "+(stagedGroup.position.origin+1);
2959-
}else{
2957+
if(helper.checkIfValidString(stagedGroup.group.name.text)){
29602958
heading="Edit "+stagedGroup.group.name.text;
2959+
}else{
2960+
heading="Edit unnamed group "+(stagedGroup.position.origin+1);
29612961
};
29622962
varsuccessAction=function(){
29632963
varcopyStagedGroup=JSON.parse(JSON.stringify(stagedGroup));
@@ -3005,7 +3005,7 @@ var link = (function(){
30053005
stagedLink.link=JSON.parse(JSON.stringify(copyStagedLink.link));
30063006
stagedLink.position=JSON.parse(JSON.stringify(copyStagedLink.position));
30073007
varheading;
3008-
if(helper.checkValueString(stagedLink.link.name)){
3008+
if(helper.checkIfValidString(stagedLink.link.name)){
30093009
heading="Remove "+stagedLink.link.name;
30103010
}else{
30113011
heading="Remove unnamed bookmark";
@@ -3052,10 +3052,10 @@ var link = (function(){
30523052
stagedGroup.group=JSON.parse(JSON.stringify(copyStagedGroup.group));
30533053
stagedGroup.position=JSON.parse(JSON.stringify(copyStagedGroup.position));
30543054
varheading;
3055-
if(stagedGroup.group.name.text==null||stagedGroup.group.name.text==""){
3056-
heading="Remove unnamed group "+(stagedGroup.position.origin+1);
3057-
}else{
3055+
if(helper.checkIfValidString(stagedGroup.group.name.text)){
30583056
heading="Remove "+stagedGroup.group.name.text;
3057+
}else{
3058+
heading="Remove unnamed group "+(stagedGroup.position.origin+1);
30593059
};
30603060
varsuccessAction=function(){
30613061
varcopyStagedGroup=JSON.parse(JSON.stringify(stagedGroup));

‎src/js/search.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ var search = (function(){
144144

145145
render.check=function(){
146146
varsearchInput=helper.e(".search-input");
147-
if(helper.checkValueString(searchInput.value)){
147+
if(helper.checkIfValidString(searchInput.value)){
148148
mod.searching.open();
149149
}else{
150150
mod.searching.close();

0 commit comments

Comments
(0)