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 2016/02/05 09:16:35 UTC
[1/3] ignite git commit: IGNITE-843 Fixed loading overlay hardcoded
background.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 386334831 -> 200399c4e
IGNITE-843 Fixed loading overlay hardcoded background.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c53949ac
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c53949ac
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c53949ac
Branch: refs/heads/ignite-843-rc2
Commit: c53949ac9c3af46a7beb125b742ae63a1c87383a
Parents: 3863348
Author: Dmitriyff <dm...@gmail.com>
Authored: Fri Feb 5 15:12:46 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Feb 5 15:12:46 2016 +0700
----------------------------------------------------------------------
.../main/js/app/directives/loading/loading.css | 21 ++++++++++++++++++++
.../app/directives/loading/loading.directive.js | 1 +
.../src/main/js/public/stylesheets/style.scss | 4 ----
3 files changed, 22 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c53949ac/modules/control-center-web/src/main/js/app/directives/loading/loading.css
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/loading/loading.css b/modules/control-center-web/src/main/js/app/directives/loading/loading.css
new file mode 100644
index 0000000..64999e3
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/directives/loading/loading.css
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+.dw-loading.dw-loading-overlay,
+.page-loading-overlay {
+ background: unset none;
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c53949ac/modules/control-center-web/src/main/js/app/directives/loading/loading.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/loading/loading.directive.js b/modules/control-center-web/src/main/js/app/directives/loading/loading.directive.js
index 908581f..2925e6d 100644
--- a/modules/control-center-web/src/main/js/app/directives/loading/loading.directive.js
+++ b/modules/control-center-web/src/main/js/app/directives/loading/loading.directive.js
@@ -16,6 +16,7 @@
*/
import template from './loading.jade!';
+import './loading.css!';
export default ['igniteLoading', [() => {
return {
http://git-wip-us.apache.org/repos/asf/ignite/blob/c53949ac/modules/control-center-web/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
index 46aa510..a1c4347 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
@@ -1659,10 +1659,6 @@ a {
margin: 0 0 0 10px;
}
-.page-loading-overlay {
- background-color: rgba(255, 255, 255, 1) !important;
-}
-
.dw-loading {
min-height: 100px;
}
[2/3] ignite git commit: IGNITE-843 Added 150 ms debounce for user
input.
Posted by ak...@apache.org.
IGNITE-843 Added 150 ms debounce for user input.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7be639e1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7be639e1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7be639e1
Branch: refs/heads/ignite-843-rc2
Commit: 7be639e108fdd518ae60cce7419e309c26793c56
Parents: c53949a
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Feb 5 15:13:16 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Feb 5 15:13:16 2016 +0700
----------------------------------------------------------------------
.../src/main/js/app/modules/Form/field/input/number.jade | 1 +
.../src/main/js/app/modules/Form/field/input/text.jade | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7be639e1/modules/control-center-web/src/main/js/app/modules/Form/field/input/number.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/Form/field/input/number.jade b/modules/control-center-web/src/main/js/app/modules/Form/field/input/number.jade
index 1e77046..b032c46 100644
--- a/modules/control-center-web/src/main/js/app/modules/Form/field/input/number.jade
+++ b/modules/control-center-web/src/main/js/app/modules/Form/field/input/number.jade
@@ -34,6 +34,7 @@ mixin feedback(error, message)
data-ng-model='value'
data-ng-required='required || false'
data-ng-disabled='disabled || false'
+ data-ng-model-options='{debounce: 150}'
)
+feedback('min', 'Value is less than allowable minimum')
http://git-wip-us.apache.org/repos/asf/ignite/blob/7be639e1/modules/control-center-web/src/main/js/app/modules/Form/field/input/text.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/Form/field/input/text.jade b/modules/control-center-web/src/main/js/app/modules/Form/field/input/text.jade
index 9bf6bff..28298ab 100644
--- a/modules/control-center-web/src/main/js/app/modules/Form/field/input/text.jade
+++ b/modules/control-center-web/src/main/js/app/modules/Form/field/input/text.jade
@@ -25,6 +25,7 @@
data-ng-change='ngChange()'
data-ng-required='required || false'
data-ng-disabled='disabled || false'
+ data-ng-model-options='{debounce: 150}'
data-ignite-form-field-input-autofocus='autofocus || false'
)
[3/3] ignite git commit: IGNITE-843 Missing validations.
Posted by ak...@apache.org.
IGNITE-843 Missing validations.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/200399c4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/200399c4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/200399c4
Branch: refs/heads/ignite-843-rc2
Commit: 200399c4e25d33da8bb8b34a4a414c54dbc7e4e9
Parents: 7be639e
Author: vsisko <vs...@gridgain.com>
Authored: Fri Feb 5 15:16:40 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Feb 5 15:16:40 2016 +0700
----------------------------------------------------------------------
.../app/modules/states/configuration/clusters/communication.jade | 4 +++-
.../js/app/modules/states/configuration/clusters/deployment.jade | 2 +-
.../main/js/app/modules/states/configuration/clusters/swap.jade | 4 ++--
.../src/main/js/controllers/clusters-controller.js | 3 +++
.../src/main/js/helpers/generator/generator-common.js | 2 +-
5 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/200399c4/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/communication.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/communication.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/communication.jade
index 8031cfb..b99eee0 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/communication.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/communication.jade
@@ -128,12 +128,14 @@ form.panel.panel-default(name='communication' novalidate)
ignite-form-field-label
| Shared memory port:
ignite-form-field-tooltip
- | Local port to accept shared memory connections
+ | Local port to accept shared memory connections#[br]
+ | If set to #[b -1] shared memory communication will be disabled
ignite-form-field-input-number(
data-id='sharedMemoryPort'
data-name='sharedMemoryPort'
data-ng-model='#{model}.sharedMemoryPort'
data-placeholder='48100'
+ data-min='-1'
data-max='65535'
)
.settings-row
http://git-wip-us.apache.org/repos/asf/ignite/blob/200399c4/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade
index 23888a3..e54206e 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade
@@ -94,7 +94,7 @@ form.panel.panel-default(name='#{form}' novalidate)
data-id='peerClassLoadingThreadPoolSize'
data-name='peerClassLoadingThreadPoolSize'
data-ng-model='#{model}.peerClassLoadingThreadPoolSize'
- data-placeholder=2
+ data-placeholder='2'
data-ng-disabled='!#{enabled}'
)
.settings-row
http://git-wip-us.apache.org/repos/asf/ignite/blob/200399c4/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 f58dc84..83698ce 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
@@ -87,8 +87,8 @@ form.panel.panel-default(name='swapSpaceSpi' novalidate)
data-name='maximumSparsity'
data-ng-model='#{model}.FileSwapSpaceSpi.maximumSparsity'
data-placeholder='0.5'
- data-max=0.999
- data-min=0
+ data-max='0.999'
+ data-min='0'
)
.details-row
ignite-form-field
http://git-wip-us.apache.org/repos/asf/ignite/blob/200399c4/modules/control-center-web/src/main/js/controllers/clusters-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
index 8c27dce..7524378 100644
--- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
@@ -311,6 +311,9 @@ consoleModule.controller('clustersController', function ($http, $timeout, $scope
if (c.unacknowledgedMessagesBufferSize < 5 * c.ackSendThreshold)
return showPopoverMessage($scope.ui, 'communication', 'unacknowledgedMessagesBufferSize', 'Maximum number of stored unacknowledged messages should be at least 5 * ack send threshold');
}
+
+ if (c.sharedMemoryPort === 0)
+ return showPopoverMessage($scope.ui, 'communication', 'sharedMemoryPort', 'Shared memory port should be more than 0 or -1');
}
var r = item.connector;
http://git-wip-us.apache.org/repos/asf/ignite/blob/200399c4/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
index 2af69c9..e3b16e2 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
@@ -433,7 +433,7 @@ $generatorCommon.CONNECTOR_CONFIGURATION = {
sendBufferSize: {dflt: 32768},
sendQueueLimit: {dflt: 0},
directBuffer: {dflt: false},
- noDelay: {dflt: false},
+ noDelay: {dflt: true},
selectorCount: null,
threadPoolSize: null,
messageInterceptor: {type: 'bean'},