@iobroker/adapter-react-v5 3.1.10 → 3.1.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Components/CustomModal.js +33 -13
- package/Components/CustomModal.js.map +1 -1
- package/Components/JsonConfigComponent/ChipInput.js +10 -10
- package/Components/JsonConfigComponent/ChipInput.js.map +1 -1
- package/Components/JsonConfigComponent/ConfigAutocompleteSendTo.js +1 -1
- package/Components/JsonConfigComponent/ConfigAutocompleteSendTo.js.map +1 -1
- package/Components/JsonConfigComponent/ConfigFile.js +106 -12
- package/Components/JsonConfigComponent/ConfigFile.js.map +1 -1
- package/Components/JsonConfigComponent/ConfigFileSelector.js +11 -13
- package/Components/JsonConfigComponent/ConfigFileSelector.js.map +1 -1
- package/Components/JsonConfigComponent/ConfigFunc.js +157 -0
- package/Components/JsonConfigComponent/ConfigFunc.js.map +1 -0
- package/Components/JsonConfigComponent/ConfigGeneric.js +1 -1
- package/Components/JsonConfigComponent/ConfigGeneric.js.map +1 -1
- package/Components/JsonConfigComponent/ConfigImageUpload.js +3 -3
- package/Components/JsonConfigComponent/ConfigImageUpload.js.map +1 -1
- package/Components/JsonConfigComponent/ConfigInstanceSelect.js +17 -4
- package/Components/JsonConfigComponent/ConfigInstanceSelect.js.map +1 -1
- package/Components/JsonConfigComponent/ConfigNumber.js.map +1 -1
- package/Components/JsonConfigComponent/ConfigPanel.js +9 -1
- package/Components/JsonConfigComponent/ConfigPanel.js.map +1 -1
- package/Components/JsonConfigComponent/ConfigRoom.js +157 -0
- package/Components/JsonConfigComponent/ConfigRoom.js.map +1 -0
- package/Components/JsonConfigComponent/ConfigSelectSendTo.js +116 -24
- package/Components/JsonConfigComponent/ConfigSelectSendTo.js.map +1 -1
- package/Components/JsonConfigComponent/ConfigSendto.js +1 -1
- package/Components/JsonConfigComponent/ConfigSendto.js.map +1 -1
- package/Components/JsonConfigComponent/ConfigSlider.js +147 -0
- package/Components/JsonConfigComponent/ConfigSlider.js.map +1 -0
- package/Components/JsonConfigComponent/ConfigTable.js +4 -4
- package/Components/JsonConfigComponent/ConfigTable.js.map +1 -1
- package/Components/JsonConfigComponent/ConfigTextSendTo.js +1 -1
- package/Components/JsonConfigComponent/ConfigTextSendTo.js.map +1 -1
- package/Components/Loader.js +9 -4
- package/Components/Loader.js.map +1 -1
- package/Components/UploadImage.js +11 -10
- package/Components/UploadImage.js.map +1 -1
- package/Connection.js +31 -26
- package/Connection.js.map +1 -1
- package/README.md +6 -0
- package/i18n/de.json +4 -1
- package/i18n/en.json +4 -1
- package/i18n/es.json +4 -1
- package/i18n/fr.json +4 -1
- package/i18n/it.json +4 -1
- package/i18n/nl.json +4 -1
- package/i18n/pl.json +4 -1
- package/i18n/pt.json +4 -1
- package/i18n/ru.json +4 -1
- package/i18n/zh-cn.json +4 -1
- package/package.json +1 -1
package/Connection.js
CHANGED
|
@@ -221,41 +221,46 @@ var Connection = /*#__PURE__*/function () {
|
|
|
221
221
|
|
|
222
222
|
var host = this.props.host;
|
|
223
223
|
var port = this.props.port;
|
|
224
|
-
var protocol = this.props.protocol.replace(':', '');
|
|
225
|
-
|
|
226
|
-
if (window.socketUrl) {
|
|
227
|
-
var parts = window.socketUrl.split(':');
|
|
228
|
-
host = parts[0] || host;
|
|
229
|
-
port = parts[1] || port;
|
|
224
|
+
var protocol = this.props.protocol.replace(':', '');
|
|
225
|
+
var path = window.location.pathname;
|
|
230
226
|
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
227
|
+
if (window.location.hostname === 'iobroker.net' || window.location.hostname === 'iobroker.pro') {
|
|
228
|
+
path = '';
|
|
229
|
+
} else {
|
|
230
|
+
// if web adapter, socket io could be on other port or even host
|
|
231
|
+
if (window.socketUrl) {
|
|
232
|
+
var parts = window.socketUrl.split(':');
|
|
233
|
+
host = parts[0] || host;
|
|
234
|
+
port = parts[1] || port;
|
|
235
|
+
|
|
236
|
+
if (host.includes('://')) {
|
|
237
|
+
parts = host.split('://');
|
|
238
|
+
protocol = parts[0];
|
|
239
|
+
host = parts[1];
|
|
240
|
+
}
|
|
241
|
+
} // get current path
|
|
237
242
|
|
|
238
243
|
|
|
239
|
-
|
|
240
|
-
var pos = path.lastIndexOf('/');
|
|
244
|
+
var pos = path.lastIndexOf('/');
|
|
241
245
|
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
246
|
+
if (pos !== -1) {
|
|
247
|
+
path = path.substring(0, pos + 1);
|
|
248
|
+
}
|
|
245
249
|
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
250
|
+
if (Connection.isWeb()) {
|
|
251
|
+
// remove one level, like echarts, vis, .... We have here: '/echarts/'
|
|
252
|
+
var _parts = path.split('/');
|
|
249
253
|
|
|
250
|
-
|
|
251
|
-
|
|
254
|
+
if (_parts.length > 2) {
|
|
255
|
+
_parts.pop();
|
|
252
256
|
|
|
253
|
-
|
|
257
|
+
_parts.pop();
|
|
254
258
|
|
|
255
|
-
|
|
259
|
+
path = _parts.join('/');
|
|
256
260
|
|
|
257
|
-
|
|
258
|
-
|
|
261
|
+
if (!path.endsWith('/')) {
|
|
262
|
+
path += '/';
|
|
263
|
+
}
|
|
259
264
|
}
|
|
260
265
|
}
|
|
261
266
|
}
|