Repository: ignite Updated Branches: refs/heads/master 88a6bfdd9 -> 250bbff6d
IGNITE-8518 Web Console: Implemented auto focus "Confirm" button in Confirmation dialog. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/250bbff6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/250bbff6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/250bbff6 Branch: refs/heads/master Commit: 250bbff6d644cad1f72e3804c5c309900199b2fe Parents: 88a6bfd Author: Alexey Kuznetsov <[email protected]> Authored: Thu May 17 14:45:45 2018 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Thu May 17 14:45:45 2018 +0700 ---------------------------------------------------------------------- .../components/list-editable-transclude/directive.js | 2 +- .../web-console/frontend/app/modules/user/Auth.service.js | 10 +++++----- .../frontend/app/services/LegacyUtils.service.js | 2 +- .../web-console/frontend/app/services/Messages.service.js | 8 ++++---- .../web-console/frontend/views/templates/confirm.tpl.pug | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/250bbff6/modules/web-console/frontend/app/components/list-editable/components/list-editable-transclude/directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/list-editable/components/list-editable-transclude/directive.js b/modules/web-console/frontend/app/components/list-editable/components/list-editable-transclude/directive.js index 6391eb1..55b4724 100644 --- a/modules/web-console/frontend/app/components/list-editable/components/list-editable-transclude/directive.js +++ b/modules/web-console/frontend/app/components/list-editable/components/list-editable-transclude/directive.js @@ -24,7 +24,7 @@ import {default as ListEditable} from '../../controller'; * User can provide an alias for $item by setting item-name attribute on transclusion slot element. */ export class ListEditableTransclude { - /** + /** * Transcluded slot name. * * @type {string} http://git-wip-us.apache.org/repos/asf/ignite/blob/250bbff6/modules/web-console/frontend/app/modules/user/Auth.service.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/user/Auth.service.js b/modules/web-console/frontend/app/modules/user/Auth.service.js index 5102c20..744943a 100644 --- a/modules/web-console/frontend/app/modules/user/Auth.service.js +++ b/modules/web-console/frontend/app/modules/user/Auth.service.js @@ -48,14 +48,14 @@ export default class AuthService { return this._auth('signup', userInfo); } /** - * @param {string} email - * @param {string} password + * @param {string} email + * @param {string} password */ signin(email, password) { return this._auth('signin', {email, password}); } /** - * @param {string} email + * @param {string} email */ remindPassword(email) { return this._auth('password/forgot', {email}).then(() => this.$state.go('password.send')); @@ -65,8 +65,8 @@ export default class AuthService { /** * Performs the REST API call. * @private - * @param {('signin'|'signup'|'password/forgot')} action - * @param {{email:string,password:string}|SignupUserInfo|{email:string}} userInfo + * @param {('signin'|'signup'|'password/forgot')} action + * @param {{email:string,password:string}|SignupUserInfo|{email:string}} userInfo */ _auth(action, userInfo) { return this.$http.post('/api/v1/' + action, userInfo) http://git-wip-us.apache.org/repos/asf/ignite/blob/250bbff6/modules/web-console/frontend/app/services/LegacyUtils.service.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/services/LegacyUtils.service.js b/modules/web-console/frontend/app/services/LegacyUtils.service.js index 8f283c0..a169343 100644 --- a/modules/web-console/frontend/app/services/LegacyUtils.service.js +++ b/modules/web-console/frontend/app/services/LegacyUtils.service.js @@ -183,7 +183,7 @@ export default ['IgniteLegacyUtils', ['IgniteErrorPopover', (ErrorPopover) => { 'volatile', 'while' ]; - /*eslint-enable */ + /* eslint-enable */ const VALID_JAVA_IDENTIFIER = new RegExp('^[a-zA-Z_$][a-zA-Z\\d_$]*$'); http://git-wip-us.apache.org/repos/asf/ignite/blob/250bbff6/modules/web-console/frontend/app/services/Messages.service.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/services/Messages.service.js b/modules/web-console/frontend/app/services/Messages.service.js index ab565b2..170ff04 100644 --- a/modules/web-console/frontend/app/services/Messages.service.js +++ b/modules/web-console/frontend/app/services/Messages.service.js @@ -72,16 +72,16 @@ export default ['IgniteMessages', ['$alert', ($alert) => { return { errorMessage, hideAlert, - showError(message, err) { + showError(message, err, duration = 10) { if (message instanceof CancellationError) return false; - _showMessage(message, err, 'danger', 10); + _showMessage(message, err, 'danger', duration); return false; }, - showInfo(message) { - _showMessage(message, null, 'success', 3); + showInfo(message, duration = 5) { + _showMessage(message, null, 'success', duration); } }; }]]; http://git-wip-us.apache.org/repos/asf/ignite/blob/250bbff6/modules/web-console/frontend/views/templates/confirm.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/templates/confirm.tpl.pug b/modules/web-console/frontend/views/templates/confirm.tpl.pug index 1b1560c..9f5e2bb 100644 --- a/modules/web-console/frontend/views/templates/confirm.tpl.pug +++ b/modules/web-console/frontend/views/templates/confirm.tpl.pug @@ -29,6 +29,6 @@ button#confirm-btn-cancel.btn-ignite.btn-ignite--link-success(ng-click='confirmCancel()') Cancel button#confirm-btn-no.btn-ignite.btn-ignite--link-success(ng-if='yesNo' ng-click='confirmNo()') No - button#confirm-btn-yes.btn-ignite.btn-ignite--success(ng-if='yesNo' ng-click='confirmYes()') Yes + button#confirm-btn-yes.btn-ignite.btn-ignite--success(ignite-auto-focus ng-if='yesNo' ng-click='confirmYes()') Yes - button#confirm-btn-ok.btn-ignite.btn-ignite--success(ng-if='!yesNo' ng-click='confirmYes()') Confirm + button#confirm-btn-ok.btn-ignite.btn-ignite--success(ignite-auto-focus ng-if='!yesNo' ng-click='confirmYes()') Confirm
