#109. Fix promise with Hoek

GigaTables · May 8, 2018 · b65e51e · b65e51e
1 parent c81b811
commit b65e51e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/build/index.js b/build/index.js
diff --git a/main.js b/main.js
@@ -108,10 +108,10 @@ let settings = {
         'X-Api-Key': '8013b37216a07f50027139d89ee9f822e3784049',
         'X-Header-Key': 'foo-bar'
     },
-    ajax: 'http://gigatables.loc/gigatables.php',
-    // ajax: new Promise((resolve) => {
-    //     resolve('http://gigatables.loc/gigatables.php')
-    // }),
+    // ajax: 'http://gigatables.loc/gigatables.php',
+    ajax: new Promise((resolve) => {
+        resolve('http://localhost/gigatables.php')
+    }),
     // ajaxAutoloadData: true, // default false
     // ajaxAutoloadPeriod: 8, // sec
     requestType: 'GET',

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gigatables-react",
-  "version": "2.4.51",
+  "version": "2.4.52",
   "description": "GigaTables is a ReactJS plug-in to help web-developers process table-data in applications and CMS, CRM, ERP or similar systems. It supports ajax data processing/editing (CRUD), pagination, cross-sorting, global search, shft/ctrl rows selection, 7 popular languages and more.",
   "main": "./build/index.js",
   "dependencies": {

diff --git a/src/Reactables.jsx b/src/Reactables.jsx
@@ -121,7 +121,9 @@ class Reactables extends Main {
 
     resolvePromiseUrl(destination, colsLen) {
         if (typeof destination.then === CommonConstants.FUNCTION) {
-            destination.then((url) => {
+            // todo: analyze - somehow Promise is broken by Hoek.applyToDefaults(this.defaultSettings, this.props.settings);
+            const {ajax} = this.props.settings;
+            ajax.then((url) => {
                 this.setData(url, colsLen);
             });
         } else {