Bladeren bron

Change Tools.LoadFile to return XMLHttpRequest when available

Gary Hsu 7 jaren geleden
bovenliggende
commit
886fe69cd0
1 gewijzigde bestanden met toevoegingen van 6 en 2 verwijderingen
  1. 6 2
      src/Tools/babylon.tools.ts

+ 6 - 2
src/Tools/babylon.tools.ts

@@ -481,13 +481,15 @@
         }
         }
 
 
         //ANY
         //ANY
-        public static LoadFile(url: string, callback: (data: any) => void, progressCallBack?: (data: any) => void, database?: Database, useArrayBuffer?: boolean, onError?: (request?: XMLHttpRequest, exception?: any) => void): void {
+        public static LoadFile(url: string, callback: (data: any) => void, progressCallBack?: (data: any) => void, database?: Database, useArrayBuffer?: boolean, onError?: (request?: XMLHttpRequest, exception?: any) => void): XMLHttpRequest {
             url = Tools.CleanUrl(url);
             url = Tools.CleanUrl(url);
 
 
             url = Tools.PreprocessUrl(url);
             url = Tools.PreprocessUrl(url);
 
 
+            var request: XMLHttpRequest;
+
             var noIndexedDB = () => {
             var noIndexedDB = () => {
-                var request = new XMLHttpRequest();
+                request = new XMLHttpRequest();
                 var loadUrl = Tools.BaseUrl + url;
                 var loadUrl = Tools.BaseUrl + url;
                 request.open('GET', loadUrl, true);
                 request.open('GET', loadUrl, true);
 
 
@@ -550,6 +552,8 @@
                     noIndexedDB();
                     noIndexedDB();
                 }
                 }
             }
             }
+
+            return request;
         }
         }
 
 
         /** 
         /**