epic/play-with-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move instance population before WS handlers

Browse Source 
Don't disable windows containers switch
This commit is contained in:
Marcos Lilljedahl
2017-08-15 16:34:49 -03:00
parent 87544490b4
commit 0ab60f6456
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
www/assets/app.js
View File

@@ -156,6 +156,14 @@
$scope.$apply(); $scope.$apply();
}, 1000); }, 1000);
} }
var i = response.data;
for (var k in i.instances) {
var instance = i.instances[k];
$scope.instances.push(instance);
$scope.idx[instance.name] = instance;
}
var socket = io({ path: '/sessions/' + sessionId + '/ws' }); var socket = io({ path: '/sessions/' + sessionId + '/ws' });
socket.on('session ready', function(ready) { socket.on('session ready', function(ready) {
@@ -247,12 +255,6 @@
$scope.socket = socket; $scope.socket = socket;
var i = response.data;
for (var k in i.instances) {
var instance = i.instances[k];
$scope.instances.push(instance);
$scope.idx[instance.name] = instance;
}
// If instance is passed in URL, select it // If instance is passed in URL, select it
let inst = $scope.idx[$location.hash()]; let inst = $scope.idx[$location.hash()];

2
www/index.html
View File

@@ -51,7 +51,7 @@
<settings-icon></settings-icon><br/> <settings-icon></settings-icon><br/>
</div> </div>
<div class="md-toolbar-tools"> <div class="md-toolbar-tools">
<md-switch ng-disabled="instances.length > 0" ng-model="type.windows"> <md-switch ng-model="type.windows">
Windows containers {{windows}} Windows containers {{windows}}
</md-switch> </md-switch>
</div> </div>