ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject [04/50] [abbrv] ignite git commit: IGNITE-843 fixed tooltip
Date Mon, 28 Mar 2016 08:47:44 GMT
IGNITE-843 fixed tooltip


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aec0f596
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aec0f596
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aec0f596

Branch: refs/heads/ignite-2875
Commit: aec0f596658d66f3057c1daf00821677510ce83d
Parents: ad921af
Author: Dmitriyff <dmitriyff@gmail.com>
Authored: Thu Mar 17 18:35:04 2016 +0700
Committer: Dmitriyff <dmitriyff@gmail.com>
Committed: Thu Mar 17 18:35:04 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/app/modules/form/field/tooltip.directive.js     | 5 +++--
 .../src/main/js/app/modules/form/group/tooltip.directive.js     | 4 ++--
 .../states/configuration/clusters/general/discovery/vm.jade     | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/aec0f596/modules/control-center-web/src/main/js/app/modules/form/field/tooltip.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/form/field/tooltip.directive.js
b/modules/control-center-web/src/main/js/app/modules/form/field/tooltip.directive.js
index 4fc9ef9..e24df9c 100644
--- a/modules/control-center-web/src/main/js/app/modules/form/field/tooltip.directive.js
+++ b/modules/control-center-web/src/main/js/app/modules/form/field/tooltip.directive.js
@@ -19,8 +19,9 @@ const template = `<i class='tipField fa fa-question-circle'></i>`;
 
 export default ['igniteFormFieldTooltip', ['$tooltip', ($tooltip) => {
     const link = ($scope, $element, $attrs, [form, field], $transclude) => {
-        const content = Array.prototype.slice.apply($transclude($scope))
-            .reduce((html, el) => html += el.outerHTML, '');
+        const content = Array.prototype.slice
+            .apply($transclude($scope))
+            .reduce((html, el) => html += el.outerHTML || el.textContent || el, '');
 
         $tooltip($element, { title: content });
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/aec0f596/modules/control-center-web/src/main/js/app/modules/form/group/tooltip.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/form/group/tooltip.directive.js
b/modules/control-center-web/src/main/js/app/modules/form/group/tooltip.directive.js
index 5af8fb1..fa87ba7 100644
--- a/modules/control-center-web/src/main/js/app/modules/form/group/tooltip.directive.js
+++ b/modules/control-center-web/src/main/js/app/modules/form/group/tooltip.directive.js
@@ -20,8 +20,8 @@ const template = `<i class='group-legend-btn fa fa-question-circle'></i>`;
 export default ['igniteFormGroupTooltip', ['$tooltip', ($tooltip) => {
     const link = ($scope, $element, $attrs, $ctrls, $transclude) => {
         const content = Array.prototype.slice
-        .apply($transclude($scope))
-        .reduce((html, el) => html += el.outerHTML, '');
+            .apply($transclude($scope))
+            .reduce((html, el) => html += el.outerHTML || el.textContent || el, '');
 
         $tooltip($element, { title: content });
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/aec0f596/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.jade
b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.jade
index 05c17ba..a0071e6 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.jade
@@ -71,7 +71,7 @@ mixin addressFeedbackRequired(field)
         ignite-form-field-label
             | Addresses
         ignite-form-group-tooltip
-            | Addresses may be represented as follows:#[br]
+            | Addresses may be represented as follows:
             ul: li IP address (e.g. 127.0.0.1, 9.9.9.9, etc)
                 li IP address and port (e.g. 127.0.0.1:47500, 9.9.9.9:47501, etc)
                 li IP address and port range (e.g. 127.0.0.1:47500..47510, 9.9.9.9:47501..47504,
etc)
@@ -79,7 +79,7 @@ mixin addressFeedbackRequired(field)
                 li Hostname and port (e.g. host1.com:47500, host2:47502, etc)
                 li Hostname and port range (e.g. host1.com:47500..47510, host2:47502..47508,
etc)
             | If port is 0 or not provided then default port will be used (depends on discovery
SPI configuration)#[br]
-            | If port range is provided (e.g. host:port1..port2) the following should be
considered:#[br]
+            | If port range is provided (e.g. host:port1..port2) the following should be
considered:
             ul: li port1 < port2 should be true
                 li Both port1 and port2 should be greater than 0
         ignite-form-group-add(ng-click='group.add = [{}]')


Mime
View raw message