From 79c1e0d1d186e109d5e27007f397602096682c51 Mon Sep 17 00:00:00 2001 From: Nathan219 Date: Tue, 29 Nov 2016 16:33:15 -0800 Subject: [PATCH 1/2] Use default instead of immediately calling gotopanel --- .../components/newContainer/newContainerConfigureView.jade | 2 ++ .../components/newContainer/newContainerController.js | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/client/directives/components/newContainer/newContainerConfigureView.jade b/client/directives/components/newContainer/newContainerConfigureView.jade index 94bbb379e..09b07e310 100644 --- a/client/directives/components/newContainer/newContainerConfigureView.jade +++ b/client/directives/components/newContainer/newContainerConfigureView.jade @@ -1,6 +1,7 @@ animated-panel-container.modal-servers animated-panel.grid-block.vertical.modal-server-select( name = "containerSelection" + default = "{{!NCC.disableBackButton}}" ) header.modal-header.grid-block.justify-center( ng-class = "{'lg': NCC.instances.models.length > 0 || !NCC.ahaGuide.isAddingFirstRepo()}" @@ -96,6 +97,7 @@ animated-panel-container.modal-servers animated-panel.grid-block.vertical.modals-rename( name = "nameContainer" ng-if = "NCC.state.repo || NCC.state.templateSource" + default = "{{NCC.disableBackButton}}" ) header.modal-header svg.iconnables.icons-arrow-backward( diff --git a/client/directives/components/newContainer/newContainerController.js b/client/directives/components/newContainer/newContainerController.js index 4ac913a91..3750cfe2a 100644 --- a/client/directives/components/newContainer/newContainerController.js +++ b/client/directives/components/newContainer/newContainerController.js @@ -44,10 +44,6 @@ function NewContainerController( NCC.disableBackButton = true; } - $timeout(function () { - $scope.$broadcast('go-to-panel', NCC.state.panel, 'immediate'); - }); - // Start loading repos and templates loading.reset('newContainerRepos'); loading.reset('newContainerTemplates'); From 9964a54f376f010fa15b0e31150dbc99f26d520c Mon Sep 17 00:00:00 2001 From: Nathan219 Date: Wed, 30 Nov 2016 13:01:33 -0800 Subject: [PATCH 2/2] Alphabetical --- .../components/newContainer/newContainerConfigureView.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/directives/components/newContainer/newContainerConfigureView.jade b/client/directives/components/newContainer/newContainerConfigureView.jade index 09b07e310..597987e64 100644 --- a/client/directives/components/newContainer/newContainerConfigureView.jade +++ b/client/directives/components/newContainer/newContainerConfigureView.jade @@ -1,7 +1,7 @@ animated-panel-container.modal-servers animated-panel.grid-block.vertical.modal-server-select( - name = "containerSelection" default = "{{!NCC.disableBackButton}}" + name = "containerSelection" ) header.modal-header.grid-block.justify-center( ng-class = "{'lg': NCC.instances.models.length > 0 || !NCC.ahaGuide.isAddingFirstRepo()}" @@ -95,9 +95,9 @@ animated-panel-container.modal-servers span Next Step: Configuration animated-panel.grid-block.vertical.modals-rename( + default = "{{NCC.disableBackButton}}" name = "nameContainer" ng-if = "NCC.state.repo || NCC.state.templateSource" - default = "{{NCC.disableBackButton}}" ) header.modal-header svg.iconnables.icons-arrow-backward(