github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor(containers) : remove duplicate base URL assignment

pull/12191/head
강지원 2024-10-29 23:34:27 +09:00
parent 549ee0a945
commit c138e90210
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/docker/views/containers/console/containerConsoleController.js
View File

@ -23,6 +23,10 @@ angular.module('portainer.docker').controller('ContainerConsoleController', [
connected: 2, connected: 2,
}); });
const isHttpOrigin = window.location.origin.startsWith('http');
const isNotDdExtension = !window.ddExtension;
const base = isHttpOrigin && isNotDdExtension ? `${window.location.origin}${baseHref()}` : baseHref();
$scope.loaded = false; $scope.loaded = false;
$scope.states = states; $scope.states = states;
$scope.state = states.disconnected; $scope.state = states.disconnected;
@ -57,7 +61,6 @@ angular.module('portainer.docker').controller('ContainerConsoleController', [
id: attachId, id: attachId,
}; };
const base = window.location.origin.startsWith('http') && !window.ddExtension ? `${window.location.origin}${baseHref()}` : baseHref();
var url = var url =
base + base +
'api/websocket/attach?' + 'api/websocket/attach?' +
@ -96,7 +99,6 @@ angular.module('portainer.docker').controller('ContainerConsoleController', [
id: data.Id, id: data.Id,
}; };
const base = window.location.origin.startsWith('http') && !window.ddExtension ? `${window.location.origin}${baseHref()}` : baseHref();
var url = var url =
base + base +
'api/websocket/exec?' + 'api/websocket/exec?' +