Merge branch 'master' into keanu-comments

2 files changed, 2 insertions, 5 deletions

diff --git a/src/client/documents/DocUtils.ts b/src/client/documents/DocUtils.ts
index 0168e0a3b..30b71a09b 100644
--- a/src/client/documents/DocUtils.ts
+++ b/src/client/documents/DocUtils.ts
@@ -40,7 +40,6 @@ const { DFLT_IMAGE_NATIVE_DIM } = require('../views/global/globalCssVariables.mo
 
 const defaultNativeImageDim = Number(DFLT_IMAGE_NATIVE_DIM.replace('px', ''));
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace DocUtils {
     function matchFieldValue(doc: Doc, key: string, valueIn: unknown): boolean {
         let value = valueIn;
@@ -467,7 +466,7 @@ export namespace DocUtils {
             .concat(userTypes)
             .concat(clickFuncs)
             .map(btnDoc => (btnDoc.dragFactory as Doc) || btnDoc)
-            .filter(doc => doc.isTemplateDoc);
+            .filter(d => d.isTemplateDoc);
         // bcz: this is hacky -- want to have different templates be applied depending on the "type" of a document.  but type is not reliable and there could be other types of template searches so this should be generalized
         // first try to find a template that matches the specific document type (<typeName>_<templateName>).  otherwise, fallback to a general match on <templateName>
         !docLayoutTemplate &&
diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index 9ce465538..6b5469cca 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -494,9 +494,7 @@ export class DocumentOptions {
 
 export const DocOptions = new DocumentOptions();
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace Docs {
-    // eslint-disable-next-line @typescript-eslint/no-namespace
     export namespace Prototypes {
         type LayoutSource = { LayoutString: (key: string) => string };
         type PrototypeTemplate = {
@@ -654,7 +652,7 @@ export namespace Docs {
      * Encapsulates the factory used to create new document instances
      * delegated from top-level prototypes
      */
-    // eslint-disable-next-line @typescript-eslint/no-namespace
+
     export namespace Create {
         /**
          * This function receives the relevant document prototype and uses