openstack/deb-horizon
Code Issues Proposed changes

Merge "allow hiding help-button for first ng workflow step"

Browse Source
This commit is contained in:
Jenkins 2016-08-18 04:56:02 +00:00 committed by Gerrit Code Review
commit a0f18e3444
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
horizon/static/framework/widgets/wizard/wizard.controller.js
View File

@ -78,15 +78,8 @@
from: $scope.currentIndex,
to: index
});
/**
* Toggle help icon button if a step's helpUrl is not defined
*/
toggleHelpBtn(index);
/*eslint-disable angular/controller-as */
if (angular.isUndefined(steps[index].helpUrl)) {
$scope.hideHelpBtn = true;
} else {
$scope.hideHelpBtn = false;
}
$scope.currentIndex = index;
$scope.openHelp = false;
/*eslint-enable angular/controller-as*/
@ -123,12 +116,24 @@
function onInitSuccess() {
$scope.$broadcast(wizardEvents.ON_INIT_SUCCESS);
if (steps.length > 0) {
toggleHelpBtn(0);
}
}
function onInitError() {
$scope.$broadcast(wizardEvents.ON_INIT_ERROR);
}
function toggleHelpBtn(index) {
// Toggle help icon button if a step's helpUrl is not defined
if (angular.isUndefined(steps[index].helpUrl)) {
$scope.hideHelpBtn = true;
} else {
$scope.hideHelpBtn = false;
}
}
/**
* Each step in the workflow can provide an optional `checkReadiness`
* method, which should return a promise. When this method is provided

2
horizon/static/framework/widgets/wizard/wizard.spec.js
View File

@ -69,7 +69,7 @@
steps: [ {}, {}, {} ]
};
$scope.$apply();
expect(angular.element(element).find('.help-toggle').hasClass('ng-hide')).toBe(false);
expect(angular.element(element).find('.help-toggle').hasClass('ng-hide')).toBe(true);
$scope.workflow.steps[1] = {};
$scope.switchTo(1);