Fix error if admin is not on 8081

ioBroker · May 1, 2020 · a5c4514 · a5c4514
1 parent 4b6428f
commit a5c4514
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@iobroker/adapter-react",
-  "version": "0.3.8",
+  "version": "0.3.9",
   "description": "React classes to develop admin interfaces for ioBroker with react.",
   "author": {
     "name": "bluefox",

diff --git a/src/Connection.js b/src/Connection.js
@@ -17,7 +17,7 @@ class Connection {
 
         this.props.protocol = this.props.protocol || window.location.protocol;
         this.props.host     = this.props.host     || (window.location.host && window.location.host.substr(0, window.location.host.indexOf(':')));
-        this.props.port     = this.props.port     || 8081;
+        this.props.port     = this.props.port     || (window.location.port === '3000' ? 8081 : window.location.port);
 
         this.socket = window.io.connect(this.props.protocol.replace(':', '') + '://' + this.props.host + ':' + this.props.port,
             {query: 'ws=true'});

diff --git a/src/GenericApp.js b/src/GenericApp.js
@@ -68,7 +68,7 @@ class GenericApp extends Router {
         this.encryptedFields = props.encryptedFields || (settings && settings.encryptedFields) || [];
 
         this.socket = new Connection({
-            ...(props && props.socket),
+            ...((props && props.socket) || (settings && settings.socket)),
             doNotLoadAllObjects: (settings && settings.doNotLoadAllObjects),
             onProgress: progress => {
                 if (progress === PROGRESS.CONNECTING) {