Merge branch 'master' into secondpropertiesmenu-emily

1 files changed, 9 insertions, 9 deletions

diff --git a/src/Utils.ts b/src/Utils.ts
index e03632c8b..599c6456a 100644
--- a/src/Utils.ts
+++ b/src/Utils.ts
@@ -16,18 +16,18 @@ export namespace Utils {
         return Date.now() - downTime < Utils.CLICK_TIME && Math.abs(x - downX) < Utils.DRAG_THRESHOLD && Math.abs(y - downY) < Utils.DRAG_THRESHOLD;
     }
 
-    export function cleanDocumentType(type: DocumentType)  {
-        switch(type) {
+    export function cleanDocumentType(type: DocumentType) {
+        switch (type) {
             case DocumentType.IMG:
-                return "Image"
+                return 'Image';
             case DocumentType.AUDIO:
-                return "Audio"
+                return 'Audio';
             case DocumentType.COL:
-                return "Collection"
+                return 'Collection';
             case DocumentType.RTF:
-                return "Text"
-            default: 
-                return type.charAt(0).toUpperCase() + type.slice(1)
+                return 'Text';
+            default:
+                return type.charAt(0).toUpperCase() + type.slice(1);
         }
     }
 
@@ -140,7 +140,7 @@ export namespace Utils {
     }
 
     export function colorString(color: ColorState) {
-        return color.hex.startsWith('#') ? color.hex + (color.rgb.a ? decimalToHexString(Math.round(color.rgb.a * 255)) : 'ff') : color.hex;
+        return color.hex.startsWith('#') && color.hex.length < 8 ? color.hex + (color.rgb.a ? decimalToHexString(Math.round(color.rgb.a * 255)) : 'ff') : color.hex;
     }
 
     export function fromRGBAstr(rgba: string) {