Merge branch 'master' into temporalmedia-mehek

1 files changed, 22 insertions, 21 deletions

diff --git a/src/client/documents/DocumentTypes.ts b/src/client/documents/DocumentTypes.ts
index dba7ff907..161dff6e0 100644
--- a/src/client/documents/DocumentTypes.ts
+++ b/src/client/documents/DocumentTypes.ts
@@ -2,17 +2,17 @@ export enum DocumentType {
     NONE = "none",
 
     // core data types
-    RTF = "rtf",      // rich text
-    IMG = "image",      // image box
-    WEB = "web",        // web page or html clipping
-    COL = "collection", // collection
-    KVP = "kvp",        // key value pane
-    VID = "video",      // video
-    AUDIO = "audio",    // audio
-    PDF = "pdf",        // pdf
-    INK = "inks",        // ink stroke
-    SCREENSHOT = "screenshot",  // view of a desktop application
-    FONTICON = "fonticonbox",   // font icon
+    RTF = "rtf",
+    IMG = "image",
+    WEB = "web",
+    COL = "collection",
+    KVP = "kvp",
+    VID = "video",
+    AUDIO = "audio",
+    PDF = "pdf",
+    INK = "inks",
+    SCREENSHOT = "screenshot",
+    FONTICON = "fonticonbox",
     FILTER = "filter",
     SEARCH = "search",          // search query
     LABEL = "label",            // simple text label
@@ -23,19 +23,20 @@ export enum DocumentType {
     SCRIPTING = "script",       // script editor
     EQUATION = "equation",      // equation editor
     FUNCPLOT = "funcplot",      // function plotter
+    MAP = "map",
 
     // special purpose wrappers that either take no data or are compositions of lower level types
-    LINK = "link",              // link  (view of a document that acts as a link)
-    LINKANCHOR = "linkanchor",  // blue dot link anchor  (view of a link document's anchor)
-    IMPORT = "import",          // directory import box  (file system directory)
-    SLIDER = "slider",          // number slider  (view of a number)
-    PRES = "presentation",      // presentation   (view of a collection) --- shouldn't this be a view type?  technically requires a special view in which documents must have their aliasOf fields filled in
-    PRESELEMENT = "preselement",// presentation item (view of a document in a collection)
-    COLOR = "color",            // color picker (view of a color picker for a color string)
-    YOUTUBE = "youtube",        // youtube directory (view of you tube search results)
+    LINK = "link",
+    LINKANCHOR = "linkanchor",
+    IMPORT = "import",
+    SLIDER = "slider",
+    PRES = "presentation",
+    PRESELEMENT = "preselement",
+    COLOR = "color",
+    YOUTUBE = "youtube",
     SEARCHITEM = "searchitem",
-    COMPARISON = "comparison",  // before/after view with slider (view of 2 images)
-    GROUP = "group",            // group of users
+    COMPARISON = "comparison",
+    GROUP = "group",
 
     LINKDB = "linkdb",          // database of links  ??? why do we have this
     SCRIPTDB = "scriptdb",      // database of scripts