Skip to content
This repository has been archived by the owner on May 13, 2020. It is now read-only.

Commit

Permalink
Merge pull request #48 from ovh-ux/develop
Browse files Browse the repository at this point in the history
Release v14.0.4
  • Loading branch information
antleblanc authored Aug 30, 2019
2 parents 05f4688 + 0e50514 commit 2e7064a
Show file tree
Hide file tree
Showing 5 changed files with 1,427 additions and 2,204 deletions.
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,23 @@
},
"dependencies": {
"filesize": "^3.6.1",
"lodash": "^4.17.11"
"lodash": "^4.17.15"
},
"devDependencies": {
"@commitlint/cli": "^7.1.2",
"@commitlint/config-angular": "^7.1.2",
"@ovh-ux/component-rollup-config": "^5.0.0-beta.3",
"eslint": "^5.6.1",
"eslint-config-airbnb-base": "^13.1.0",
"eslint-formatter-pretty": "^2.0.0",
"eslint-plugin-import": "^2.14.0",
"@commitlint/cli": "^8.1.0",
"@commitlint/config-angular": "^8.1.0",
"@ovh-ux/component-rollup-config": "^6.0.2",
"eslint": "^6.2.2",
"eslint-config-airbnb-base": "^14.0.0",
"eslint-formatter-pretty": "^2.1.1",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-markdown": "^1.0.0",
"htmlhint": "^0.10.0",
"husky": "^1.1.0",
"lint-staged": "^7.3.0",
"htmlhint": "^0.11.0",
"husky": "^3.0.4",
"lint-staged": "^9.2.5",
"npm-run-all": "^4.1.3",
"stylelint": "^9.6.0",
"stylelint-config-standard": "^18.2.0"
"stylelint": "^10.1.0",
"stylelint-config-standard": "^18.3.0"
},
"peerDependencies": {
"@ovh-ux/ng-translate-async-loader": "^2.0.0",
Expand Down
4 changes: 2 additions & 2 deletions src/alerter/alerter-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export default /* @ngInject */ function ($rootScope) {

let messageDetails = null;
if (data && data.state) {
messagesFiltered = $.grep(data.messages, e => e.type && e.type !== 'INFO');
messagesFiltered = $.grep(data.messages, (e) => e.type && e.type !== 'INFO');

alertType = alertTypesHash[data.state];
messageToSend = messages[data.state];
Expand Down Expand Up @@ -85,7 +85,7 @@ export default /* @ngInject */ function ($rootScope) {
} else if (data.messages) {
if (data.messages.length > 0) {
alertType = alertTypesHash[data.state];
messagesFiltered = $.grep(data.messages, e => e.type && e.type !== 'INFO');
messagesFiltered = $.grep(data.messages, (e) => e.type && e.type !== 'INFO');
if (messagesFiltered.length > 0) {
messageToSend += ' (';
for (i; i < messagesFiltered.length; i += 1) {
Expand Down
4 changes: 0 additions & 4 deletions src/wizard/wizardStep/wizardStep-directive.js
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,6 @@ export default /* @ngInject */ function ($compile, $timeout, $q) {
if ($scope.stepNumber === 1) {
$wizardCtrl.nextStep();
}

$scope.redirectFocus = function (e) {
console.log(e);
};
}, // End post
}; // End return
},
Expand Down
6 changes: 2 additions & 4 deletions src/wizard/wizardStep/wizardStep.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,15 @@
data-ng-bind="wizardNextButtonText"
data-ng-click="nextStep()"
data-ng-disabled="!stepValid"
data-ng-show="getCurrentStep() < stepCount"
data-ng-blur="redirectFocus()">
data-ng-show="getCurrentStep() < stepCount">
</button>

<button type="button"
class="btn btn-primary"
data-ng-bind="wizardConfirmButtonText"
data-ng-click="nextStep()"
data-ng-disabled="!stepValid"
data-ng-show="getCurrentStep() == stepCount && confirmButton"
data-ng-blur="redirectFocus()">
data-ng-show="getCurrentStep() == stepCount && confirmButton">
</button>
</div>
</div>
Loading

0 comments on commit 2e7064a

Please sign in to comment.