Merge branch 'master' into release-frozen

This commit is contained in:
Trisha Anand 2021-07-16 14:41:33 +05:30 committed by GitHub
commit bfaf856c16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 0 deletions

View File

@ -1511,6 +1511,12 @@ function* pasteWidgetSaga() {
copiedWidgetGroups,
);
selectedWidget = yield checkIfPastingIntoListWidget(
stateWidgets,
selectedWidget,
copiedWidgetGroups,
);
const pastingIntoWidgetId: string = yield getParentWidgetIdForPasting(
{ ...stateWidgets },
selectedWidget,

View File

@ -28,6 +28,7 @@ const DEFS: Def[] = [
xmlJs,
forge,
];
const bigDoc = 250;
const cls = "CodeMirror-Tern-";
const hintDelay = 1700;

View File

@ -110,6 +110,7 @@ export default function evaluate(
// so that eval can happen
const unescapedJS = unescapeJS(js.replace(beginsWithLineBreakRegex, ""));
const script = getScriptToEval(unescapedJS, evalArguments, isTriggerBased);
return (function() {
let errors: EvaluationError[] = [];
let result;