[refactor] improve string handling

Author: zombieFox

src/js/background.js

@@ -172,7 +172,7 @@ var background = (function(){
 
 render.feedback={
 init: function(){
-if(state.get.current().background.image.file.name!=""){
+if(helper.checkValueString(state.get.current().background.image.file.name)){
 render.feedback.current();
 }else{
 render.feedback.empty();

src/js/bookmarks.js

@@ -11,7 +11,7 @@ var bookmarks = (function(){
 show: true
 },
 items: [{
-visual:{
+visual:{
 display: "icon",
 letter: "AS",
 image: null,
@@ -53,7 +53,7 @@ var bookmarks = (function(){
 searchMatch: false,
 timeStamp: 1546453104010
 },{
-visual:{
+visual:{
 display: "letter",
 letter: "AZ",
 image: null,
@@ -95,7 +95,7 @@ var bookmarks = (function(){
 searchMatch: false,
 timeStamp: 1546453107633
 },{
-visual:{
+visual:{
 display: "letter",
 letter: "GM",
 image: null,
@@ -137,7 +137,7 @@ var bookmarks = (function(){
 searchMatch: false,
 timeStamp: 1546453110265
 },{
-visual:{
+visual:{
 display: "icon",
 letter: "R",
 image: null,
@@ -179,7 +179,7 @@ var bookmarks = (function(){
 searchMatch: false,
 timeStamp: 1546453111491
 },{
-visual:{
+visual:{
 display: "icon",
 letter: "N",
 image: null,
@@ -221,7 +221,7 @@ var bookmarks = (function(){
 searchMatch: false,
 timeStamp: 1546453104460
 },{
-visual:{
+visual:{
 display: "letter",
 letter: "DR",
 image: null,
@@ -272,7 +272,7 @@ var bookmarks = (function(){
 show: true
 },
 items: [{
-visual:{
+visual:{
 display: "icon",
 letter: "DEV",
 image: null,
@@ -314,7 +314,7 @@ var bookmarks = (function(){
 searchMatch: false,
 timeStamp: 1546453101749
 },{
-visual:{
+visual:{
 display: "icon",
 letter: "GIT",
 image: null,
@@ -387,34 +387,30 @@ var bookmarks = (function(){
 
 mod.add={
 link: function(data){
-if(data.position.group.new){
-mod.add.group({
-position: {
-origin: null,
-destination: data.position.destination.group
-},
-group: {
-name: {
-text: data.position.group.name.text,
-show: data.position.group.name.show
-},
-openAll: {
-show: data.position.group.openAll.show
+if(data){
+if(data.position.group.new){
+mod.add.group({
+position: {
+origin: null,
+destination: data.position.destination.group
 },
-items: []
-}
-});
+group: {
+name: {
+text: data.position.group.name.text,
+show: data.position.group.name.show
+},
+openAll: {
+show: data.position.group.openAll.show
+},
+items: []
+}
+});
+};
+mod.all[data.position.destination.group].items.splice(data.position.destination.item,0,data.link);
 };
-mod.all[data.position.destination.group].items.splice(data.position.destination.item,0,data.link);
 },
 group: function(data){
 if(data){
-if(data.group.name.text==null){
-data.group.name.text="";
-};
-if(typeofdata.group.name.text=="string"){
-data.group.name.text=data.group.name.text.trim();
-};
 mod.all.splice(data.position.destination,0,data.group);
 };
 }

src/js/clock.js

@@ -112,10 +112,9 @@ var clock = (function(){
 };
 if(state.get.current().header.clock.separator.show){
 varseparatorCharacter;
-if(typeofstate.get.current().header.clock.separator.text=="string"&&state.get.current().header.clock.separator.text!=""){
-separatorCharacter=state.get.current().header.clock.separator.text.trim().replace(/\s\s+/g," ");
-};
-if(separatorCharacter==""||separatorCharacter==" "||separatorCharacter==undefined){
+if(helper.checkValueString(state.get.current().header.clock.separator.text)){
+separatorCharacter=helper.trimString(state.get.current().header.clock.separator.text);
+}else{
 separatorCharacter=":";
 };
 varparts=clock.querySelectorAll("span");

src/js/control.js

@@ -2225,8 +2225,25 @@ var control = (function(){
 path: "header.search.engine.custom.queryName",
 type: "text",
 func: function(){
-console.log("hit");
+header.render.item.clear();
+header.render.item.all();
+header.render.search.width.size();
+greeting.render.clear();
+greeting.render.all();
+clock.render.clear();
+clock.render.all();
+transitional.render.clear();
+transitional.render.all();
+date.render.clear();
+date.render.all();
+render.class();
+render.dependents();
+render.update.control.header();
+bind.control.header();
 search.render.engine();
+search.bind.input();
+search.bind.clear();
+dropdown.bind.editAdd();
 }
 },{
 element: ".control-header-search-text-justify-left",

src/js/date.js

@@ -129,11 +129,10 @@ var date = (function(){
 };
 if(state.get.current().header.date.separator.show){
 varseparatorCharacter;
-if(typeofstate.get.current().header.date.separator.text=="string"&&state.get.current().header.date.separator.text!=""){
-separatorCharacter=state.get.current().header.date.separator.text.trim().replace(/\s\s+/g," ");
-};
-if(separatorCharacter==""||separatorCharacter==" "||separatorCharacter==undefined){
-separatorCharacter="/";
+if(helper.checkValueString(state.get.current().header.date.separator.text)){
+separatorCharacter=helper.trimString(state.get.current().header.date.separator.text);
+}else{
+separatorCharacter=":";
 };
 varparts=date.querySelectorAll("span");
 if(parts.length>1){

src/js/greeting.js

@@ -37,8 +37,8 @@ var greeting = (function(){
 }
 };
 varstring=message[state.get.current().header.greeting.type]();
-if(state.get.current().header.greeting.name!=""&&state.get.current().header.greeting.name!=undefined){
-string=string+", "+state.get.current().header.greeting.name;
+if(helper.checkValueString(state.get.current().header.greeting.name)){
+string=string+", "+helper.trimString(state.get.current().header.greeting.name)
 };
 vargreetingItem=helper.node("span|class:greeting-item");
 vargreetingItemText=helper.node("span:"+string+"|class:greeting-item-text");

src/js/header.js

@@ -373,8 +373,8 @@ var header = (function(){
 varheaderSearchBody=helper.node("div|class:search-wrapper");
 varform=helper.node("form|class:search,action,method:get");
 varsearchInput;
-if(typeofstate.get.current().header.search.engine.custom.queryName=="string"&&state.get.current().header.search.engine.custom.queryName!=""){
-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");
+if(helper.checkValueString(state.get.current().header.search.engine.custom.queryName)){
+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");
 }else{
 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

@@ -767,6 +767,25 @@ var helper = (function(){
 };
 };
 
+varcheckValueString=function(value){
+varresult=false;
+if(typeofvalue=="string"){
+value=value.trim().replace(/\s/g,"");
+if(value!=""){
+result=true;
+};
+};
+returnresult;
+};
+
+vartrimString=function(value){
+if(typeofvalue=="string"){
+returnvalue.trim().replace(/\s\s+/g," ");
+}else{
+returnvalue;
+};
+};
+
 // exposed methods
 return{
 e: e,
@@ -792,7 +811,9 @@ var helper = (function(){
 ordinalNumber: ordinalNumber,
 isJsonString: isJsonString,
 isHexNumber: isHexNumber,
-convertColor: convertColor
+convertColor: convertColor,
+checkValueString: checkValueString,
+trimString: trimString
 };
 
 })();

src/js/layout.js

@@ -24,8 +24,8 @@ var layout = (function(){
 
 render.title=function(){
 vartitle=helper.e("title");
-if(typeofstate.get.current().layout.title=="string"&&state.get.current().layout.title!=""){
-title.textContent=state.get.current().layout.title.trim().replace(/\s\s+/g," ");
+if(helper.checkValueString(state.get.current().layout.title)){
+title.textContent=helper.trimString(state.get.current().layout.title);
 }else{
 title.textContent="New tab";
 };

src/js/link.js

@@ -709,7 +709,7 @@ var link = (function(){
 });
 
 groupHeader.appendChild(groupHeaderItemControl);
-if(stagedGroup.group.name.show&&stagedGroup.group.name.text.replace(/\s/g,"")!=""){
+if(stagedGroup.group.name.show&&helper.checkValueString(stagedGroup.group.name.text)){
 helper.addClass(groupHeader,"group-header-name");
 groupHeader.appendChild(groupHeaderItemName);
 };
@@ -916,7 +916,7 @@ var link = (function(){
 value: "link-item"
 }]
 };
-if(stagedLink.link.accent.by=="custom"||stagedLink.link.color.by=="custom"||(stagedLink.link.image!=null&&typeofstagedLink.link.image=="string"&&stagedLink.link.image!="")){
+if(stagedLink.link.accent.by=="custom"||stagedLink.link.color.by=="custom"||helper.checkValueString(stagedLink.link.image)){
 linkItemOptions.attr.push({
 key: "style",
 value: ""
@@ -940,8 +940,8 @@ var link = (function(){
 "--link-item-color: "+stagedLink.link.color.rgb.r+", "+stagedLink.link.color.rgb.g+", "+stagedLink.link.color.rgb.b+""+
 "--link-item-color-focus-hover: "+stagedLink.link.color.rgb.r+", "+stagedLink.link.color.rgb.g+", "+stagedLink.link.color.rgb.b+"";
 };
-if(stagedLink.link.image!=null&&stagedLink.link.image!=""){
-linkItemOptions.attr[1].value=linkItemOptions.attr[1].value+"--link-image-url: url("+stagedLink.link.image.trim()+");"
+if(helper.checkValueString(stagedLink.link.image)){
+linkItemOptions.attr[1].value=linkItemOptions.attr[1].value+"--link-image-url: url("+helper.trimString(stagedLink.link.image)+");"
 };
 };
 varlinkItem=helper.makeNode(linkItemOptions);
@@ -993,15 +993,17 @@ var link = (function(){
 value: "link-display-image"
 },{
 key: "style",
-value: "--link-display-image-url: url("+stagedLink.link.visual.image.trim()+")"
+value: "--link-display-image-url: url("+helper.trimString(stagedLink.link.visual.image)+")"
 }]
 });
 };
-varnameText="";
-if(typeofstagedLink.link.name=="string"&&stagedLink.link.name!=""){
-nameText=stagedLink.link.name.trim().replace(/\s\s+/g," ");
+
+varlinkDisplayName;
+if(helper.checkValueString(stagedLink.link.name)){
+linkDisplayName=helper.node("p:"+helper.trimString(stagedLink.link.name)+"|class:link-display-name");
+}else{
+linkDisplayName=helper.node("p|class:link-display-name");
 };
-varlinkDisplayName=helper.node("p:"+nameText+"|class:link-display-name");
 
 varlinkUrl=helper.node("div|class:link-url");
 varurl="";
@@ -1043,11 +1045,11 @@ var link = (function(){
 linkDisplay.appendChild(linkDisplayVisual);
 };
 
-if(stagedLink.link.name!=null&&stagedLink.link.name!=""){
+if(helper.checkValueString(stagedLink.link.name)){
 linkDisplay.appendChild(linkDisplayName);
 };
 
-if(stagedLink.link.image!=null&&stagedLink.link.image!=""){
+if(helper.checkValueString(stagedLink.link.image)){
 linkPanelFront.appendChild(linkImage);
 };
 linkPanelFront.appendChild(linkDisplay);
@@ -2898,7 +2900,7 @@ var link = (function(){
 useStagedLink: true
 });
 varheading;
-if(stagedLink.link.name!=null&&stagedLink.link.name!=""){
+if(helper.checkValueString(stagedLink.link.name)){
 heading="Edit "+stagedLink.link.name;
 }else{
 heading="Edit unnamed bookmark";
@@ -3003,7 +3005,7 @@ var link = (function(){
 stagedLink.link=JSON.parse(JSON.stringify(copyStagedLink.link));
 stagedLink.position=JSON.parse(JSON.stringify(copyStagedLink.position));
 varheading;
-if(stagedLink.link.name!=null&&stagedLink.link.name!=""){
+if(helper.checkValueString(stagedLink.link.name)){
 heading="Remove "+stagedLink.link.name;
 }else{
 heading="Remove unnamed bookmark";