diff options
author | kimdahey <claire_kim1@brown.edu> | 2019-09-21 15:43:22 -0400 |
---|---|---|
committer | kimdahey <claire_kim1@brown.edu> | 2019-09-21 15:43:22 -0400 |
commit | 0b0789816e8a996b32d92e305da84b5922a49f40 (patch) | |
tree | e0a5ae13305c3f4d20413c5930f8281741fade98 /src/client/views/ScriptBox.tsx | |
parent | f520d5a821b515e0c216f055e93f0549bd6733a9 (diff) | |
parent | 1d5dc3eb4095cea017412de9519b8eaee979c16c (diff) |
merge conflicts
Diffstat (limited to 'src/client/views/ScriptBox.tsx')
-rw-r--r-- | src/client/views/ScriptBox.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/ScriptBox.tsx b/src/client/views/ScriptBox.tsx index 8f06cf770..8ef9f3be6 100644 --- a/src/client/views/ScriptBox.tsx +++ b/src/client/views/ScriptBox.tsx @@ -98,7 +98,7 @@ export class ScriptBox extends React.Component<ScriptBoxProps> { // tslint:disable-next-line: no-unnecessary-callback-wrapper let params: string[] = []; let setParams = (p: string[]) => params.splice(0, params.length, ...p); - let scriptingBox = <ScriptBox initialText={originalText} setParams={setParams} onCancel={() => overlayDisposer()} onSave={(text, onError) => { + let scriptingBox = <ScriptBox initialText={originalText} setParams={setParams} onCancel={overlayDisposer} onSave={(text, onError) => { if (prewrapper) { text = prewrapper + text + (postwrapper ? postwrapper : ""); } |