Skip to content

Dev, use js global var serverUrlWithContext #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
May 28, 2018
Merged

Dev, use js global var serverUrlWithContext #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
82ed151
add window.location.origin to ajax url
QProgS May 28, 2018
e3d8060
0.2.23
QProgS May 28, 2018
ed46f95
0.2.24
QProgS May 28, 2018
73a0f55
be5.serverUrlWithContext: window.serverUrlWithContext || "/"
QProgS May 28, 2018
fefba38
0.2.25
QProgS May 28, 2018
0e2bcc5
fix serverUrlWithContext default value
QProgS May 28, 2018
c954c8d
0.2.26
QProgS May 28, 2018
c4cf756
fix API_URL_PREFIX
QProgS May 28, 2018
4621f7c
0.2.27
QProgS May 28, 2018
4724387
remove console.log
QProgS May 28, 2018
09940d5
use js global var serverUrlWithContext
QProgS May 28, 2018
547f2da
0.2.28
QProgS May 28, 2018
1e3e5c1
revert '/' as default serverUrlWithContext
QProgS May 28, 2018
8c8fb49
0.2.29
QProgS May 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions dist/lib/be5-react.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -459,6 +459,7 @@ var be5 = {
DOCUMENT_REFRESH_SUFFIX: "_refresh",

appInfo: {},
serverUrlWithContext: window.serverUrlWithContext || "/",

locale: {
set: function set$$1(loc, addMessages) {
Expand Down Expand Up @@ -654,7 +655,7 @@ var be5 = {
};

$.ajax({
url: url,
url: be5.serverUrlWithContext + url,
dataType: type,
type: 'POST',
data: params,
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "be5-react",
"version": "0.2.22",
"version": "0.2.29",
"description": "React client UI for be5 server api",
"main": "dist/lib/be5-react.js",
"scripts": {
Expand Down
3 changes: 2 additions & 1 deletion src/scripts/be5/be5.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ const be5 = {
DOCUMENT_REFRESH_SUFFIX: "_refresh",

appInfo: {},
serverUrlWithContext: window.serverUrlWithContext || "/",

locale: {
set(loc, addMessages) {
Expand Down Expand Up @@ -230,7 +231,7 @@ const be5 = {
};

$.ajax({
url : url,
url : be5.serverUrlWithContext + url,
dataType : type,
type : 'POST',
data : params,
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/be5/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export const API_URL_PREFIX = '/api/';
export const API_URL_PREFIX = 'api/';

export const DEFAULT_VIEW = 'All records';

Expand Down