Merge branch 'develop' into update/tidy-code-shortcut

Author: catarak

.env.example

@@ -10,9 +10,9 @@ EXAMPLE_USER_PASSWORD=hellop5js
 GG_EXAMPLES_USERNAME=generativedesign
 GG_EXAMPLES_EMAIL=[email protected]
 GG_EXAMPLES_PASS=generativedesign
-ML5_EXAMPLES_USERNAME=ml5
-ML5_EXAMPLES_EMAIL=[email protected]
-ML5_EXAMPLES_PASS=helloml5
+ML5_LIBRARY_USERNAME=ml5
+ML5_LIBRARY_EMAIL=[email protected]
+ML5_LIBRARY_PASS=helloml5
 GITHUB_ID=<your-github-client-id>
 GITHUB_SECRET=<your-github-client-secret>
 GOOGLE_ID=<your-google-client-id> (use google+ api)

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__/Nav.test.jsx

@@ -46,7 +46,8 @@ describe('Nav', () => {
     },
     t: jest.fn(),
     setLanguage: jest.fn(),
-    language: 'en-US'
+    language: 'en-US',
+    isUserOwner: true
   };
 
   it('renders correctly', () => {

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"
             >

client/components/useAsModal.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import styled from 'styled-components';
-import { useModalBehavior } from '../utils/custom-hooks';
+import { useModalBehavior } from '../modules/IDE/hooks/custom-hooks';
 
 const BackgroundOverlay = styled.div`
   position: fixed;