Repository: ignite Updated Branches: refs/heads/ignite-843-rc2 394517d77 -> 93475110b
IGNITE-843 Minor. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/93475110 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/93475110 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/93475110 Branch: refs/heads/ignite-843-rc2 Commit: 93475110b1ff5cb62e6fadcf0acb67b0b5722399 Parents: 394517d Author: vsisko <[email protected]> Authored: Fri Jan 29 17:49:59 2016 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Fri Jan 29 17:49:59 2016 +0700 ---------------------------------------------------------------------- .../states/configuration/clusters/swap.jade | 2 +- .../src/main/js/controllers/common-module.js | 17 +---------------- .../src/main/js/views/configuration/clusters.jade | 2 +- 3 files changed, 3 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/93475110/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/swap.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/swap.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/swap.jade index ed474ee..1ffc85a 100644 --- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/swap.jade +++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/swap.jade @@ -112,7 +112,7 @@ form.panel.panel-default(name='swapSpaceSpi' novalidate) data-id='writeBufferSize' data-name='writeBufferSize' data-ng-model='#{model}.FileSwapSpaceSpi.writeBufferSize' - data-placeholder='Available CPU cores' + data-placeholder='64 * 1024' ) http://git-wip-us.apache.org/repos/asf/ignite/blob/93475110/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 16036ac..f29928d 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 @@ -1947,23 +1947,8 @@ consoleModule.factory('$focus', function ($timeout) { $timeout(function () { var elem = $('#' + id); - if (elem.length > 0) { - var offset = elem.offset(); - - var elemOffset = offset.top; - - var winOffset = window.pageYOffset; - - var topHeight = $('.padding-top-dflt.affix').outerHeight(); - - if(elemOffset - 20 - topHeight < winOffset - || elemOffset + elem.outerHeight(true) + 20 > winOffset + window.innerHeight) - $('html, body').animate({ - scrollTop: elemOffset - 20 - topHeight - }, 10); - + if (elem.length > 0) elem[0].focus(); - } }, 100); }; }); http://git-wip-us.apache.org/repos/asf/ignite/blob/93475110/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 c30e6d7..1d3525b 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 @@ -50,7 +50,7 @@ include ../includes/controls span.caret .panel-tip-container(ng-show='backupItem') i.btn.btn-primary.fa.fa-undo(id='undo-item' ng-disabled='!ui.inputForm.$dirty' ng-click='ui.inputForm.$dirty && resetAll()' bs-tooltip=undoTip data-placement='bottom' data-trigger='hover') - hr + hr div(bs-collapse='' data-allow-multiple='true' ng-model='ui.activePanels') form.form-horizontal(name='ui.inputForm' ng-show='backupItem' novalidate) .panel-group(ng-click='triggerDigest = true')
