nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcgil...@apache.org
Subject nifi git commit: [NIFI-3943] align combo option item toolips to hover closer to the icon. This closes #1849
Date Wed, 24 May 2017 15:15:07 GMT
Repository: nifi
Updated Branches:
  refs/heads/master ba49b8427 -> 7a46238ba


[NIFI-3943] align combo option item toolips to hover closer to the icon. This closes #1849


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

Branch: refs/heads/master
Commit: 7a46238baf076710df160519488174d1aa25bac5
Parents: ba49b84
Author: Scott Aslan <scottyaslan@gmail.com>
Authored: Tue May 23 18:54:42 2017 -0400
Committer: Matt Gilman <matt.c.gilman@gmail.com>
Committed: Wed May 24 11:14:48 2017 -0400

----------------------------------------------------------------------
 .../main/webapp/js/jquery/combo/jquery.combo.js | 27 ++++++++------------
 .../src/main/webapp/js/nf/nf-common.js          |  7 ++---
 2 files changed, 12 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/7a46238b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js
index b6d324b..a8eec19 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js
@@ -210,8 +210,15 @@
                             }
 
                             if (!isBlank(option.description)) {
-                                $('<div style="float: right; line-height: 32px;" class="fa
fa-question-circle"></div>').appendTo(optionElement).qtip($.extend({},
-                                    {
+                                $('<div style="float: right; line-height: 32px;" class="fa
fa-question-circle"></div>').appendTo(optionElement).qtip({
+                                        content: option.description,
+                                        position: {
+                                            at: 'top center',
+                                            my: 'bottom center',
+                                            adjust: {
+                                                y: 5
+                                            }
+                                        },
                                         style: {
                                             classes: 'nifi-tooltip'
                                         },
@@ -225,23 +232,9 @@
                                             effect: function(offset) {
                                                 $(this).slideUp(100);
                                             }
-                                        },
-                                        position: {
-                                            at: 'bottom center',
-                                            my: 'top center',
-                                            adjust: {
-                                                y: 5
-                                            }
-                                        }
-                                    },
-                                    {
-                                        content: option.description,
-                                        position: {
-                                            at: 'top right',
-                                            my: 'bottom left'
                                         }
                                     }
-                                ));
+                                );
                             }
 
                             actualHeight += 16;

http://git-wip-us.apache.org/repos/asf/nifi/blob/7a46238b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
index 5afe253..0bf7c38 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
@@ -165,11 +165,8 @@
                     }
                 },
                 position: {
-                    at: 'bottom center',
-                    my: 'top center',
-                    adjust: {
-                        y: 5
-                    }
+                    at: 'top center',
+                    my: 'bottom center'
                 }
             }
         },


Mime
View raw message