@vpmedia/phaser 1.8.0 → 1.10.0

package/README.md

@@ -1,7 +1,7 @@
 @vpmedia/phaser
 ===============
 
-[![npm version](https://badge.fury.io/js/@vpmedia%2Fphaser.svg?v=1.8.0)](https://badge.fury.io/js/@vpmedia%2Fphaser)
+[![npm version](https://badge.fury.io/js/@vpmedia%2Fphaser.svg?v=1.10.0)](https://badge.fury.io/js/@vpmedia%2Fphaser)
 [![Node.js CI](https://github.com/vpmedia/phaser/actions/workflows/node.js.yml/badge.svg)](https://github.com/vpmedia/phaser/actions/workflows/node.js.yml)
 
 @vpmedia/phaser is the modern ECMAScript port of the popular Phaser game engine v2.6.2.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vpmedia/phaser",
-  "version": "1.8.0",
+  "version": "1.10.0",
   "description": "@vpmedia/phaser is the modern ECMAScript port of the popular Phaser game engine v2.6.2",
   "author": "Andras Csizmadia <andras@vpmedia.hu> (www.vpmedia.hu)",
   "license": "MIT",

package/src/phaser/core/loader.js

@@ -15,8 +15,8 @@ export default class {
     this.game = game;
     this.cache = game.cache;
     this.isLoading = false;
-    this.isLogging = false;
-    this.isUseRetry = false;
+    this.isUseLog = false;
+    this.isUseRetry = true;
     this.maxRetry = 1;
     this.hasLoaded = false;
     this.preloadSprite = null;
@@ -430,9 +430,9 @@ export default class {
       // Flight queue is empty but file list is not done being processed.
       // This indicates a critical internal error with no known recovery.
       console.warn('Loader - aborting: processing queue empty, loading may have stalled');
-      const _this = this;
+      const scope = this;
       setTimeout(() => {
-        _this.finishedLoading(true);
+        scope.finishedLoading(true);
       }, 2000);
     }
   }
@@ -557,7 +557,7 @@ export default class {
 
   loadImageTag(file) {
     this.log('loadImageTag', file);
-    const _this = this;
+    const scope = this;
     file.data = new Image();
     file.data.name = file.key;
     if (this.crossOrigin) {
@@ -567,17 +567,17 @@ export default class {
       if (file.data.onload) {
         file.data.onload = null;
         file.data.onerror = null;
-        _this.fileComplete(file);
+        scope.fileComplete(file);
       }
     };
     file.data.onerror = () => {
-      if (_this.isUseRetry && (!file.numRetry || file.numRetry < _this.maxRetry)) {
+      if (scope.isUseRetry && (!file.numRetry || file.numRetry < scope.maxRetry)) {
         file.numRetry = !file.numRetry ? 1 : file.numRetry += 1;
-        _this.loadImageTag(file);
+        scope.loadImageTag(file);
       } else if (file.data.onload) {
         file.data.onload = null;
         file.data.onerror = null;
-        _this.fileError(file);
+        scope.fileError(file);
       }
     };
     file.data.src = this.transformUrl(file.url, file);
@@ -585,6 +585,7 @@ export default class {
 
   xhrLoad(file, url, type, onload, onerror) {
     this.log('xhrLoad', file);
+    const scope = this;
     const xhr = new XMLHttpRequest();
     xhr.open('GET', url, true);
     xhr.responseType = type;
@@ -595,11 +596,16 @@ export default class {
       xhr.setRequestHeader('Accept', this.headers[file.type]);
     }
     onerror = onerror || this.fileError;
-    const scope = this;
     xhr.onload = () => {
       try {
         if (xhr.readyState === 4 && xhr.status >= 400 && xhr.status <= 599) { // Handle HTTP status codes of 4xx and 5xx as errors, even if xhr.onerror was not called.
-          return onerror.call(scope, file, xhr);
+          if (scope.isUseRetry && (!file.numRetry || file.numRetry < scope.maxRetry)) {
+            file.numRetry = !file.numRetry ? 1 : file.numRetry += 1;
+            scope.xhrLoad(file, url, type, onload, onerror);
+            return null;
+          } else {
+            return onerror.call(scope, file, xhr);
+          }
         }
         return onload.call(scope, file, xhr);
       } catch (e) {
@@ -614,13 +620,18 @@ export default class {
       return null;
     };
     xhr.onerror = () => {
-      try {
-        return onerror.call(scope, file, xhr);
-      } catch (e) {
-        if (!scope.hasLoaded) {
-          scope.asyncComplete(file, e.message || 'Exception');
-        } else {
-          scope.game.exceptionHandler(e);
+      if (scope.isUseRetry && (!file.numRetry || file.numRetry < scope.maxRetry)) {
+        file.numRetry = !file.numRetry ? 1 : file.numRetry += 1;
+        scope.xhrLoad(file, url, type, onload, onerror);
+      } else {
+        try {
+          return onerror.call(scope, file, xhr);
+        } catch (e) {
+          if (!scope.hasLoaded) {
+            scope.asyncComplete(file, e.message || 'Exception');
+          } else {
+            scope.game.exceptionHandler(e);
+          }
         }
       }
       return null;
@@ -824,7 +835,7 @@ export default class {
   }
 
   log(message, data = '') {
-    if (!this.isLogging) {
+    if (!this.isUseLog) {
       return;
     }
     console.log(`[Loader] ${message}`, data);