Accessibility - Transition from interceptor to accessibility library

README.md

@@ -6,12 +6,11 @@ This project is currently in development! It will be announced when there is a (
 
 1. Fork this repository.
 2. Clone the forked repostory and cd into it
-3. `$ git submodule init`
-4. `$ npm install`
-5. Install MongoDB and make sure it is running
+3. `$ npm install`
+4. Install MongoDB and make sure it is running
    * For Mac OSX with [homebrew](http://brew.sh/): `brew install mongodb` then `brew services start mongodb`
    * For Windows and Linux: [MongoDB Installation](https://docs.mongodb.com/manual/installation/)
-6. Create a file called `.env` in the root of this directory that looks like
+5. Create a file called `.env` in the root of this directory that looks like
 
   ```
   API_URL=/api
@@ -29,10 +28,10 @@ This project is currently in development! It will be announced when there is a (
 
    If you don't care about being able to upload media files to S3 or Login with Github, you can drop in the file exactly how it is. Or, if you don't want to do that, just ask me to send you mine. Refer to [this gist](https://gist.github.com/catarak/70c9301f0fd1ac2d6b58de03f61997e3) for creating an S3 bucket for testing, or if you don't want to do that, I can add you to one of my S3 buckets.
 
-7. `$ npm run fetch-examples` - this downloads the example sketches into a user called 'p5'
-8. `$ npm start`
-9. Navigate to [http://localhost:8000](http://localhost:8000) in your browser
-10. Install the [React Developer Tools](https://chrome.google.com/webstore/detail/react-developer-tools/fmkadmapgofadopljbjfkapdkoienihi?hl=en).
+6. `$ npm run fetch-examples` - this downloads the example sketches into a user called 'p5'
+7. `$ npm start`
+8. Navigate to [http://localhost:8000](http://localhost:8000) in your browser
+9. Install the [React Developer Tools](https://chrome.google.com/webstore/detail/react-developer-tools/fmkadmapgofadopljbjfkapdkoienihi?hl=en).
 10. Open and close the Redux DevTools using `ctrl+h`, and move them with `ctrl+w`
 
 ### Testing SSL on your local machine
@@ -68,10 +67,9 @@ If you don't have the full server environment running, you can launch a one-off
 
 ## Production Installation
 1. Clone this repostory and `cd` into it
-2. `$ git submodule init`
-3. `$ npm install`
-4. Install MongoDB and make sure it is running
-5. Create a file called `.env` in the root of this directory that looks like
+2. `$ npm install`
+3. Install MongoDB and make sure it is running
+4. Create a file called `.env` in the root of this directory that looks like
 
   ```
   API_URL=/api
@@ -91,9 +89,9 @@ If you don't have the full server environment running, you can launch a one-off
   ```
   For production, you will need to have real Github and Amazon credentions. Refer to [this gist](https://gist.github.com/catarak/70c9301f0fd1ac2d6b58de03f61997e3) for creating an S3 bucket for testing.
 
-6. `$ npm run fetch-examples` - this downloads the example sketches into a user called 'p5'
-7. `$ npm run build`
-8. `$ npm run start:prod`
+5. `$ npm run fetch-examples` - this downloads the example sketches into a user called 'p5'
+6. `$ npm run build`
+7. `$ npm run start:prod`
 
 ### For Production Setup with PM2
 1. `$ npm install -g pm2`
@@ -119,7 +117,7 @@ http://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html#VirtualHostin
 
 ## Accessibility Guidelines
 
-Here is guide on [how to use the accessible editor](https://gist.github.com/MathuraMG/e86666b7b41fbc8c078bad9aff3f666d)
+Here is guide on [how to use the accessible editor](https://gist.github.com/MathuraMG/e86666b7b41fbc8c078bad9aff3f666d) and here is an overview of the [p5-accessibility.js](https://github.com/MathuraMG/p5-accessibility/blob/master/README.md) library that makes p5.js sketches accessible to screen readers.
 
 The code for the p5.js web editor adheres to web accessibility standards. The following guidelines will help to ensure that accessibility continues to be a priority as development continues.
 
@@ -146,7 +144,7 @@ See [CONTRIBUTING.md](https://github.com/processing/p5.js-web-editor/blob/master
 
 The p5.js Web Editor is built on a MERN stack - MongoDB, Express, React/Redux, and Node. For a reference to the file structure format I am using, please look at the [Mern Starter](https://github.com/Hashnode/mern-starter) and [this comment](https://github.com/Hashnode/mern-starter/issues/90#issuecomment-221553573).
 
-This project uses an in-development [p5.js interceptor library](https://github.com/MathuraMG/p5-interceptor) for accessibility as git submodule. Every time you run `npm install`, it will update the interceptor to HEAD, so it is important to do this often.  
+This project uses an in-development [p5-accessibility.js library](https://github.com/MathuraMG/p5-accessibility) for accessibility.
 
 This project does not use CSS Modules, but uses Sass. I like to follow [BEM rules](http://getbem.com/) for CSS naming conventions, write OOSCSS with placeholders and mixins, and follow the [7-1 Pattern](https://sass-guidelin.es/#the-7-1-pattern) for Sass.
 

client/modules/IDE/components/PreviewFrame.jsx

@@ -198,49 +198,31 @@ class PreviewFrame extends React.Component {
     this.resolveScripts(sketchDoc, resolvedFiles);
     this.resolveStyles(sketchDoc, resolvedFiles);
 
-    let scriptsToInject = [
+    const scriptsToInject = [
       '/loop-protect.min.js',
       '/hijackConsole.js'
     ];
-    if (
-      this.props.isAccessibleOutputPlaying ||
-      ((this.props.textOutput || this.props.gridOutput || this.props.soundOutput) && this.props.isPlaying)) {
-      let interceptorScripts = [];
-      interceptorScripts = [
-        '/p5-interceptor/registry.js',
-        '/p5-interceptor/loadData.js',
-        '/p5-interceptor/interceptorHelperFunctions.js',
-        '/p5-interceptor/baseInterceptor.js',
-        '/p5-interceptor/entities/entity.min.js',
-        '/p5-interceptor/ntc.min.js'
-      ];
-      if (!this.props.textOutput && !this.props.gridOutput && !this.props.soundOutput) {
-        this.props.setTextOutput(true);
-      }
-      if (this.props.textOutput) {
-        let textInterceptorScripts = [];
-        textInterceptorScripts = [
-          '/p5-interceptor/textInterceptor/interceptorFunctions.js',
-          '/p5-interceptor/textInterceptor/interceptorP5.js'
-        ];
-        interceptorScripts = interceptorScripts.concat(textInterceptorScripts);
-      }
-      if (this.props.gridOutput) {
-        let gridInterceptorScripts = [];
-        gridInterceptorScripts = [
-          '/p5-interceptor/gridInterceptor/interceptorFunctions.js',
-          '/p5-interceptor/gridInterceptor/interceptorP5.js'
-        ];
-        interceptorScripts = interceptorScripts.concat(gridInterceptorScripts);
-      }
-      if (this.props.soundOutput) {
-        let soundInterceptorScripts = [];
-        soundInterceptorScripts = [
-          '/p5-interceptor/soundInterceptor/interceptorP5.js'
-        ];
-        interceptorScripts = interceptorScripts.concat(soundInterceptorScripts);
-      }
-      scriptsToInject = scriptsToInject.concat(interceptorScripts);
+    const accessiblelib = sketchDoc.createElement('script');
+    accessiblelib.setAttribute('src', 'https://cdn.rawgit.com/MathuraMG/p5-accessibility/e856365c/dist/p5-accessibility.js');
+    if (this.props.textOutput) {
+      sketchDoc.getElementById('accessibility-library').appendChild(accessiblelib);
+      const textSection = sketchDoc.createElement('section');
+      textSection.setAttribute('id', 'textOutput-content');
+      sketchDoc.getElementById('accessible-outputs').appendChild(textSection);
+      this.iframeElement.focus();
+    }
+    if (this.props.gridOutput) {
+      sketchDoc.getElementById('accessibility-library').appendChild(accessiblelib);
+      const gridSection = sketchDoc.createElement('section');
+      gridSection.setAttribute('id', 'gridOutput-content');
+      sketchDoc.getElementById('accessible-outputs').appendChild(gridSection);
+      this.iframeElement.focus();
+    }
+    if (this.props.soundOutput) {
+      sketchDoc.getElementById('accessibility-library').appendChild(accessiblelib);
+      const soundSection = sketchDoc.createElement('section');
+      soundSection.setAttribute('id', 'soundOutput-content');
+      sketchDoc.getElementById('accessible-outputs').appendChild(soundSection);
     }
 
     scriptsToInject.forEach((scriptToInject) => {
@@ -419,7 +401,7 @@ PreviewFrame.propTypes = {
   textOutput: PropTypes.bool.isRequired,
   gridOutput: PropTypes.bool.isRequired,
   soundOutput: PropTypes.bool.isRequired,
-  setTextOutput: PropTypes.func.isRequired,
+  // setTextOutput: PropTypes.func.isRequired,
   htmlFile: PropTypes.shape({
     content: PropTypes.string.isRequired
   }).isRequired,

client/modules/IDE/pages/IDEView.jsx

@@ -8,7 +8,6 @@ import Editor from '../components/Editor';
 import Sidebar from '../components/Sidebar';
 import PreviewFrame from '../components/PreviewFrame';
 import Toolbar from '../components/Toolbar';
-import AccessibleOutput from '../components/AccessibleOutput';
 import Preferences from '../components/Preferences';
 import NewFileModal from '../components/NewFileModal';
 import NewFolderModal from '../components/NewFolderModal';
@@ -375,14 +374,8 @@ class IDEView extends React.Component {
                         ) &&
                           this.props.ide.isPlaying
                       ) ||
-                        this.props.ide.isAccessibleOutputPlaying
-                    ) &&
-                      <AccessibleOutput
-                        isPlaying={this.props.ide.isPlaying}
-                        previewIsRefreshing={this.props.ide.previewIsRefreshing}
-                        textOutput={this.props.preferences.textOutput}
-                        gridOutput={this.props.preferences.gridOutput}
-                      />
+                      this.props.ide.isAccessibleOutputPlaying
+                    )
                   }
                 </div>
                 <PreviewFrame

client/modules/IDE/reducers/files.js

@@ -13,15 +13,19 @@ const defaultHTML =
 `<!DOCTYPE html>
 <html>
   <head>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.5.11/p5.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.5.11/addons/p5.dom.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.5.11/addons/p5.sound.min.js"></script>
     <link rel="stylesheet" type="text/css" href="style.css">
     <meta charset="utf-8" />
+
   </head>
   <body>
+    <section aria-label='accessible output' id='accessible-outputs'></section>
     <script src="sketch.js"></script>
-  </body>
+    <div id='accessibility-library'></div>
+    </body>
 </html>
 `;
 
@@ -30,6 +34,15 @@ const defaultCSS =
   margin: 0;
   padding: 0;
 }
+
+#accessible-outputs {
+  position: absolute;
+  left: -10000px;
+  top: auto;
+  width: 1px;
+  height: 1px;
+  overflow: hidden;
+}
 `;
 
 const initialState = () => {

package.json

@@ -9,8 +9,7 @@
     "lint-fix": "eslint client server --ext .jsx --ext .js --fix",
     "build": "NODE_ENV=production webpack --config webpack.config.prod.js --progress",
     "test": "npm run lint",
-    "fetch-examples": "node fetch-examples.js",
-    "postinstall": "git submodule update --remote --recursive"
+    "fetch-examples": "node fetch-examples.js"
   },
   "main": "index.js",
   "author": "Cassie Tarakajian",