few more fixes

Automattic · Feb 19, 2016 · c9bd8ee · c9bd8ee
1 parent 6693dfc
commit c9bd8ee
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/client/components/search/index.jsx b/client/components/search/index.jsx
@@ -16,6 +16,8 @@ import analytics from 'analytics';
 import Spinner from 'components/spinner';
 import Gridicon from 'components/gridicon';
 import { isMobile } from 'lib/viewport';
+import i18n from 'lib/mixins/i18n';
+
 /**
  * Internal variables
  */
@@ -230,7 +232,7 @@ const Search = React.createClass( {
 		var searchClass,
 			searchValue = this.state.keyword,
 			placeholder = this.props.placeholder ||
-				this.translate( 'Search…', { textOnly: true } ),
+				i18n.translate( 'Search…', { textOnly: true } ),
 
 			enableOpenIcon = this.props.pinned && ! this.state.isOpen,
 			isOpenUnpinnedOrQueried = this.state.isOpen ||
@@ -263,7 +265,7 @@ const Search = React.createClass( {
 						: null
 					}
 					aria-controls={ 'search-component-' + this.state.instanceId }
-					aria-label={ this.translate( 'Open Search', { context: 'button label' } ) }>
+					aria-label={ i18n.translate( 'Open Search', { context: 'button label' } ) }>
 				<Gridicon icon="search" className="search-open__icon"/>
 				</div>
 				<input
@@ -294,8 +296,8 @@ const Search = React.createClass( {
 				onTouchTap={ this.closeSearch }
 				tabIndex="0"
 				onKeyDown={ this._keyListener.bind( this, 'closeSearch' ) }
-				aria-controls={ 'search-component-' + this.id }
-				aria-label={ this.translate( 'Close Search', { context: 'button label' } ) }>
+				aria-controls={ 'search-component-' + this.state.instanceId }
+				aria-label={ i18n.translate( 'Close Search', { context: 'button label' } ) }>
 			<Gridicon icon="cross" className="search-close__icon"/>
 			</span>
 		);

diff --git a/client/components/section-nav/tabs.jsx b/client/components/section-nav/tabs.jsx
@@ -70,6 +70,8 @@ var NavTabs = React.createClass( {
 			'has-siblings': this.props.hasSiblingControls
 		} );
 
+		var innerWidth = global.window ? global.window.innerWidth : 769; //FIXME: should estimate this magic value on the server
+
 		return (
 			<div className="section-nav-group" ref="navGroup">
 				<div className={ tabsClassName }>
@@ -87,8 +89,8 @@ var NavTabs = React.createClass( {
 					</ul>
 
 					{
-						this.state.isDropdown && typeof( window ) === 'object' &&
-						window.innerWidth > MOBILE_PANEL_THRESHOLD &&
+						this.state.isDropdown &&
+						innerWidth > MOBILE_PANEL_THRESHOLD &&
 						this.getDropdown()
 					}
 				</div>

diff --git a/client/components/spinner/index.jsx b/client/components/spinner/index.jsx
@@ -45,7 +45,8 @@ Spinner = React.createClass( {
 	 *                   elements, or false otherwise.
 	 */
 	isSVGCSSAnimationSupported: function() {
-		return ! /(MSIE |Trident\/)/.test( global.window.navigator.userAgent );
+		const navigator = global.window ? global.window.navigator.userAgent : ''; // FIXME: replace with UA from server
+		return ! /(MSIE |Trident\/)/.test( navigator );
 	},
 
 	getClassName: function() {