Merge "Revert "Clean up $scope usage""

This commit is contained in:
Jenkins 2016-09-05 08:42:51 +00:00 committed by Gerrit Code Review
commit 8de7b5b9ed
2 changed files with 6 additions and 2 deletions

View File

@ -60,12 +60,14 @@
function initScope($scope) { function initScope($scope) {
scope = $scope; scope = $scope;
scope.workflow = createWorkflow;
scope.model = model;
scope.$on('$destroy', function() { scope.$on('$destroy', function() {
}); });
} }
function perform() { function perform() {
model.init(); scope.model.init();
return wizardModalService.modal({ return wizardModalService.modal({
scope: scope, scope: scope,
workflow: createWorkflow, workflow: createWorkflow,

View File

@ -59,12 +59,14 @@
function initScope($scope) { function initScope($scope) {
scope = $scope; scope = $scope;
scope.workflow = createWorkflow;
scope.model = model;
scope.$on('$destroy', function() { scope.$on('$destroy', function() {
}); });
} }
function perform(selected) { function perform(selected) {
model.init(); scope.model.init();
scope.selected = selected; scope.selected = selected;
return wizardModalService.modal({ return wizardModalService.modal({
scope: scope, scope: scope,