Merge pull request #9 from yama-dev/v0.5.0

V0.5.0

Author: yama-dev

README.md

@@ -16,7 +16,7 @@ Get multi data library.
 
 - npm -> [https://www.npmjs.com/package/js-multi-data-module](https://www.npmjs.com/package/js-multi-data-module)
 
-- Standalone(CDN) -> [https://cdn.jsdelivr.net/gh/yama-dev/js-multi-data-module@v0.4.11/dist/js-multi-data-module.js](https://cdn.jsdelivr.net/gh/yama-dev/js-multi-data-module@v0.4.11/dist/js-multi-data-module.js)
+- Standalone(CDN) -> [https://cdn.jsdelivr.net/gh/yama-dev/js-multi-data-module@v0.5.0/dist/js-multi-data-module.js](https://cdn.jsdelivr.net/gh/yama-dev/js-multi-data-module@v0.5.0/dist/js-multi-data-module.js)
 
 - Zip -> [yama-dev/js-multi-data-module](https://github.com/yama-dev/js-multi-data-module/releases/latest)
 
@@ -90,6 +90,9 @@ import MULTI_DATA_MODULE from 'js-multi-data-module';
       },
       Complete: function(data, list){
         console.log(data, list);
+      },
+      Fail: function(err){
+        console.log(err);
       }
     }
   });

dist/js-multi-data-module.js

@@ -243,7 +243,7 @@ <h3>Advanced Use</h3>
             animation: motionChange 0.7s cubic-bezier(0.215, 0.61, 0.355, 1) 0.2s 1 forwards;
   }
 </style>
-<script src="https://cdn.jsdelivr.net/npm/vue"></script>
+<script src="https://cdn.jsdelivr.net/npm/vue@2.6.14"></script>
 <script>
 var app = new Vue({
   el: '#app',
@@ -328,7 +328,10 @@ <h3>Advanced Use</h3>
             setTimeout(function(){
               _that.flgLoading = false;
             },1000)
-          }
+          },
+          Fail: function(err){
+            console.log(err);
+          },
         }
       });
     },

examples/index.html

@@ -1,6 +1,6 @@
 {
   "name": "js-multi-data-module",
-  "version": "0.4.11",
+  "version": "0.5.0",
   "description": "Get multi data library.",
   "keywords": [
     "multi-data",
@@ -39,9 +39,7 @@
     "webpack": "^4.28.4",
     "webpack-cli": "^3.2.1"
   },
-  "dependencies": {
-    "es6-promise": "^4.2.5"
-  },
+  "dependencies": {},
   "eslintConfig": {
     "env": {
       "browser": true,
@@ -78,5 +76,8 @@
       "no-console": "warn",
       "no-unused-vars": "warn"
     }
+  },
+  "volta": {
+    "node": "12.22.12"
   }
 }

package.json

@@ -1,7 +1,5 @@
 /*eslint no-console: "off"*/
 
-import Promise from 'es6-promise';
-
 export default class MULTI_DATA_MODULE {
 
   constructor(options={}){
@@ -34,15 +32,16 @@ export default class MULTI_DATA_MODULE {
 
     // Data obj.
     this.DataFix = [];
-    this.DataList = {};
+    this.DataList = [];
 
     // Set callback functions.
     if(!options.on){
       options.on = {};
     }
     this.On = {
       Update   : options.on.Update||'',
-      Complete : options.on.Complete||''
+      Complete : options.on.Complete||'',
+      Fail     : options.on.Fail||''
     };
 
     // For Jsonp data.
@@ -84,7 +83,7 @@ export default class MULTI_DATA_MODULE {
           window.callback = (response)=>{
             resolve(response);
           };
-          setTimeout(()=>{ reject('error'); }, this.Config.fetch_timeout);
+          setTimeout(()=>{ reject('error: timeout'); }, this.Config.fetch_timeout);
 
         } else {
           reject('error:not found data.');
@@ -128,7 +127,7 @@ export default class MULTI_DATA_MODULE {
         })
         .catch((err)=>{
           // Error.
-          console.log('%c'+err,'color: red');
+          this.OnFail({message: err, data: this.DataList[count]});
 
           this.DataFix = this.DataFix.concat(['']);
           this.DataList[count] = [];
@@ -181,7 +180,7 @@ export default class MULTI_DATA_MODULE {
           xhr.open('GET', _url, true);
           xhr.send(null);
 
-          setTimeout(()=>{ reject('error'); }, this.Config.fetch_timeout);
+          setTimeout(()=>{ reject('error: timeout'); }, this.Config.fetch_timeout);
 
         } else {
           reject('error:not found data.');
@@ -225,7 +224,7 @@ export default class MULTI_DATA_MODULE {
         })
         .catch((err)=>{
           // Error.
-          console.log('%c'+err,'color: red');
+          this.OnFail({message: err, data: this.DataList[count]});
 
           this.DataFix = this.DataFix.concat(['']);
           this.DataList[count] = [];
@@ -301,7 +300,7 @@ export default class MULTI_DATA_MODULE {
         xhr.responseType = 'document';
         xhr.send(null);
 
-        setTimeout(()=>{ reject('error'); }, this.Config.fetch_timeout);
+        setTimeout(()=>{ reject('error: timeout'); }, this.Config.fetch_timeout);
       });
 
       promise
@@ -335,7 +334,7 @@ export default class MULTI_DATA_MODULE {
         })
         .catch((err)=>{
           // Error.
-          console.log('%c'+err,'color: red');
+          this.OnFail({message: err, data: this.DataList[count]});
 
           this.DataFix = this.DataFix.concat(['']);
           this.DataList[count] = [];
@@ -419,4 +418,11 @@ export default class MULTI_DATA_MODULE {
     }
   }
 
+  OnFail(e={}){
+    // Callback function.
+    if(this.On.Fail && typeof(this.On.Fail) === 'function'){
+      this.On.Fail(e);
+    }
+  }
+
 }

src/js-multi-data-module.js

@@ -1,11 +1,6 @@
 const pkg = require('./package.json');
 
-const comment = `JS MULTI_DATA_MODULE (JavaScript Library)
-  ${pkg.name}
-Version ${pkg.version}
-Repository ${pkg.repository.url}
-Copyright ${pkg.author}
-Licensed ${pkg.license}`;
+const comment = `@${pkg.author}/${pkg.name} version:${pkg.version} repository:${pkg.repository.url} copyright:${pkg.author} licensed:${pkg.license}`;
 
 const env = process.env.NODE_ENV;