From 6ecd54891fc18e5f1f422e6c833921c8c3e93b93 Mon Sep 17 00:00:00 2001
From: cgeek <cem.moreau@gmail.com>
Date: Thu, 24 Mar 2016 19:03:44 +0100
Subject: [PATCH] By default, use browser host & port for WEBMIN API
---
app/js/lib/conf/conf.js | 6 ++++++
app/js/lib/conf/conf.json | 6 ------
app/js/services/bma.js | 4 +++-
3 files changed, 9 insertions(+), 7 deletions(-)
create mode 100644 app/js/lib/conf/conf.js
delete mode 100644 app/js/lib/conf/conf.json
diff --git a/app/js/lib/conf/conf.js b/app/js/lib/conf/conf.js
new file mode 100644
index 0000000..f5e5f5b
--- /dev/null
+++ b/app/js/lib/conf/conf.js
@@ -0,0 +1,6 @@
+module.exports = {
+ "server": "", // Empty server will use the browser current host
+ "port": "", // Empty port will use the browser current port
+ "default_port": 9220,
+ "dev_autoconf": false
+};
diff --git a/app/js/lib/conf/conf.json b/app/js/lib/conf/conf.json
deleted file mode 100644
index 02dd1dc..0000000
--- a/app/js/lib/conf/conf.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "server": "localhost",
- "port": 9220,
- "default_port": 9220,
- "dev_autoconf": false
-}
diff --git a/app/js/services/bma.js b/app/js/services/bma.js
index bcb301d..427faf0 100644
--- a/app/js/services/bma.js
+++ b/app/js/services/bma.js
@@ -182,7 +182,9 @@ module.exports = (angular) => {
}
}
}
- var service = BMA([conf.server, conf.port].join(':'));
+ let server = conf.server || window.location.hostname;
+ let port = conf.port || window.location.port;
+ var service = BMA([server, port].join(':'));
service.instance = BMA;
return service;
});
--
GitLab