You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/11/02 07:15:13 UTC
[4/4] ignite git commit: IGNITE-1806 Fixed reset button on-click if
disabled.
IGNITE-1806 Fixed reset button on-click if disabled.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3c2a45da
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3c2a45da
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3c2a45da
Branch: refs/heads/ignite-843-rc1
Commit: 3c2a45da33087368e682ecb27e79fe76715b2146
Parents: 615bb31
Author: vsisko <vs...@gridgain.com>
Authored: Mon Nov 2 13:15:08 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Mon Nov 2 13:15:08 2015 +0700
----------------------------------------------------------------------
.../src/main/js/views/configuration/caches.jade | 4 ++--
.../src/main/js/views/configuration/clusters.jade | 4 ++--
.../control-center-web/src/main/js/views/configuration/igfs.jade | 4 ++--
.../src/main/js/views/configuration/metadata.jade | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3c2a45da/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 c50d16a..849c4e9 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
@@ -35,7 +35,7 @@ block content
button.btn.btn-primary(id='new-item' ng-click='createItem()') Add cache
+save-remove-buttons('cache')
.panel-tip-container(ng-show='backupItem')
- a.btn.btn-primary(id='reset-item' ng-disabled='!ui.isDirty()' ng-click='resetAll()' bs-tooltip data-title='Reset current cache' data-placement='bottom' data-trigger='hover') Reset
+ a.btn.btn-primary(id='reset-item-top' ng-disabled='!ui.isDirty()' ng-click='ui.isDirty() ? resetAll() : ""' bs-tooltip data-title='Reset current cache' data-placement='bottom' data-trigger='hover') Reset
hr
form.form-horizontal(name='ui.inputForm' ng-show='backupItem && tableVisibleRow(displayedRows, selectedItem)' novalidate unsaved-warning-form)
.panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true')
@@ -47,4 +47,4 @@ block content
.section(ng-if='ui.expanded')
+save-remove-buttons('cache')
.panel-tip-container(ng-show='backupItem')
- a.btn.btn-primary(id='reset-item' ng-disabled='!ui.isDirty()' ng-click='resetAll()' bs-tooltip data-title='Reset current cache' data-placement='bottom' data-trigger='hover') Reset
+ a.btn.btn-primary(id='reset-item-bottom' ng-disabled='!ui.isDirty()' ng-click='ui.isDirty() ? resetAll() : ""' bs-tooltip data-title='Reset current cache' data-placement='bottom' data-trigger='hover') Reset
http://git-wip-us.apache.org/repos/asf/ignite/blob/3c2a45da/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 e57d511..92b6420 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
@@ -35,7 +35,7 @@ block content
button.btn.btn-primary(id='new-item' ng-click='createItem()') Add cluster
+save-remove-buttons('cluster')
.panel-tip-container(ng-show='backupItem')
- a.btn.btn-primary(id='reset-item' ng-disabled='!ui.isDirty()' ng-click='resetAll()' bs-tooltip data-title='Reset current cluster' data-placement='bottom' data-trigger='hover') Reset
+ a.btn.btn-primary(id='reset-item-top' ng-disabled='!ui.isDirty()' ng-click='ui.isDirty() ? resetAll() : ""' bs-tooltip data-title='Reset current cluster' data-placement='bottom' data-trigger='hover') Reset
hr
form.form-horizontal(name='ui.inputForm' ng-show='backupItem && tableVisibleRow(displayedRows, selectedItem)' novalidate unsaved-warning-form)
.panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true' ng-click='triggerDigest = true')
@@ -47,4 +47,4 @@ block content
.section(ng-show='ui.expanded')
+save-remove-buttons('cluster')
.panel-tip-container(ng-show='backupItem')
- a.btn.btn-primary(id='reset-item' ng-disabled='!ui.isDirty()' ng-click='resetAll()' bs-tooltip data-title='Reset current cluster' data-placement='bottom' data-trigger='hover') Reset
+ a.btn.btn-primary(id='reset-item-bottom' ng-disabled='!ui.isDirty()' ng-click='ui.isDirty() ? resetAll() : ""' bs-tooltip data-title='Reset current cluster' data-placement='bottom' data-trigger='hover') Reset
http://git-wip-us.apache.org/repos/asf/ignite/blob/3c2a45da/modules/control-center-web/src/main/js/views/configuration/igfs.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/igfs.jade b/modules/control-center-web/src/main/js/views/configuration/igfs.jade
index cfee5ee..ff7486d 100644
--- a/modules/control-center-web/src/main/js/views/configuration/igfs.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/igfs.jade
@@ -35,7 +35,7 @@ block content
button.btn.btn-primary(id='new-item' ng-click='createItem()') Add IGFS
+save-remove-buttons('IGFS')
.panel-tip-container(ng-show='backupItem')
- a.btn.btn-primary(id='reset-item' ng-disabled='!ui.isDirty()' ng-click='resetAll()' bs-tooltip data-title='Reset current IGFS' data-placement='bottom' data-trigger='hover') Reset
+ a.btn.btn-primary(id='reset-item-top' ng-disabled='!ui.isDirty()' ng-click='ui.isDirty() ? resetAll() : ""' bs-tooltip data-title='Reset current IGFS' data-placement='bottom' data-trigger='hover') Reset
hr
form.form-horizontal(name='ui.inputForm' ng-show='backupItem && tableVisibleRow(displayedRows, selectedItem)' novalidate unsaved-warning-form)
.panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true' ng-click='triggerDigest = true')
@@ -47,4 +47,4 @@ block content
.section(ng-show='ui.expanded')
+save-remove-buttons('IGFS')
.panel-tip-container(ng-show='backupItem')
- a.btn.btn-primary(id='reset-item' ng-disabled='!ui.isDirty()' ng-click='resetAll()' bs-tooltip data-title='Reset current IGFS' data-placement='bottom' data-trigger='hover') Reset
+ a.btn.btn-primary(id='reset-item-bottom' ng-disabled='!ui.isDirty()' ng-click='ui.isDirty() ? resetAll() : ""' bs-tooltip data-title='Reset current IGFS' data-placement='bottom' data-trigger='hover') Reset
http://git-wip-us.apache.org/repos/asf/ignite/blob/3c2a45da/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 9242c8e..0b99282 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
@@ -60,7 +60,7 @@ block content
button.btn.btn-primary(ng-click='showLoadMetadataModal()') Load from database
+save-remove-buttons('metadata')
.panel-tip-container(ng-show='backupItem')
- a.btn.btn-primary(id='reset-item' ng-disabled='!ui.isDirty()' ng-click='resetAll()' bs-tooltip data-title='Reset current metadata' data-placement='bottom' data-trigger='hover') Reset
+ a.btn.btn-primary(id='reset-item-top' ng-disabled='!ui.isDirty()' ng-click='ui.isDirty() ? resetAll() : ""' bs-tooltip data-title='Reset current metadata' data-placement='bottom' data-trigger='hover') Reset
hr
form.form-horizontal(name='ui.inputForm' ng-show='backupItem && tableVisibleRow((displayedRows | metadatasValidation:ui.showValid:true), selectedItem)' novalidate unsaved-warning-form)
.panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true')
@@ -68,4 +68,4 @@ block content
.section
+save-remove-buttons('metadata')
.panel-tip-container(ng-show='backupItem')
- a.btn.btn-primary(id='reset-item' ng-disabled='!ui.isDirty()' ng-click='resetAll()' bs-tooltip data-title='Reset current metadata' data-placement='bottom' data-trigger='hover') Reset
+ a.btn.btn-primary(id='reset-item-bottom' ng-disabled='!ui.isDirty()' ng-click='ui.isDirty() ? resetAll() : ""' bs-tooltip data-title='Reset current metadata' data-placement='bottom' data-trigger='hover') Reset