From 82ed151e3903eaa0cd44b09e319d231b35dd6704 Mon Sep 17 00:00:00 2001 From: uuinnk Date: Mon, 28 May 2018 18:01:45 +0700 Subject: [PATCH 01/14] add window.location.origin to ajax url --- dist/lib/be5-react.js | 2 +- src/scripts/be5/be5.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/lib/be5-react.js b/dist/lib/be5-react.js index 13f43b46..c469315d 100644 --- a/dist/lib/be5-react.js +++ b/dist/lib/be5-react.js @@ -654,7 +654,7 @@ var be5 = { }; $.ajax({ - url: url, + url: window.location.origin + url, dataType: type, type: 'POST', data: params, diff --git a/src/scripts/be5/be5.js b/src/scripts/be5/be5.js index f2d6d64e..31465091 100644 --- a/src/scripts/be5/be5.js +++ b/src/scripts/be5/be5.js @@ -230,7 +230,7 @@ const be5 = { }; $.ajax({ - url : url, + url : window.location.origin + url, dataType : type, type : 'POST', data : params, From e3d8060098a734585f8f612ce22b3b3d9921da46 Mon Sep 17 00:00:00 2001 From: uuinnk Date: Mon, 28 May 2018 18:02:05 +0700 Subject: [PATCH 02/14] 0.2.23 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index df76c753..c3bcefa0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "be5-react", - "version": "0.2.22", + "version": "0.2.23", "description": "React client UI for be5 server api", "main": "dist/lib/be5-react.js", "scripts": { From ed46f953fea1a7babc106bad065308d959a138ae Mon Sep 17 00:00:00 2001 From: uuinnk Date: Mon, 28 May 2018 18:02:32 +0700 Subject: [PATCH 03/14] 0.2.24 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c3bcefa0..59905d51 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "be5-react", - "version": "0.2.23", + "version": "0.2.24", "description": "React client UI for be5 server api", "main": "dist/lib/be5-react.js", "scripts": { From 73a0f55457f4394560cb1febf003b3a7cc4d2adf Mon Sep 17 00:00:00 2001 From: uuinnk Date: Mon, 28 May 2018 18:31:53 +0700 Subject: [PATCH 04/14] be5.serverUrlWithContext: window.serverUrlWithContext || "/" --- dist/lib/be5-react.js | 3 ++- src/scripts/be5/be5.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dist/lib/be5-react.js b/dist/lib/be5-react.js index c469315d..797de041 100644 --- a/dist/lib/be5-react.js +++ b/dist/lib/be5-react.js @@ -459,6 +459,7 @@ var be5 = { DOCUMENT_REFRESH_SUFFIX: "_refresh", appInfo: {}, + serverUrlWithContext: window.serverUrlWithContext || "/", locale: { set: function set$$1(loc, addMessages) { @@ -654,7 +655,7 @@ var be5 = { }; $.ajax({ - url: window.location.origin + url, + url: be5.serverUrlWithContext + url, dataType: type, type: 'POST', data: params, diff --git a/src/scripts/be5/be5.js b/src/scripts/be5/be5.js index 31465091..a4129326 100644 --- a/src/scripts/be5/be5.js +++ b/src/scripts/be5/be5.js @@ -25,6 +25,7 @@ const be5 = { DOCUMENT_REFRESH_SUFFIX: "_refresh", appInfo: {}, + serverUrlWithContext: window.serverUrlWithContext || "/", locale: { set(loc, addMessages) { @@ -230,7 +231,7 @@ const be5 = { }; $.ajax({ - url : window.location.origin + url, + url : be5.serverUrlWithContext + url, dataType : type, type : 'POST', data : params, From fefba381947fda987f6f9b18eb2e1924ee223fb7 Mon Sep 17 00:00:00 2001 From: uuinnk Date: Mon, 28 May 2018 18:31:58 +0700 Subject: [PATCH 05/14] 0.2.25 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 59905d51..29f97011 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "be5-react", - "version": "0.2.24", + "version": "0.2.25", "description": "React client UI for be5 server api", "main": "dist/lib/be5-react.js", "scripts": { From 0e2bcc5b9a63b8348bf20bb71f1f8289d180ca29 Mon Sep 17 00:00:00 2001 From: uuinnk Date: Mon, 28 May 2018 18:45:35 +0700 Subject: [PATCH 06/14] fix serverUrlWithContext default value --- dist/lib/be5-react.js | 3 ++- src/scripts/be5/be5.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dist/lib/be5-react.js b/dist/lib/be5-react.js index 797de041..afdb629a 100644 --- a/dist/lib/be5-react.js +++ b/dist/lib/be5-react.js @@ -459,7 +459,7 @@ var be5 = { DOCUMENT_REFRESH_SUFFIX: "_refresh", appInfo: {}, - serverUrlWithContext: window.serverUrlWithContext || "/", + serverUrlWithContext: window.serverUrlWithContext || "", locale: { set: function set$$1(loc, addMessages) { @@ -654,6 +654,7 @@ var be5 = { if (typeof failureFunc === 'function') failureFunc(data); }; + console.log(be5.serverUrlWithContext); $.ajax({ url: be5.serverUrlWithContext + url, dataType: type, diff --git a/src/scripts/be5/be5.js b/src/scripts/be5/be5.js index a4129326..565dc711 100644 --- a/src/scripts/be5/be5.js +++ b/src/scripts/be5/be5.js @@ -25,7 +25,7 @@ const be5 = { DOCUMENT_REFRESH_SUFFIX: "_refresh", appInfo: {}, - serverUrlWithContext: window.serverUrlWithContext || "/", + serverUrlWithContext: window.serverUrlWithContext || "", locale: { set(loc, addMessages) { @@ -230,6 +230,7 @@ const be5 = { if (typeof (failureFunc) === 'function')failureFunc(data); }; + console.log(be5.serverUrlWithContext); $.ajax({ url : be5.serverUrlWithContext + url, dataType : type, From c954c8d0239bbd3e7bf12508eedd514d5aa06d68 Mon Sep 17 00:00:00 2001 From: uuinnk Date: Mon, 28 May 2018 18:45:53 +0700 Subject: [PATCH 07/14] 0.2.26 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 29f97011..4267d070 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "be5-react", - "version": "0.2.25", + "version": "0.2.26", "description": "React client UI for be5 server api", "main": "dist/lib/be5-react.js", "scripts": { From c4cf756857e29acf3b90d41911af76cf91507587 Mon Sep 17 00:00:00 2001 From: uuinnk Date: Mon, 28 May 2018 19:06:20 +0700 Subject: [PATCH 08/14] fix API_URL_PREFIX --- dist/lib/be5-react.js | 2 +- src/scripts/be5/constants.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/lib/be5-react.js b/dist/lib/be5-react.js index afdb629a..6b17f5e5 100644 --- a/dist/lib/be5-react.js +++ b/dist/lib/be5-react.js @@ -261,7 +261,7 @@ var getDefaultRoute = function getDefaultRoute(state) { return state.user.defaultRoute; }; -var API_URL_PREFIX = '/api/'; +var API_URL_PREFIX = 'api/'; var DEFAULT_VIEW = 'All records'; diff --git a/src/scripts/be5/constants.js b/src/scripts/be5/constants.js index b3967738..f9def0a7 100644 --- a/src/scripts/be5/constants.js +++ b/src/scripts/be5/constants.js @@ -1,4 +1,4 @@ -export const API_URL_PREFIX = '/api/'; +export const API_URL_PREFIX = 'api/'; export const DEFAULT_VIEW = 'All records'; From 4621f7c12a3cbd3994a84b9e0e2c60d8f6033de2 Mon Sep 17 00:00:00 2001 From: uuinnk Date: Mon, 28 May 2018 19:06:26 +0700 Subject: [PATCH 09/14] 0.2.27 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4267d070..6ff98257 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "be5-react", - "version": "0.2.26", + "version": "0.2.27", "description": "React client UI for be5 server api", "main": "dist/lib/be5-react.js", "scripts": { From 4724387860dcf42ffcae7c13f110704135d73c68 Mon Sep 17 00:00:00 2001 From: uuinnk Date: Mon, 28 May 2018 19:32:46 +0700 Subject: [PATCH 10/14] remove console.log --- src/scripts/be5/be5.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/scripts/be5/be5.js b/src/scripts/be5/be5.js index 565dc711..7e37d7a1 100644 --- a/src/scripts/be5/be5.js +++ b/src/scripts/be5/be5.js @@ -230,7 +230,6 @@ const be5 = { if (typeof (failureFunc) === 'function')failureFunc(data); }; - console.log(be5.serverUrlWithContext); $.ajax({ url : be5.serverUrlWithContext + url, dataType : type, From 09940d530a35634d1e0cade40c7f5a62872400aa Mon Sep 17 00:00:00 2001 From: uuinnk Date: Mon, 28 May 2018 19:35:42 +0700 Subject: [PATCH 11/14] use js global var serverUrlWithContext --- dist/lib/be5-react.js | 1 - 1 file changed, 1 deletion(-) diff --git a/dist/lib/be5-react.js b/dist/lib/be5-react.js index 6b17f5e5..870c2cfe 100644 --- a/dist/lib/be5-react.js +++ b/dist/lib/be5-react.js @@ -654,7 +654,6 @@ var be5 = { if (typeof failureFunc === 'function') failureFunc(data); }; - console.log(be5.serverUrlWithContext); $.ajax({ url: be5.serverUrlWithContext + url, dataType: type, From 547f2da6e642dd1d29ae49cf9aa1eddb370bcacc Mon Sep 17 00:00:00 2001 From: uuinnk Date: Mon, 28 May 2018 19:37:38 +0700 Subject: [PATCH 12/14] 0.2.28 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6ff98257..ca6b94de 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "be5-react", - "version": "0.2.27", + "version": "0.2.28", "description": "React client UI for be5 server api", "main": "dist/lib/be5-react.js", "scripts": { From 1e3e5c1d87eab5874d39607b0de633767e51ab86 Mon Sep 17 00:00:00 2001 From: uuinnk Date: Mon, 28 May 2018 19:50:57 +0700 Subject: [PATCH 13/14] revert '/' as default serverUrlWithContext --- dist/lib/be5-react.js | 2 +- src/scripts/be5/be5.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/lib/be5-react.js b/dist/lib/be5-react.js index 870c2cfe..0638dde3 100644 --- a/dist/lib/be5-react.js +++ b/dist/lib/be5-react.js @@ -459,7 +459,7 @@ var be5 = { DOCUMENT_REFRESH_SUFFIX: "_refresh", appInfo: {}, - serverUrlWithContext: window.serverUrlWithContext || "", + serverUrlWithContext: window.serverUrlWithContext || "/", locale: { set: function set$$1(loc, addMessages) { diff --git a/src/scripts/be5/be5.js b/src/scripts/be5/be5.js index 7e37d7a1..a4129326 100644 --- a/src/scripts/be5/be5.js +++ b/src/scripts/be5/be5.js @@ -25,7 +25,7 @@ const be5 = { DOCUMENT_REFRESH_SUFFIX: "_refresh", appInfo: {}, - serverUrlWithContext: window.serverUrlWithContext || "", + serverUrlWithContext: window.serverUrlWithContext || "/", locale: { set(loc, addMessages) { From 8c8fb49b29e48a920ab540049756a7e2c40a40c2 Mon Sep 17 00:00:00 2001 From: uuinnk Date: Mon, 28 May 2018 19:51:09 +0700 Subject: [PATCH 14/14] 0.2.29 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ca6b94de..27af925a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "be5-react", - "version": "0.2.28", + "version": "0.2.29", "description": "React client UI for be5 server api", "main": "dist/lib/be5-react.js", "scripts": {