From e354fc0cea8a601e8c600ef1a1fd8ad63c932dad Mon Sep 17 00:00:00 2001
From: Mathura MG <mmg9291@gmail.com>
Date: Wed, 15 Feb 2017 16:17:57 -0500
Subject: [PATCH] Refactor interceptor code (#240)

* add p5 interceptor submodule

* update package

* remoce interceptor

* update interceptor;

* merge scripts

* change postinstall script

* refactor interceptor files

* remove merge conflicts

* change source files

* add registry class
---
 .../modules/IDE/components/PreviewFrame.jsx   | 20 ++++++++++++-------
 static/p5-interceptor                         |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/client/modules/IDE/components/PreviewFrame.jsx b/client/modules/IDE/components/PreviewFrame.jsx
index db40a757..b91d785b 100644
--- a/client/modules/IDE/components/PreviewFrame.jsx
+++ b/client/modules/IDE/components/PreviewFrame.jsx
@@ -175,24 +175,30 @@ class PreviewFrame extends React.Component {
       }
       if (this.props.textOutput === 1) {
         interceptorScripts = [
+          '/p5-interceptor/registry.js',
           '/p5-interceptor/loadData.js',
-          '/p5-interceptor/intercept-helper-functions.js',
-          '/p5-interceptor/textInterceptor/interceptor-functions.js',
-          '/p5-interceptor/textInterceptor/intercept-p5.js',
+          '/p5-interceptor/interceptorHelperFunctions.js',
+          '/p5-interceptor/baseInterceptor.js',
+          '/p5-interceptor/entities/entity.min.js',
+          '/p5-interceptor/textInterceptor/interceptorFunctions.js',
+          '/p5-interceptor/textInterceptor/interceptorP5.js',
           '/p5-interceptor/ntc.min.js'
         ];
       } else if (this.props.textOutput === 2) {
         interceptorScripts = [
+          '/p5-interceptor/registry.js',
           '/p5-interceptor/loadData.js',
-          '/p5-interceptor/intercept-helper-functions.js',
-          '/p5-interceptor/gridInterceptor/interceptor-functions.js',
-          '/p5-interceptor/gridInterceptor/intercept-p5.js',
+          '/p5-interceptor/interceptorHelperFunctions.js',
+          '/p5-interceptor/baseInterceptor.js',
+          '/p5-interceptor/entities/entity.min.js',
+          '/p5-interceptor/gridInterceptor/interceptorFunctions.js',
+          '/p5-interceptor/gridInterceptor/interceptorP5.js',
           '/p5-interceptor/ntc.min.js'
         ];
       } else if (this.props.textOutput === 3) {
         interceptorScripts = [
           '/p5-interceptor/loadData.js',
-          '/p5-interceptor/soundInterceptor/intercept-p5.js'
+          '/p5-interceptor/soundInterceptor/interceptorP5.js'
         ];
       }
       scriptsToInject = scriptsToInject.concat(interceptorScripts);
diff --git a/static/p5-interceptor b/static/p5-interceptor
index dc005e07..78189769 160000
--- a/static/p5-interceptor
+++ b/static/p5-interceptor
@@ -1 +1 @@
-Subproject commit dc005e07b691cf16642108f83024daad2e9d70e4
+Subproject commit 781897696a201e8c340c0d4c93333f15145d07fd