Set default no match template to empty string.

zurb · Jan 30, 2019 · 7da4d7b · 7da4d7b
1 parent a002f93
commit 7da4d7b
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/dist/tribute.js b/dist/tribute.js
diff --git a/src/Tribute.js b/src/Tribute.js
@@ -59,7 +59,7 @@ class Tribute {
                         return t.bind(this)
                     }
 
-                    return noMatchTemplate
+                    return noMatchTemplate || function () {return ''}.bind(this)
                 })(noMatchTemplate),
 
                 // column to search against in the object

diff --git a/src/TributeRange.js b/src/TributeRange.js
@@ -112,9 +112,20 @@ class TributeRange {
         targetElement.focus()
     }
 
+    resetSelection(targetElement, path, offset) {
+        if (!this.isContentEditable(targetElement)) {
+            if (targetElement !== this.getDocument().activeElement) {
+                targetElement.focus();
+            }
+        } else {
+            this.selectElement(targetElement, path, offset);
+        }
+    }
+
     replaceTriggerText(text, requireLeadingSpace, hasTrailingSpace, originalEvent, item) {
         let context = this.tribute.current
         let info = this.getTriggerInfo(true, hasTrailingSpace, requireLeadingSpace, this.tribute.allowSpaces)
+        this.resetSelection(context.element, context.selectedPath, context.selectedOffset)
 
         // Create the event
         let replaceEvent = new CustomEvent('tribute-replaced', {