You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/08/10 18:01:10 UTC
[28/34] incubator-ignite git commit: IGNITE-843 Fixed focus on
dbField table.
IGNITE-843 Fixed focus on dbField table.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7d610cfd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7d610cfd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7d610cfd
Branch: refs/heads/ignite-1201
Commit: 7d610cfdeea295ab62db33b79a18dfbdc91533d6
Parents: 240912d
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Aug 7 18:16:51 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Aug 7 18:16:51 2015 +0700
----------------------------------------------------------------------
.../src/main/js/views/includes/controls.jade | 21 ++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d610cfd/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 69564df..b63b4c5 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
@@ -164,19 +164,24 @@ mixin details-row
input.form-control(id='new{{::detail.focusId}}' name='{{detail.model}}' type='text' ng-model='newValue' ng-focus='tableNewItem(detail)' placeholder='{{::detail.placeholder}}' on-enter='tableSimpleSave(tableSimpleValid, backupItem, detail, newValue, -1)' on-escape='tableReset()')&attributes(customValidators)
+ico-exclamation('{{detail.model}}', 'ipaddress', 'Invalid address, see help for format description.')
-mixin table-db-field-edit(databaseName, databaseType, javaName, javaType, index)
+mixin table-db-field-edit(databaseName, databaseType, javaName, javaType, focusId, index)
+ -var databaseNameId = databaseName + focusId
+ -var databaseTypeId = databaseType + focusId
+ -var javaNameId = javaName + focusId
+ -var javaTypeId = javaType + focusId
+
.col-sm-3
label.fieldSep /
.input-tip
- input.form-control(id=databaseName enter-focus-next enter-focus-next-id=databaseType type='text' ng-model=databaseName placeholder='DB name' on-escape='tableReset()')
+ input.form-control(id=databaseNameId enter-focus-next enter-focus-next-id=databaseTypeId type='text' ng-model=databaseName placeholder='DB name' on-escape='tableReset()')
.col-sm-3
label.fieldSep /
.input-tip
- select.form-control(id=databaseType enter-focus-next enter-focus-next-id=javaName 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 enter-focus-next-id=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=javaName enter-focus-next enter-focus-next-id=javaType type='text' ng-model=javaName placeholder='Java name' on-escape='tableReset()')
+ input.form-control(id=javaNameId enter-focus-next enter-focus-next-id=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 + ')'
@@ -185,7 +190,7 @@ mixin table-db-field-edit(databaseName, databaseType, javaName, javaType, index)
+btn-save(btnVisible, btnSave)
.input-tip
- select.form-control(id=javaType ng-model=javaType ng-options='item.value as item.label for item in {{javaTypes}}' on-enter=btnVisibleAndSave on-escape='tableReset()')
+ select.form-control(id=javaTypeId ng-model=javaType ng-options='item.value as item.label for item in {{javaTypes}}' on-enter=btnVisibleAndSave on-escape='tableReset()')
mixin table-group-item-edit(fieldName, className, direction, index)
-var args = fieldName + ', ' + className
@@ -326,14 +331,14 @@ 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' 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='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}}
+btn-remove('tableRemove(backupItem, field, $index)', 'field.removeTip')
div(ng-if='tableEditing(field, $index)')
- +table-db-field-edit('curDatabaseName', 'curDatabaseType', 'curJavaName', 'curJavaType', '$index')
+ +table-db-field-edit('curDatabaseName', 'curDatabaseType', 'curJavaName', 'curJavaType', '{{::field.focusId}}', '$index')
tfoot(ng-show='tableNewItemActive(field)')
tr
td.col-sm-12(ng-init='newDatabaseType="INTEGER"; newJavaType="Integer"')
- +table-db-field-edit('newDatabaseName', 'newDatabaseType', 'newJavaName', 'newJavaType', '-1')
+ +table-db-field-edit('newDatabaseName', 'newDatabaseType', 'newJavaName', 'newJavaType', '{{::field.focusId}}', '-1')
div(ng-switch-when='queryGroups' ng-hide=fieldHide)
.col-sm-7
label.table-header {{::field.label}}: