First iteration fixes

microsoft · Nov 13, 2017 · 01d21ca · 01d21ca
1 parent b46ad7a
commit 01d21ca
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 48 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -65,31 +65,7 @@ module.exports = (config) => {
                 served: true
             },
             {
-                pattern: 'test/images/*.png',
-                watched: false,
-                included: false,
-                served: true
-            },
-            {
-                pattern: 'test/images/*.jpg',
-                watched: false,
-                included: false,
-                served: true
-            },
-            {
-                pattern: 'test/images/*.gif',
-                watched: false,
-                included: false,
-                served: true
-            },
-            {
-                pattern: 'test/images/*.svg',
-                watched: false,
-                included: false,
-                served: true
-            },
-            {
-                pattern: 'test/images/*.bmp',
+                pattern: 'test/images/*.+(png|jpg|gif|svg|bmp)',
                 watched: false,
                 included: false,
                 served: true

diff --git a/lib/index.js b/lib/index.js
diff --git a/lib/index.js.map b/lib/index.js.map
diff --git a/src/validationHelper.ts b/src/validationHelper.ts
@@ -28,8 +28,8 @@ module powerbi.extensibility.utils.dataview {
     export module validationHelper {
         export function isImageUrlAllowed(url: string): boolean {
             // Excludes all URLs that don't contain .gif .jpg .png or .svg extensions and don't start from "http(s)://".
-            // As a result -- also excludes all directives such as "javascript:", "data:" and "blob:".
-            return (/^https?:\/\/.+\.(gif|jpg|png|svg)$/i).test(url);
+            // Base64 incoded images are allowable too.
+            return (/^https?:\/\/.+\.(gif|jpg|png|svg)$/i).test(url) || (/^data:image\/(gif|jpeg|png|svg\+xml);base64,/i).test(url);
         }
 
         export function isFileImage(url: string, imageCheckResultCallBack: (isImage: boolean, contentType: string) => void) {

diff --git a/test/data/someplaintext.txt b/test/data/someplaintext.txt
@@ -1 +1 @@
-Plain text with some data taht is used in unit tests
+Plain text with some data that is used in unit tests
diff --git a/test/images/justok.svg b/test/images/justok.svg
diff --git a/test/images/sun.svg b/test/images/sun.svg