Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 72347f80f -> faba28980
IGNITE-843 Cleanup of focus directives. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/faba2898 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/faba2898 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/faba2898 Branch: refs/heads/ignite-843 Commit: faba28980a3531c3a60dd2d8c687b7289f67ccd3 Parents: 72347f8 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Mon Aug 10 09:17:35 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Mon Aug 10 09:17:35 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/common-module.js | 8 +++--- .../src/main/js/views/configuration/caches.jade | 4 +-- .../main/js/views/configuration/clusters.jade | 4 +-- .../main/js/views/configuration/metadata.jade | 4 +-- .../src/main/js/views/includes/controls.jade | 28 ++++++++++---------- .../src/main/js/views/login.jade | 14 +++++----- .../src/main/js/views/reset.jade | 2 +- 7 files changed, 32 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/faba2898/modules/control-center-web/src/main/js/controllers/common-module.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js index 6015cc5..55106aa 100644 --- a/modules/control-center-web/src/main/js/controllers/common-module.js +++ b/modules/control-center-web/src/main/js/controllers/common-module.js @@ -570,7 +570,7 @@ controlCenterModule.directive('enterFocusNext', function ($focus) { if (event.which === 13) { event.preventDefault(); - $focus(attrs.enterFocusNextId); + $focus(attrs.enterFocusNext); } }); }; @@ -579,13 +579,13 @@ controlCenterModule.directive('enterFocusNext', function ($focus) { // Directive to mark elements to focus. controlCenterModule.directive('eventFocus', function ($focus) { return function (scope, elem, attr) { - elem.on(attr.eventFocus, function () { - $focus(attr.eventFocusId); + elem.on('click', function () { + $focus(attr.eventFocus); }); // Removes bound events in the element itself when the scope is destroyed scope.$on('$destroy', function () { - elem.off(attr.eventFocus); + elem.off('click'); }); }; }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/faba2898/modules/control-center-web/src/main/js/views/configuration/caches.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/configuration/caches.jade b/modules/control-center-web/src/main/js/views/configuration/caches.jade index 696e7d4..dda7b40 100644 --- a/modules/control-center-web/src/main/js/views/configuration/caches.jade +++ b/modules/control-center-web/src/main/js/views/configuration/caches.jade @@ -34,9 +34,9 @@ block content tbody tr(ng-repeat='row in caches track by row._id') td(ng-class='{active: row._id == selectedItem._id}') - a(event-focus='click' event-focus-id='defaultFocusId' ng-click='selectItem(row)') {{$index + 1}}) {{row.name}}, {{row.mode | displayValue:modes:'Cache mode not set'}}, {{row.atomicityMode | displayValue:atomicities:'Cache atomicity not set'}} + a(event-focus='defaultFocusId' ng-click='selectItem(row)') {{$index + 1}}) {{row.name}}, {{row.mode | displayValue:modes:'Cache mode not set'}}, {{row.atomicityMode | displayValue:atomicities:'Cache atomicity not set'}} .padding-top-dflt - button.btn.btn-primary(event-focus='click' event-focus-id='defaultFocusId' ng-click='createItem()') Add cache + button.btn.btn-primary(event-focus='defaultFocusId' ng-click='createItem()') Add cache hr form.form-horizontal(name='inputForm' ng-if='backupItem' novalidate) div(bs-collapse data-start-collapsed='false') http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/faba2898/modules/control-center-web/src/main/js/views/configuration/clusters.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/configuration/clusters.jade b/modules/control-center-web/src/main/js/views/configuration/clusters.jade index d2e05ce..344b08b 100644 --- a/modules/control-center-web/src/main/js/views/configuration/clusters.jade +++ b/modules/control-center-web/src/main/js/views/configuration/clusters.jade @@ -34,9 +34,9 @@ block content tbody tr(ng-repeat='row in clusters track by row._id') td(ng-class='{active: row._id == selectedItem._id}') - a(event-focus='click' event-focus-id='defaultFocusId' ng-click='selectItem(row)') {{$index + 1}}) {{row.name}}, {{row.discovery.kind | displayValue:discoveries:'Discovery not set'}} + a(event-focus='defaultFocusId' ng-click='selectItem(row)') {{$index + 1}}) {{row.name}}, {{row.discovery.kind | displayValue:discoveries:'Discovery not set'}} .padding-top-dflt - button.btn.btn-primary(event-focus='click' event-focus-id='defaultFocusId' ng-click='createItem()')  Add cluster + button.btn.btn-primary(event-focus='defaultFocusId' ng-click='createItem()')  Add cluster label(style='margin-left: 10px; margin-right: 10px') Use template: select.form-control.line-control(ng-model='template' ng-options='item.value as item.label for item in templates') i.tipLabel.fa.fa-question-circle(bs-tooltip data-title='{{joinTip(templateTip)}}' type='button') http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/faba2898/modules/control-center-web/src/main/js/views/configuration/metadata.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/configuration/metadata.jade b/modules/control-center-web/src/main/js/views/configuration/metadata.jade index 1ee1312..b5a2050 100644 --- a/modules/control-center-web/src/main/js/views/configuration/metadata.jade +++ b/modules/control-center-web/src/main/js/views/configuration/metadata.jade @@ -34,9 +34,9 @@ block content tbody tr(ng-repeat='row in metadatas track by row._id') td(ng-class='{active: row._id == selectedItem._id}') - a(event-focus='click' event-focus-id='defaultFocusId' ng-click='selectItem(row)') {{$index + 1}}) {{row.name}} + a(event-focus='defaultFocusId' ng-click='selectItem(row)') {{$index + 1}}) {{row.name}} .padding-top-dflt - button.btn.btn-primary(event-focus='click' event-focus-id='defaultFocusId' ng-click='panels.activePanel = [0]; createItem()')  Add metadata + button.btn.btn-primary(event-focus='defaultFocusId' ng-click='panels.activePanel = [0]; createItem()')  Add metadata label(style='margin-left: 6px; margin-right: 10px') For: select.form-control.line-control(ng-model='template' ng-options='item.value as item.label for item in templates') i.tipLabel.fa.fa-question-circle(bs-tooltip data-title='{{joinTip(templateTip)}}' type='button') http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/faba2898/modules/control-center-web/src/main/js/views/includes/controls.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade index b63b4c5..8751ca7 100644 --- a/modules/control-center-web/src/main/js/views/includes/controls.jade +++ b/modules/control-center-web/src/main/js/views/includes/controls.jade @@ -41,7 +41,7 @@ mixin btn-save(show, click) i.tipField.fa.fa-floppy-o(ng-show=show ng-click=click bs-tooltip data-title='Save item' data-trigger='hover') mixin btn-add(click, tip, focusId) - i.tipField.fa.fa-plus(ng-click=click bs-tooltip=tip event-focus='click' event-focus-id=focusId) + i.tipField.fa.fa-plus(ng-click=click bs-tooltip=tip event-focus=focusId) mixin btn-remove(click, tip) i.tipField.fa.fa-remove(ng-click=click bs-tooltip=tip data-trigger='hover') @@ -60,9 +60,9 @@ mixin table-pair-edit(keyModel, valModel, keyPlaceholder, valPlaceholder, keyJav label.fieldSep / .input-tip if keyJavaBuildInTypes - input.form-control(id=focusIdKey enter-focus-next enter-focus-next-id=focusIdVal type='text' ng-model=keyModel placeholder=keyPlaceholder bs-typeahead retain-selection data-min-length='1' bs-options='javaClass for javaClass in javaBuildInClasses' on-escape='tableReset()') + input.form-control(id=focusIdKey enter-focus-next=focusIdVal type='text' ng-model=keyModel placeholder=keyPlaceholder bs-typeahead retain-selection data-min-length='1' bs-options='javaClass for javaClass in javaBuildInClasses' on-escape='tableReset()') else - input.form-control(id=focusIdKey enter-focus-next enter-focus-next-id=focusIdVal type='text' ng-model=keyModel placeholder=keyPlaceholder on-escape='tableReset()') + input.form-control(id=focusIdKey enter-focus-next=focusIdVal type='text' ng-model=keyModel placeholder=keyPlaceholder on-escape='tableReset()') .col-sm-6 -var arg = keyModel + ', ' + valModel -var btnVisible = 'tablePairSaveVisible(' + arg + ')' @@ -87,7 +87,7 @@ mixin table-pair(header, tblMdl, keyFld, valFld, keyPlaceholder, valPlaceholder, tr(ng-repeat='item in #{tblMdl}') td.col-sm-12 div(ng-show='!tableEditing(field, $index)') - a.labelFormField(event-focus='click' event-focus-id='curKey{{::field.focusId}}' ng-click='curPair = tableStartEdit(backupItem, field, $index); curKey = curPair.#{keyFld}; curValue = curPair.#{valFld}') {{$index + 1}}) {{item.#{keyFld}}} / {{item.#{valFld}}} + a.labelFormField(event-focus='curKey{{::field.focusId}}' ng-click='curPair = tableStartEdit(backupItem, field, $index); curKey = curPair.#{keyFld}; curValue = curPair.#{valFld}') {{$index + 1}}) {{item.#{keyFld}}} / {{item.#{valFld}}} +btn-remove('tableRemove(backupItem, field, $index)', 'field.removeTip') div(ng-if='tableEditing(field, $index)') +table-pair-edit('curKey', 'curValue', keyPlaceholder, valPlaceholder, keyJavaBuildInTypes, valueJavaBuildInTypes, '{{::field.focusId}}', '$index') @@ -148,7 +148,7 @@ mixin details-row tr(ng-repeat='item in #{detailMdl} track by $index') td div(ng-show='!tableEditing(detail, $index)') - a.labelFormField(event-focus='click' event-focus-id='cur{{::detail.focusId}}' ng-click='curValue = tableStartEdit(backupItem, detail, $index)') {{$index + 1}}) {{item}} + a.labelFormField(event-focus='cur{{::detail.focusId}}' ng-click='curValue = tableStartEdit(backupItem, detail, $index)') {{$index + 1}}) {{item}} +btn-remove('tableRemove(backupItem, detail, $index)', 'detail.removeTip') +btn-down('detail.reordering && tableSimpleDownVisible(backupItem, detail, $index)', 'tableSimpleDown(backupItem, detail, $index)') +btn-up('detail.reordering && $index > 0', 'tableSimpleUp(backupItem, detail, $index)') @@ -173,15 +173,15 @@ mixin table-db-field-edit(databaseName, databaseType, javaName, javaType, focusI .col-sm-3 label.fieldSep / .input-tip - input.form-control(id=databaseNameId enter-focus-next enter-focus-next-id=databaseTypeId type='text' ng-model=databaseName placeholder='DB name' on-escape='tableReset()') + input.form-control(id=databaseNameId enter-focus-next=databaseTypeId type='text' ng-model=databaseName placeholder='DB name' on-escape='tableReset()') .col-sm-3 label.fieldSep / .input-tip - select.form-control(id=databaseTypeId enter-focus-next enter-focus-next-id=javaNameId ng-model=databaseType ng-options='item.value as item.label for item in {{jdbcTypes}}' on-escape='tableReset()') + select.form-control(id=databaseTypeId enter-focus-next=javaNameId ng-model=databaseType ng-options='item.value as item.label for item in {{jdbcTypes}}' on-escape='tableReset()') .col-sm-3 label.fieldSep / .input-tip - input.form-control(id=javaNameId enter-focus-next enter-focus-next-id=javaTypeId type='text' ng-model=javaName placeholder='Java name' on-escape='tableReset()') + input.form-control(id=javaNameId enter-focus-next=javaTypeId type='text' ng-model=javaName placeholder='Java name' on-escape='tableReset()') .col-sm-3 -var args = databaseName + ', ' + databaseType + ', ' + javaName + ', ' + javaType -var btnVisible = 'tableDbFieldSaveVisible(' + args + ')' @@ -201,11 +201,11 @@ mixin table-group-item-edit(fieldName, className, direction, index) .col-sm-4 label.fieldSep / .input-tip - input.form-control(id=fieldName enter-focus-next enter-focus-next-id=className type='text' ng-model=fieldName placeholder='Field name' on-escape='tableReset()') + input.form-control(id=fieldName enter-focus-next=className type='text' ng-model=fieldName placeholder='Field name' on-escape='tableReset()') .col-sm-5 label.fieldSep / .input-tip - input.form-control(id=className enter-focus-next enter-focus-next-id=direction type='text' ng-model=className placeholder='Class name' bs-typeahead retain-selection data-min-length='1' bs-options='javaClass for javaClass in javaBuildInClasses' on-escape='tableReset()') + input.form-control(id=className enter-focus-next=direction type='text' ng-model=className placeholder='Class name' bs-typeahead retain-selection data-min-length='1' bs-options='javaClass for javaClass in javaBuildInClasses' on-escape='tableReset()') .col-sm-3 +btn-save(btnVisible, btnSave) .input-tip @@ -299,7 +299,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource) tr(ng-repeat='item in #{fieldMdl} track by $index') td.col-sm-12 div(ng-show='!tableEditing(field, $index)') - a.labelFormField(event-focus='click' event-focus-id='cur{{::field.focusId}}' ng-click='curValue = tableStartEdit(backupItem, field, $index)') {{$index + 1}}) {{item | compact}} + a.labelFormField(event-focus='cur{{::field.focusId}}' ng-click='curValue = tableStartEdit(backupItem, field, $index)') {{$index + 1}}) {{item | compact}} +btn-remove('tableRemove(backupItem, field, $index)', 'field.removeTip') +btn-down('field.reordering && tableSimpleDownVisible(backupItem, field, $index)', 'tableSimpleDown(backupItem, field, $index)') +btn-up('field.reordering && $index > 0', 'tableSimpleUp(backupItem, field, $index)') @@ -331,7 +331,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource) tr(ng-repeat='item in #{fieldMdl}') td.col-sm-12 div(ng-show='!tableEditing(field, $index)') - a.labelFormField(event-focus='click' event-focus-id='curDatabaseName{{::field.focusId}}' ng-click='curField = tableStartEdit(backupItem, field, $index); curDatabaseName = curField.databaseName; curDatabaseType = curField.databaseType; curJavaName = curField.javaName; curJavaType = curField.javaType') {{$index + 1}}) {{item.databaseName}} / {{item.databaseType}} / {{item.javaName}} / {{item.javaType}} + a.labelFormField(event-focus='curDatabaseName{{::field.focusId}}' ng-click='curField = tableStartEdit(backupItem, field, $index); curDatabaseName = curField.databaseName; curDatabaseType = curField.databaseType; curJavaName = curField.javaName; curJavaType = curField.javaType') {{$index + 1}}) {{item.databaseName}} / {{item.databaseType}} / {{item.javaName}} / {{item.javaType}} +btn-remove('tableRemove(backupItem, field, $index)', 'field.removeTip') div(ng-if='tableEditing(field, $index)') +table-db-field-edit('curDatabaseName', 'curDatabaseType', 'curJavaName', 'curJavaType', '{{::field.focusId}}', '$index') @@ -353,7 +353,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource) td.col-sm-12 div .col-sm-12(ng-show='!tableEditing(field, $index)') - a.labelFormField(event-focus='click' event-focus-id='curGroupName' ng-click='curGroup = tableStartEdit(backupItem, field, $index); curGroupName = curGroup.name; curFields = curGroup.fields') {{$index + 1}}) {{group.name}} + a.labelFormField(event-focus='curGroupName' ng-click='curGroup = tableStartEdit(backupItem, field, $index); curGroupName = curGroup.name; curFields = curGroup.fields') {{$index + 1}}) {{group.name}} +btn-remove('tableRemove(backupItem, field, $index)', 'field.removeTip') +btn-add('tableGroupNewItem($index)', 'field.addItemTip', 'newFieldName') div(ng-if='tableEditing(field, $index)') @@ -367,7 +367,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource) tr(ng-repeat='groupItem in group.fields') td div(ng-show='!tableGroupItemEditing(groupIndex, $index)') - a.labelFormField(event-focus='click' event-focus-id='curFieldName' ng-click='curGroupItem = tableGroupItemStartEdit(groupIndex, $index); curFieldName = curGroupItem.name; curClassName = curGroupItem.className; curDirection = curGroupItem.direction') {{$index + 1}}) {{groupItem.name}} / {{groupItem.className}} / {{groupItem.direction ? "DESC" : "ASC"}} + a.labelFormField(event-focus='curFieldName' ng-click='curGroupItem = tableGroupItemStartEdit(groupIndex, $index); curFieldName = curGroupItem.name; curClassName = curGroupItem.className; curDirection = curGroupItem.direction') {{$index + 1}}) {{groupItem.name}} / {{groupItem.className}} / {{groupItem.direction ? "DESC" : "ASC"}} +btn-remove('tableRemoveGroupItem(group, $index)', 'field.removeItemTip') div(ng-if='tableGroupItemEditing(groupIndex, $index)') +table-group-item-edit('curFieldName', 'curClassName', 'curDirection', '$index') http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/faba2898/modules/control-center-web/src/main/js/views/login.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/login.jade b/modules/control-center-web/src/main/js/views/login.jade index 8b32aa1..07f89a6 100644 --- a/modules/control-center-web/src/main/js/views/login.jade +++ b/modules/control-center-web/src/main/js/views/login.jade @@ -32,24 +32,24 @@ mixin lbl(txt) .details-row(ng-show='action == "register"') +lbl('Full Name:') .col-sm-9 - input#user_name.form-control(enter-focus-next enter-focus-next-id='user_email' type='text' ng-model='user_info.username' placeholder='John Smith' ng-required='action=="register"') + input#user_name.form-control(enter-focus-next='user_email' type='text' ng-model='user_info.username' placeholder='John Smith' ng-required='action=="register"') .details-row +lbl('Email:') .col-sm-9 - input#user_email.form-control(enter-focus-next enter-focus-next-id='user_password' type='email' ng-model='user_info.email' placeholder='y...@domain.com' required on-enter='action == "request_password_reset" && loginForm.$valid && auth(action, user_info)') + input#user_email.form-control(enter-focus-next='user_password' type='email' ng-model='user_info.email' placeholder='y...@domain.com' required on-enter='action == "request_password_reset" && loginForm.$valid && auth(action, user_info)') .details-row(ng-show='action != "request_password_reset"') +lbl('Password:') .col-sm-9 - input#user_password.form-control(enter-focus-next enter-focus-next-id='user_confirm' type='password' ng-model='user_info.password' placeholder='Password' ng-required='action != "request_password_reset"' on-enter='action == "login" && loginForm.$valid && auth(action, user_info)') + input#user_password.form-control(enter-focus-next='user_confirm' type='password' ng-model='user_info.password' placeholder='Password' ng-required='action != "request_password_reset"' on-enter='action == "login" && loginForm.$valid && auth(action, user_info)') .details-row(ng-if='action == "register"') +lbl('Confirm:') .col-sm-9 input#user_confirm.form-control(type='password' ng-model='user_info.confirm' match='user_info.password' placeholder='Confirm password' ng-required='action == "register"' on-enter='loginForm.$valid && auth(action, user_info)') .modal-footer - a.labelField(ng-show='action != "request_password_reset"' ng-click='action = "request_password_reset"' event-focus='click' event-focus-id='user_email') Forgot password? - a.labelField(ng-show='action == "request_password_reset"' ng-click='action = "login"' event-focus='click' event-focus-id='user_email') Log In - a.labelLogin(ng-show='action == "register"' event-focus='click' event-focus-id='user_email' ng-click='action = "login";') Log In - a.labelLogin(ng-show='action == "login"' event-focus='click' event-focus-id='user_name' ng-click='action = "register"') Sign Up + a.labelField(ng-show='action != "request_password_reset"' ng-click='action = "request_password_reset"' event-focus='user_email') Forgot password? + a.labelField(ng-show='action == "request_password_reset"' ng-click='action = "login"' event-focus='user_email') Log In + a.labelLogin(ng-show='action == "register"' event-focus='user_email' ng-click='action = "login";') Log In + a.labelLogin(ng-show='action == "login"' event-focus='user_name' ng-click='action = "register"') Sign Up button.btn.btn-primary(ng-show='action == "login"' ng-disabled='loginForm.$invalid' ng-click='auth(action, user_info)') Log In button.btn.btn-primary(ng-show='action == "register"' ng-disabled='loginForm.$invalid' ng-click='auth(action, user_info)') Sign Up button.btn.btn-primary(ng-show='action == "request_password_reset"' ng-disabled='loginForm.$invalid' ng-click='auth(action, user_info)') Reset Password http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/faba2898/modules/control-center-web/src/main/js/views/reset.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/reset.jade b/modules/control-center-web/src/main/js/views/reset.jade index 0f99a21..50a4890 100644 --- a/modules/control-center-web/src/main/js/views/reset.jade +++ b/modules/control-center-web/src/main/js/views/reset.jade @@ -30,7 +30,7 @@ block container .settings-row label.col-sm-1.required Password: .col-sm-3 - input#user_password.form-control(enter-focus-next enter-focus-next-id='user_confirm' type='password' ng-model='reset_info.password' placeholder='New password' required) + input#user_password.form-control(enter-focus-next='user_confirm' type='password' ng-model='reset_info.password' placeholder='New password' required) .settings-row label.col-sm-1.required Confirm: .col-sm-3
