Merge branch 'develop' into refactor/update-to-axios

Author: catarak

client/components/Nav.jsx

@@ -42,9 +42,7 @@ class Nav extends React.PureComponent {
     this.handleFind = this.handleFind.bind(this);
     this.handleAddFile = this.handleAddFile.bind(this);
     this.handleAddFolder = this.handleAddFolder.bind(this);
-    this.handleFindNext = this.handleFindNext.bind(this);
     this.handleRun = this.handleRun.bind(this);
-    this.handleFindPrevious = this.handleFindPrevious.bind(this);
     this.handleReplace = this.handleReplace.bind(this);
     this.handleStop = this.handleStop.bind(this);
     this.handleStartAccessible = this.handleStartAccessible.bind(this);
@@ -128,16 +126,6 @@ class Nav extends React.PureComponent {
     this.setDropdown('none');
   }
 
-  handleFindNext() {
-    this.props.cmController.findNext();
-    this.setDropdown('none');
-  }
-
-  handleFindPrevious() {
-    this.props.cmController.findPrev();
-    this.setDropdown('none');
-  }
-
   handleReplace() {
     this.props.cmController.showReplace();
     this.setDropdown('none');
@@ -447,28 +435,6 @@ class Nav extends React.PureComponent {
                 <span className="nav__keyboard-shortcut">{metaKeyName}+F</span>
               </button>
             </li>
-            <li className="nav__dropdown-item">
-              <button
-                onClick={this.handleFindNext}
-                onFocus={this.handleFocusForEdit}
-                onBlur={this.handleBlur}
-              >
-                {this.props.t('Nav.Edit.FindNext')}
-                <span className="nav__keyboard-shortcut">{metaKeyName}+G</span>
-              </button>
-            </li>
-            <li className="nav__dropdown-item">
-              <button
-                onClick={this.handleFindPrevious}
-                onFocus={this.handleFocusForEdit}
-                onBlur={this.handleBlur}
-              >
-                {this.props.t('Nav.Edit.FindPrevious')}
-                <span className="nav__keyboard-shortcut">
-                  {'\u21E7'}+{metaKeyName}+G
-                </span>
-              </button>
-            </li>
             <li className="nav__dropdown-item">
               <button
                 onClick={this.handleReplace}

client/components/__test__/__snapshots__/Nav.test.jsx.snap

@@ -100,28 +100,6 @@ exports[`Nav renders correctly 1`] = `
                 </span>
               </button>
             </li>
-            <li
-              class="nav__dropdown-item"
-            >
-              <button>
-                <span
-                  class="nav__keyboard-shortcut"
-                >
-                  ⌃+G
-                </span>
-              </button>
-            </li>
-            <li
-              class="nav__dropdown-item"
-            >
-              <button>
-                <span
-                  class="nav__keyboard-shortcut"
-                >
-                  ⇧+⌃+G
-                </span>
-              </button>
-            </li>
             <li
               class="nav__dropdown-item"
             >

translations/locales/en-US/translations.json

@@ -14,8 +14,6 @@
       "Title": "Edit",
       "TidyCode": "Tidy Code",
       "Find": "Find",
-      "FindNext": "Find Next",
-      "FindPrevious": "Find Previous",
       "Replace": "Replace"
     },
     "Sketch": {

translations/locales/es-419/translations.json

@@ -14,8 +14,6 @@
       "Title": "Editar",
       "TidyCode": "Ordenar código",
       "Find": "Buscar",
-      "FindNext": "Buscar siguiente",
-      "FindPrevious": "Buscar anterior",
       "Replace": "Reemplazar"
     },
     "Sketch": {

translations/locales/hi/translations.json

@@ -14,8 +14,6 @@
         "Title": "संपादित करे",
         "TidyCode": "कोड साफ़ करें",
         "Find": "खोज",
-        "FindNext": "अगला खोजें",
-        "FindPrevious": "पिछला खोजें",  
         "Replace": "बदली करें"
       },
       "Sketch": {

translations/locales/ja/translations.json

@@ -14,8 +14,6 @@
         "Title": "編集",
         "TidyCode": "コード整形",
         "Find": "検索",
-        "FindNext": "次を検索",
-        "FindPrevious": "前を検索",
         "Replace": "置換"
       },
       "Sketch": {