Merge pull request #42 from ember-learn/feature/external-search-2

add ability to pass search component into navbar via yield

Author: MelSumner

addon/components/es-navbar/template.hbs

@@ -37,23 +37,27 @@
         {{/each}}
       {{/navbar.nav}}
       {{#navbar.nav as |nav|}}
-        <form class="navbar-form navbar-right searchbox">
-          <div class="input-group">
-            <label for="search-input" class="control-label sr-only">Search</label>
-            <input type="text"
-                   class="form-control search input ds-input"
-                   placeholder="Search..."
-                   id="search-input"
-                   role="combobox"
-                   aria-expanded="false"
-                   aria-owns="algolia-autocomplete-listbox-0"
-                   autocorrect="off"
-                   autocapitalize="none"
-                   spellcheck="false"
-            />
-            <span></span>
-          </div>
-        </form>
+        {{#if hasBlock}}
+          {{yield}}
+        {{else}}
+          <form class="navbar-form navbar-right searchbox">
+            <div class="input-group">
+              <label for="search-input" class="control-label sr-only">Search</label>
+              <input type="text"
+                     class="form-control search input ds-input"
+                     placeholder="Search..."
+                     id="search-input"
+                     role="combobox"
+                     aria-expanded="false"
+                     aria-owns="algolia-autocomplete-listbox-0"
+                     autocorrect="off"
+                     autocapitalize="none"
+                     spellcheck="false"
+              />
+              <span></span>
+            </div>
+          </form>
+        {{/if}}
       {{/navbar.nav}}
     {{/navbar.content}}
   {{/bs-navbar}}
@@ -78,4 +82,4 @@
   <!-- /.navbar-collapse -->
 </div>
 <!-- /.container-fluid -->
---}}
+--}}

package-lock.json

@@ -20,5 +20,5 @@ test('it renders', function(assert) {
     {{/es-navbar}}
   `);
 
-  assert.equal(this.$().text().trim(), 'Search');
+  assert.equal(this.$().text().trim(), 'template block text');
 });