[refactor] improve search results

Author: zombieFox

css/link.css

@@ -70,8 +70,8 @@
 .link-item-placeholder{
 background-color:rgba(var(--theme-accent),0.2);
 border-radius:var(--theme-radius);
-width:100%;
-height:100%;
+width:100%;
+height:100%;
 position: relative;
 top:50%;
 left:50%;
@@ -398,7 +398,7 @@
 
 .link-empty-heading{
 color:rgb(var(--gray-16));
-font-size:1.5rem;
+margin-bottom:0.5em;
 }
 
 .is-link-style-list .link-name{

js/control.js

@@ -1279,53 +1279,53 @@ var control = (function(){
 type: "radio",
 func: function(){
 dependents();
-search.render();
+search.render.engine();
 }
 },{
 element: helper.e(".control-header-search-engine-duckduckgo"),
 path: "header.search.engine.selected",
 type: "radio",
 func: function(){
 dependents();
-search.render();
+search.render.engine();
 }
 },{
 element: helper.e(".control-header-search-engine-youtube"),
 path: "header.search.engine.selected",
 type: "radio",
 func: function(){
 dependents();
-search.render();
+search.render.engine();
 }
 },{
 element: helper.e(".control-header-search-engine-giphy"),
 path: "header.search.engine.selected",
 type: "radio",
 func: function(){
 dependents();
-search.render();
+search.render.engine();
 }
 },{
 element: helper.e(".control-header-search-engine-custom"),
 path: "header.search.engine.selected",
 type: "radio",
 func: function(){
 dependents();
-search.render();
+search.render.engine();
 }
 },{
 element: helper.e(".control-header-search-engine-custom-name"),
 path: "header.search.engine.custom.name",
 type: "text",
 func: function(){
-search.render();
+search.render.engine();
 }
 },{
 element: helper.e(".control-header-search-engine-custom-url"),
 path: "header.search.engine.custom.url",
 type: "text",
 func: function(){
-search.render();
+search.render.engine();
 }
 },{
 element: helper.e(".control-header-search-text-align-left"),
@@ -1752,7 +1752,7 @@ var control = (function(){
 func: function(){
 render();
 dependents();
-search.render();
+search.render.engine();
 }
 },{
 element: helper.e(".control-link-item-display-show"),

js/link.js

@@ -531,43 +531,21 @@ var link = (function(){
 
 var_makeEmptySearch=function(){
 varsearchInput=helper.e(".search-input");
-vardiv=helper.makeNode({
-tag: "div",
-attr: [{
-key: "class",
-value: "link-empty"
-}]
-});
-varh1=helper.makeNode({
-tag: "h1",
-attr: [{
-key: "class",
-value: "link-empty-heading"
-}],
-text: "No matching bookmarks found"
-});
+vardiv=helper.node("div|class:link-empty");
+varh1=helper.node("h1:No matching bookmarks found|class:link-empty-heading");
+varpara=helper.node("p:Enter to Search "+state.get().header.search.engine[state.get().header.search.engine.selected].name+"|class:small muted");
 div.appendChild(h1);
+div.appendChild(para);
 returndiv;
 };
 
 var_makeEmptyBookmarks=function(){
 varsearchInput=helper.e(".search-input");
-vardiv=helper.makeNode({
-tag: "div",
-attr: [{
-key: "class",
-value: "link-empty"
-}]
-});
-varh1=helper.makeNode({
-tag: "h1",
-attr: [{
-key: "class",
-value: "link-empty-heading"
-}],
-text: "No bookmarks added"
-});
+vardiv=helper.node("div|class:link-empty");
+varh1=helper.node("h1:No bookmarks added|class:link-empty-heading");
+varpara=helper.node("p:Why not add some?|class:small muted");
 div.appendChild(h1);
+div.appendChild(para);
 returndiv;
 };
 

js/search.js

@@ -4,22 +4,26 @@ var search = (function(){
 varsearchInput=helper.e(".search-input");
 varsearchClear=helper.e(".search-clear");
 searchInput.addEventListener("input",function(){
-_toggle(this);
-_searchClear();
+_toggle();
+render.clear.button();
 link.clear();
 link.render.item.all();
 sortable(".link-area");
 },false);
 searchClear.addEventListener("click",function(){
-_toggle(this);
-_searchClear();
-clear();
+render.clear.input();
+_toggle();
+render.clear.button();
+link.clear();
+link.render.item.all();
+sortable(".link-area");
 },false);
 };
 
-var_toggle=function(input){
+var_toggle=function(){
 varhtml=helper.e("html");
-if(input.value!=""){
+varsearchInput=helper.e(".search-input");
+if(searchInput.value!=""){
 helper.setObject({
 object: state.get(),
 path: "search",
@@ -36,16 +40,6 @@ var search = (function(){
 };
 };
 
-var_searchClear=function(){
-varsearchInput=helper.e(".search-input");
-varsearchClear=helper.e(".search-clear");
-if(state.get().search){
-searchClear.removeAttribute("disabled");
-}else{
-searchClear.setAttribute("disabled","");
-};
-};
-
 varget=function(){
 varsearchInput=helper.e(".search-input");
 if(state.get().search){
@@ -71,7 +65,21 @@ var search = (function(){
 };
 };
 
-varrender=function(){
+varrender={
+engine: function(){
+_renderEngine();
+},
+clear: {
+input: function(){
+_renderClearInput();
+},
+button: function(){
+_renderClearButton();
+}
+}
+};
+
+var_renderEngine=function(){
 varsearch=helper.e(".search");
 varsearchInput=helper.e(".search-input");
 varplaceholder="";
@@ -85,13 +93,19 @@ var search = (function(){
 search.setAttribute("action",state.get().header.search.engine[state.get().header.search.engine.selected].url);
 };
 
-varclear=function(){
+var_renderClearButton=function(){
+varsearchClear=helper.e(".search-clear");
+if(state.get().search){
+searchClear.removeAttribute("disabled");
+}else{
+searchClear.setAttribute("disabled","");
+};
+};
+
+var_renderClearInput=function(){
 varsearchInput=helper.e(".search-input");
 searchInput.value="";
 searchInput.focus();
-link.clear();
-link.render.item.all();
-sortable(".link-area");
 };
 
 var_focus=function(){
@@ -104,16 +118,16 @@ var search = (function(){
 
 varinit=function(){
 bind();
-render();
+render.engine();
+_toggle();
 _focus();
 };
 
 // exposed methods
 return{
 init: init,
 get: get,
-render: render,
-clear: clear
+render: render
 };
 
 })();

js/version.js

@@ -1,6 +1,6 @@
 varversion=(function(){
 
-varcurrent="3.16.3";
+varcurrent="3.17.0";
 
 varcompare=function(a,b){
 varpa=a.split(".");

manifest.json

@@ -2,7 +2,7 @@
 "name": "nightTab",
 "short_name": "nightTab",
 "description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.",
-"version": "3.16.3",
+"version": "3.17.0",
 "manifest_version": 2,
 "chrome_url_overrides":{
 "newtab": "index.html"