Get tests passing.

zurb · Mar 6, 2020 · 4d68b21 · 4d68b21
1 parent 7f1c356
commit 4d68b21
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 6 deletions.
diff --git a/dist/tribute.esm.js b/dist/tribute.esm.js
@@ -1355,6 +1355,10 @@ class Tribute {
 
           // function called when menu is empty, disables hiding of menu.
           noMatchTemplate: (t => {
+            if (typeof t === "string") {
+              if (t.trim() === "") return null;
+              return t;
+            }
             if (typeof t === "function") {
               return t.bind(this);
             }
@@ -1405,11 +1409,20 @@ class Tribute {
           ).bind(this),
           // function called when menu is empty, disables hiding of menu.
           noMatchTemplate: (t => {
+            if (typeof t === "string") {
+              if (t.trim() === "") return null;
+              return t;
+            }
             if (typeof t === "function") {
               return t.bind(this);
             }
 
-            return null;
+            return (
+              noMatchTemplate ||
+              function() {
+                return "<li>No Match Found!</li>";
+              }.bind(this)
+            );
           })(noMatchTemplate),
           lookup: item.lookup || lookup,
           fillAttr: item.fillAttr || fillAttr,

diff --git a/dist/tribute.js b/dist/tribute.js
@@ -1,3 +1,5 @@
+
+(function(l, r) { if (l.getElementById('livereloadscript')) return; r = l.createElement('script'); r.async = 1; r.src = '//' + (window.location.host || 'localhost').split(':')[0] + ':35729/livereload.js?snipver=1'; r.id = 'livereloadscript'; l.head.appendChild(r) })(window.document);
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define(factory) :
@@ -1400,6 +1402,11 @@
           menuItemTemplate: (menuItemTemplate || Tribute.defaultMenuItemTemplate).bind(this),
           // function called when menu is empty, disables hiding of menu.
           noMatchTemplate: function (t) {
+            if (typeof t === "string") {
+              if (t.trim() === "") return null;
+              return t;
+            }
+
             if (typeof t === "function") {
               return t.bind(_this);
             }
@@ -1432,11 +1439,18 @@
             menuItemTemplate: (item.menuItemTemplate || Tribute.defaultMenuItemTemplate).bind(_this),
             // function called when menu is empty, disables hiding of menu.
             noMatchTemplate: function (t) {
+              if (typeof t === "string") {
+                if (t.trim() === "") return null;
+                return t;
+              }
+
               if (typeof t === "function") {
                 return t.bind(_this);
               }
 
-              return null;
+              return noMatchTemplate || function () {
+                return "<li>No Match Found!</li>";
+              }.bind(_this);
             }(noMatchTemplate),
             lookup: item.lookup || lookup,
             fillAttr: item.fillAttr || fillAttr,

diff --git a/dist/tribute.min.js b/dist/tribute.min.js
diff --git a/dist/tribute.min.js.map b/dist/tribute.min.js.map
diff --git a/example/tribute.js b/example/tribute.js
@@ -1,3 +1,5 @@
+
+(function(l, r) { if (l.getElementById('livereloadscript')) return; r = l.createElement('script'); r.async = 1; r.src = '//' + (window.location.host || 'localhost').split(':')[0] + ':35729/livereload.js?snipver=1'; r.id = 'livereloadscript'; l.head.appendChild(r) })(window.document);
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define(factory) :
@@ -1400,6 +1402,11 @@
           menuItemTemplate: (menuItemTemplate || Tribute.defaultMenuItemTemplate).bind(this),
           // function called when menu is empty, disables hiding of menu.
           noMatchTemplate: function (t) {
+            if (typeof t === "string") {
+              if (t.trim() === "") return null;
+              return t;
+            }
+
             if (typeof t === "function") {
               return t.bind(_this);
             }
@@ -1432,11 +1439,18 @@
             menuItemTemplate: (item.menuItemTemplate || Tribute.defaultMenuItemTemplate).bind(_this),
             // function called when menu is empty, disables hiding of menu.
             noMatchTemplate: function (t) {
+              if (typeof t === "string") {
+                if (t.trim() === "") return null;
+                return t;
+              }
+
               if (typeof t === "function") {
                 return t.bind(_this);
               }
 
-              return null;
+              return noMatchTemplate || function () {
+                return "<li>No Match Found!</li>";
+              }.bind(_this);
             }(noMatchTemplate),
             lookup: item.lookup || lookup,
             fillAttr: item.fillAttr || fillAttr,

diff --git a/src/Tribute.js b/src/Tribute.js
@@ -76,6 +76,10 @@ class Tribute {
 
           // function called when menu is empty, disables hiding of menu.
           noMatchTemplate: (t => {
+            if (typeof t === "string") {
+              if (t.trim() === "") return null;
+              return t;
+            }
             if (typeof t === "function") {
               return t.bind(this);
             }
@@ -126,11 +130,20 @@ class Tribute {
           ).bind(this),
           // function called when menu is empty, disables hiding of menu.
           noMatchTemplate: (t => {
+            if (typeof t === "string") {
+              if (t.trim() === "") return null;
+              return t;
+            }
             if (typeof t === "function") {
               return t.bind(this);
             }
 
-            return null;
+            return (
+              noMatchTemplate ||
+              function() {
+                return "<li>No Match Found!</li>";
+              }.bind(this)
+            );
           })(noMatchTemplate),
           lookup: item.lookup || lookup,
           fillAttr: item.fillAttr || fillAttr,