[refactor] improve auto suggest module

Author: zombieFox

src/js/auto-suggest.js

@@ -4,11 +4,27 @@ var autoSuggest = (function(){
 var_currentInputOptions={};
 var_autoSuggestActive=false;
 
-var_delayRender=function(options){
-render(options);
+varmod={};
+
+mod.open=function(){
+helper.setObject({
+object: state.get(),
+path: "autoSuggest",
+newValue: true
+});
+};
+
+mod.close=function(){
+helper.setObject({
+object: state.get(),
+path: "autoSuggest",
+newValue: false
+});
 };
 
-varbind=function(override){
+varbind={};
+
+bind.input=function(override){
 varoptions={
 input: null,
 type: null,
@@ -21,17 +37,17 @@ var autoSuggest = (function(){
 options.input.addEventListener("focus",function(){
 if(!_autoSuggestActive){
 clearTimeout(_timer);
-_timer=setTimeout(_delayRender,300,options);
+_timer=setTimeout(render.delay,300,options);
 };
 },false);
 options.input.addEventListener("input",function(){
 clearTimeout(_timer);
-_timer=setTimeout(_delayRender,300,options);
+_timer=setTimeout(render.delay,300,options);
 },false);
 };
 };
 
-var_navigateResults=function(event){
+bind.navigateResults=function(event){
 varelementToFocus=null;
 varfocusIndex=null;
 varallSuggestItems=helper.eA(".auto-suggest-link");
@@ -108,15 +124,15 @@ var autoSuggest = (function(){
 if(!event.shiftKey&&event.keyCode==9&&document.activeElement==allSuggestItems[allSuggestItems.length-1]){
 event.preventDefault();
 elementToFocus=_currentInputOptions.postFocus;
-destroy();
+render.close();
 };
 // shift tab
 if(event.shiftKey&&event.keyCode==9&&document.activeElement==allSuggestItems[0]){
 event.preventDefault();
 elementToFocus=_currentInputOptions.input;
 };
 if(event.shiftKey&&event.keyCode==9&&document.activeElement==_currentInputOptions.input){
-destroy();
+render.close();
 };
 };
 _findInput();
@@ -127,71 +143,35 @@ var autoSuggest = (function(){
 };
 };
 
-var_addDocumentEvent=function(){
-document.addEventListener("click",_checkClick,false);
-document.addEventListener("keydown",_navigateResults,false);
+vardocumentEvent={};
+
+documentEvent.add=function(){
+document.addEventListener("click",documentEvent.clickOut,false);
+document.addEventListener("keydown",bind.navigateResults,false);
 };
 
-var_removeDocumentEvent=function(){
-document.removeEventListener("click",_checkClick,false);
-document.removeEventListener("keydown",_navigateResults,false);
+documentEvent.remove=function(){
+document.removeEventListener("click",documentEvent.clickOut,false);
+document.removeEventListener("keydown",bind.navigateResults,false);
 };
 
-var_checkClick=function(event){
+documentEvent.clickOut=function(event){
 if(!(event.target.classList.contains("auto-suggest-list"))&&!(event.target.classList.contains("auto-suggest-input"))){
-destroy();
+render.close();
 };
 };
 
-vardestroy=function(){
-varautoSuggestList=helper.e(".auto-suggest-list");
-if(autoSuggestList){
-autoSuggestList.remove();
-_removeDocumentEvent();
-helper.setObject({
-object: state.get(),
-path: "autoSuggest",
-newValue: false
-});
-_currentInputOptions={};
-_autoSuggestActive=false;
-};
-};
+varrender={};
 
-var_getSuggestItems=function(){
-varsearchTerm=_currentInputOptions.input.value.replace(/^\s+/,"").replace(/\s+$/,"").toLowerCase();
-varaction={
-fontawesomeIcon: function(){
-if(searchTerm==""||searchTerm==undefined){
-returnfontawesome.icons;
-}else{
-returnfontawesome.icons.filter(function(item){
-varmatch=false;
-if(item.name.toLowerCase().includes(searchTerm)||item.label.toLowerCase().includes(searchTerm)){
-match=true;
-};
-item.search.forEach(function(item,index){
-if(item.toLowerCase().includes(searchTerm)){
-match=true;
-};
-});
-item.styles.forEach(function(item,index){
-if(item.toLowerCase().includes(searchTerm)){
-match=true;
-};
-});
-returnmatch;
-});
-};
-}
-};
-returnaction[_currentInputOptions.type]();
+render.delay=function(options){
+mod.open();
+render.open(options);
 };
 
-varrender=function(options){
+render.open=function(options){
 _currentInputOptions=options;
 varbody=helper.e("body");
-varsuggestItems=_getSuggestItems(options);
+varsuggestItems=render.suggestItems(options);
 var_populateList=function(list){
 varaction={
 fontawesomeIcon: function(){
@@ -217,8 +197,7 @@ var autoSuggest = (function(){
 };
 action[_currentInputOptions.type]();
 };
-
-var_render_autoSuggestList=function(){
+var_renderAutoSuggestList=function(){
 varautoSuggestWrapper=helper.e(".auto-suggest-wrapper");
 varautoSuggestList=helper.e(".auto-suggest-list");
 if(autoSuggestList){
@@ -234,27 +213,68 @@ var autoSuggest = (function(){
 varautoSuggestList=helper.node("ul|class:auto-suggest-list list-unstyled");
 body.appendChild(autoSuggestList);
 autoSuggestList.setAttribute("style","width: "+style.width+"px; top: "+style.top+"px; left: "+style.left+"px;");
-_addDocumentEvent();
+documentEvent.add();
 };
 _populateList(autoSuggestList);
 };
 if(suggestItems.length>0){
 _autoSuggestActive=true;
-helper.setObject({
-object: state.get(),
-path: "autoSuggest",
-newValue: true
-});
-_render_autoSuggestList();
+_renderAutoSuggestList();
 }else{
-destroy();
+render.close();
 };
 };
 
+render.close=function(){
+mod.close();
+varautoSuggestList=helper.e(".auto-suggest-list");
+if(autoSuggestList){
+autoSuggestList.remove();
+documentEvent.remove();
+_currentInputOptions={};
+_autoSuggestActive=false;
+};
+};
+
+render.suggestItems=function(){
+varsearchTerm=_currentInputOptions.input.value.replace(/^\s+/,"").replace(/\s+$/,"").toLowerCase();
+varaction={
+fontawesomeIcon: function(){
+if(searchTerm==""||searchTerm==undefined){
+returnfontawesome.icons;
+}else{
+returnfontawesome.icons.filter(function(item){
+varmatch=false;
+if(item.name.toLowerCase().includes(searchTerm)||item.label.toLowerCase().includes(searchTerm)){
+match=true;
+};
+item.search.forEach(function(item,index){
+if(item.toLowerCase().includes(searchTerm)){
+match=true;
+};
+});
+item.styles.forEach(function(item,index){
+if(item.toLowerCase().includes(searchTerm)){
+match=true;
+};
+});
+returnmatch;
+});
+};
+}
+};
+returnaction[_currentInputOptions.type]();
+};
+
+varclose=function(){
+render.close();
+};
+
 // exposed methods
 return{
 bind: bind,
-destroy: destroy
+render: render,
+close: close
 };
 
 })();

src/js/keyboard.js

@@ -12,7 +12,7 @@ var keyboard = (function(){
 menu.close();
 shade.close();
 }elseif(state.get().autoSuggest){
-autoSuggest.destroy();
+autoSuggest.close();
 }elseif(state.get().link.add){
 link.add.close();
 shade.close();

src/js/link.js

@@ -516,7 +516,7 @@ var link = (function(){
 cancelAction: function(){
 render.previousFocus();
 stagedLink.reset();
-autoSuggest.destroy();
+autoSuggest.close();
 shade.close();
 pagelock.unlock();
 },
@@ -702,7 +702,7 @@ var link = (function(){
 iconFormGroupClear.removeAttribute("disabled");
 iconFormGroupText.tabIndex=1;
 },false);
-autoSuggest.bind({
+autoSuggest.bind.input({
 input: iconInput,
 type: "fontawesomeIcon",
 postFocus: iconFormGroupText
@@ -752,7 +752,7 @@ var link = (function(){
 console.log("hit");
 mod.add.close();
 stagedLink.reset();
-autoSuggest.destroy();
+autoSuggest.close();
 shade.close();
 pagelock.unlock();
 },

src/js/version.js

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

src/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.55.0",
+"version": "3.56.0",
 "manifest_version": 2,
 "chrome_url_overrides":{
 "newtab": "index.html"