From 167541b92cbd56838cf4b33331dfca6f0d880060 Mon Sep 17 00:00:00 2001
From: Jeremy Kauffman <kauffj@gmail.com>
Date: Thu, 12 Jan 2017 22:36:03 -0500
Subject: [PATCH] search bar displays pre-set value when ?discover=arg is
 passed

---
 js/app.js              | 5 +++--
 js/component/header.js | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/js/app.js b/js/app.js
index c87017c28..cab3045e2 100644
--- a/js/app.js
+++ b/js/app.js
@@ -190,7 +190,8 @@ var App = React.createClass({
   },
   render: function() {
     var mainContent = this.getMainContent(),
-        headerLinks = this.getHeaderLinks();
+        headerLinks = this.getHeaderLinks(),
+        searchQuery = this.state.viewingPage == 'discover' && this.state.pageArgs ? this.state.pageArgs : '';
 
     return (
       this.state.viewingPage == 'watch' ?
@@ -198,7 +199,7 @@ var App = React.createClass({
         <div id="window" className={ this.state.drawerOpen ? 'drawer-open' : 'drawer-closed' }>
           <Drawer onCloseDrawer={this.closeDrawer} viewingPage={this.state.viewingPage} />
           <div id="main-content" className={ headerLinks ? 'with-sub-nav' : 'no-sub-nav' }>
-            <Header onOpenDrawer={this.openDrawer} onSearch={this.onSearch} links={headerLinks} viewingPage={this.state.viewingPage} />
+            <Header onOpenDrawer={this.openDrawer} initialQuery={searchQuery} onSearch={this.onSearch} links={headerLinks} viewingPage={this.state.viewingPage} />
             {mainContent}
           </div>
           <Modal isOpen={this.state.modal == 'upgrade'} contentLabel="Update available"
diff --git a/js/component/header.js b/js/component/header.js
index 83fd3748b..fb64e9ece 100644
--- a/js/component/header.js
+++ b/js/component/header.js
@@ -52,7 +52,7 @@ var Header = React.createClass({
           <Link onClick={this.props.onOpenDrawer} icon="icon-bars" className="open-drawer-link" />
           <h1>{ this.state.title }</h1>
           <div className="header-search">
-            <input type="search" onChange={this.onQueryChange}
+            <input type="search" onChange={this.onQueryChange} defaultValue={this.props.initialQuery}
                  placeholder="Find movies, music, games, and more"/>
           </div>
         </div>
@@ -70,7 +70,7 @@ var SubHeader =  React.createClass({
   render: function() {
     var links = [],
         viewingUrl = '?' + this.props.viewingPage;
-    
+
     for (let link of Object.keys(this.props.links)) {
       links.push(
         <a href={link} key={link} className={ viewingUrl == link ? 'sub-header-selected' : 'sub-header-unselected' }>