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
This commit is contained in:
Mathura MG 2017-02-15 16:17:57 -05:00 committed by Cassie Tarakajian
parent 52a28328e4
commit e354fc0cea
2 changed files with 14 additions and 8 deletions

View file

@ -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);

@ -1 +1 @@
Subproject commit dc005e07b691cf16642108f83024daad2e9d70e4
Subproject commit 781897696a201e8c340c0d4c93333f15145d07fd