added image file extension tests, bumped version number

huhang2004 · Dec 1, 2019 · 02ccff1 · 02ccff1
1 parent f4f9eb9
commit 02ccff1
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 12 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # LoadJS Changelog
 
+## 4.2.0 - December 1, 2019
+
+* Added support for .webp image extensions
+
 ## 4.0.1 - September 25, 2019
 
 * Removed unnecessary console.log() statement

diff --git a/README.md b/README.md
@@ -42,8 +42,8 @@ loadjs.ready('foobar', {
 ```
 
 The latest version of LoadJS can be found in the `dist/` directory in this repository:
- * [https://cdn.rawgit.com/muicss/loadjs/4.0.1/dist/loadjs.js](https://cdn.rawgit.com/muicss/loadjs/4.0.1/dist/loadjs.js) (for development)
- * [https://cdn.rawgit.com/muicss/loadjs/4.0.1/dist/loadjs.min.js](https://cdn.rawgit.com/muicss/loadjs/4.0.1/dist/loadjs.min.js) (for production)
+ * [https://cdn.rawgit.com/muicss/loadjs/4.2.0/dist/loadjs.js](https://cdn.rawgit.com/muicss/loadjs/4.2.0/dist/loadjs.js) (for development)
+ * [https://cdn.rawgit.com/muicss/loadjs/4.2.0/dist/loadjs.min.js](https://cdn.rawgit.com/muicss/loadjs/4.2.0/dist/loadjs.min.js) (for production)
 
 You can also use it as a CJS or AMD module:
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "loadjs",
-  "version": "4.0.1",
+  "version": "4.2.0",
   "license": "MIT",
   "authors": [
     "Andres Morey <[email protected]>"

diff --git a/dist/loadjs.js b/dist/loadjs.js
@@ -125,7 +125,7 @@ function loadFile(path, callbackFn, args, numTries) {
       e.rel = 'preload';
       e.as = 'style';
     }
-  } else if (/(^img!|\.(png|gif|jpg|svg)$)/.test(pathname)) {
+  } else if (/(^img!|\.(png|gif|jpg|svg|webp)$)/.test(pathname)) {
     // image
     e = doc.createElement('img');
     e.src = pathStripped;    

diff --git a/dist/loadjs.min.js b/dist/loadjs.min.js
diff --git a/dist/loadjs.umd.js b/dist/loadjs.umd.js
@@ -133,7 +133,7 @@ function loadFile(path, callbackFn, args, numTries) {
       e.rel = 'preload';
       e.as = 'style';
     }
-  } else if (/(^img!|\.(png|gif|jpg|svg)$)/.test(pathname)) {
+  } else if (/(^img!|\.(png|gif|jpg|svg|webp)$)/.test(pathname)) {
     // image
     e = doc.createElement('img');
     e.src = pathStripped;    

diff --git a/examples/assets/loadjs/loadjs.js b/examples/assets/loadjs/loadjs.js
@@ -125,7 +125,7 @@ function loadFile(path, callbackFn, args, numTries) {
       e.rel = 'preload';
       e.as = 'style';
     }
-  } else if (/(^img!|\.(png|gif|jpg|svg)$)/.test(pathname)) {
+  } else if (/(^img!|\.(png|gif|jpg|svg|webp)$)/.test(pathname)) {
     // image
     e = doc.createElement('img');
     e.src = pathStripped;    

diff --git a/examples/assets/loadjs/loadjs.min.js b/examples/assets/loadjs/loadjs.min.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "loadjs",
-  "version": "4.0.1",
+  "version": "4.2.0",
   "license": "MIT",
   "description": "Tiny async loader for modern browsers",
   "keywords": [

diff --git a/test/.DS_Store b/test/.DS_Store
diff --git a/test/assets/flash.gif b/test/assets/flash.gif
diff --git a/test/assets/flash.webp b/test/assets/flash.webp
diff --git a/test/assets/loadjs/loadjs.js b/test/assets/loadjs/loadjs.js
@@ -125,7 +125,7 @@ function loadFile(path, callbackFn, args, numTries) {
       e.rel = 'preload';
       e.as = 'style';
     }
-  } else if (/(^img!|\.(png|gif|jpg|svg)$)/.test(pathname)) {
+  } else if (/(^img!|\.(png|gif|jpg|svg|webp)$)/.test(pathname)) {
     // image
     e = doc.createElement('img');
     e.src = pathStripped;    

diff --git a/test/assets/loadjs/loadjs.min.js b/test/assets/loadjs/loadjs.min.js
diff --git a/test/tests.js b/test/tests.js
@@ -426,6 +426,22 @@ describe('LoadJS tests', function() {
     });
 
 
+    it('detects png|gif|jpg|svg|webp extensions', function(done) {
+      let files = [
+        'assets/flash.png',
+        'assets/flash.gif',
+        'assets/flash.jpg',
+        'assets/flash.svg',
+        'assets/flash.webp'
+      ];
+
+      loadjs(files, function() {
+        files.forEach(file => {assertLoaded(file);});
+        done();
+      });
+    });
+
+
     it('supports urls with query arguments', function(done) {
       var src = 'assets/flash.png?' + Math.random();