Merge branch 'master' into v5.13.x

src/models/data/data-types.test.ts

@@ -157,7 +157,10 @@ describe("data-types", () => {
       "ccimg://fbrtdb.concord.org/hello.png",
       "ccimg://fbrtdb.concord.org/anything.txt",
       "ccimg://not-a-cc.domain.com/hello.png",
-      "random.string.com/"
+      "random.string.com/",
+      "curriculum/unitname/images/test.png",
+      "test/unit/images/test.png",
+      "test.png"
     ];
     const testCases = valuesToTest.map(value => {
       return [value, isImageUrl(value)];
@@ -168,6 +171,9 @@ describe("data-types", () => {
 "ccimg://fbrtdb.concord.org/anything.txt" => true
 "ccimg://not-a-cc.domain.com/hello.png" => false
 "random.string.com/" => false
+"curriculum/unitname/images/test.png" => true
+"test/unit/images/test.png" => true
+"test.png" => false
 `);
   });
 

src/models/data/data-types.ts

@@ -133,6 +133,7 @@ export function isImageUrl(val: IValueType) {
   // The ImageMap has an isImageUrl function but it will pickup pretty much any http URL.
   // And we don't want to add a dependency on the imageMap to this shared code.
   const ccImagePattern = /^ccimg:\/\/fbrtdb\.concord\.org/;
-  const imageUrlPattern = /^(https?:\/\/.*\.(gif|jpg|jpeg|png)|data:image\/(gif|jpg|jpeg|png);base64,)/i;
+  const imageUrlPattern =
+    /(^(https?:\/\/)?[^:]*\/[^:]*\.(gif|jpg|jpeg|png)$)|(^data:image\/(gif|jpg|jpeg|png);base64,)/i;
   return ccImagePattern.test(val) || imageUrlPattern.test(val);
 }