reorg and cleanup a bit of colelctionfreeformview. minor other cleanup.

1 files changed, 4 insertions, 5 deletions

diff --git a/src/fields/Doc.ts b/src/fields/Doc.ts
index 4ae436083..ce5b08440 100644
--- a/src/fields/Doc.ts
+++ b/src/fields/Doc.ts
@@ -25,6 +25,7 @@ import { Cast, FieldValue, NumCast, StrCast, ToConstructor } from "./Types";
 import { AudioField, ImageField, PdfField, VideoField, WebField } from "./URLField";
 import { deleteProperty, GetEffectiveAcl, getField, getter, makeEditable, makeReadOnly, normalizeEmail, setter, SharingPermissions, updateFunction } from "./util";
 import JSZip = require("jszip");
+import { prefix } from "@fortawesome/free-regular-svg-icons";
 
 export namespace Field {
     export function toKeyValueString(doc: Doc, key: string): string {
@@ -230,10 +231,11 @@ export class Doc extends RefField {
         const sameAuthor = this.author === Doc.CurrentUserEmail;
         if (set) {
             for (const key in set) {
-                if (!key.startsWith("fields.")) {
+                const fprefix = "fields.";
+                if (!key.startsWith(fprefix)) {
                     continue;
                 }
-                const fKey = key.substring(7);
+                const fKey = key.substring(fprefix.length);
                 const fn = async () => {
                     const value = await SerializationHelper.Deserialize(set[key]);
                     const prev = GetEffectiveAcl(this);
@@ -246,9 +248,6 @@ export class Doc extends RefField {
                     if (prev === AclPrivate && GetEffectiveAcl(this) !== AclPrivate) {
                         DocServer.GetRefField(this[Id], true);
                     }
-                    // if (prev !== AclPrivate && GetEffectiveAcl(this) === AclPrivate) {
-                    //     this[FieldsSym](true);
-                    // }
                 };
                 if (sameAuthor || fKey.startsWith("acl") || DocServer.getFieldWriteMode(fKey) !== DocServer.WriteMode.Playground) {
                     delete this[CachedUpdates][fKey];