You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2017/02/24 14:19:12 UTC

[05/50] ambari git commit: AMBARI-20036. Side Nav: implement the Services Actions - 2.(xiwang)

AMBARI-20036. Side Nav: implement the Services Actions - 2.(xiwang)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 65d901756c2b3bfb621bfd028094ffdbdcfca2fa
Parents: d7e9ef2
Author: Xi Wang <xi...@apache.org>
Authored: Tue Feb 21 16:34:21 2017 -0800
Committer: Xi Wang <xi...@apache.org>
Committed: Tue Feb 21 16:34:21 2017 -0800

----------------------------------------------------------------------
 ambari-web/vendor/scripts/theme/bootstrap-ambari.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/65d90175/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
----------------------------------------------------------------------
diff --git a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
index 77973a9..1c81aeb 100644
--- a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
+++ b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
@@ -126,6 +126,7 @@
       });
       $moreActions.on('click', function () {
         if (settings.fitHeight) {
+          // set actions submenu position
           var $moreIcon = $(this);
           $moreIcon.children('.dropdown-menu').css('position', 'fixed');
           var offset = $moreIcon.offset();
@@ -133,8 +134,10 @@
           $moreIcon.children('.dropdown-menu').css('left', offset.left);
         }
       });
-      $moreActions.children('.dropdown-menu').mouseleave(function () {
-        $(this).parent().removeClass('open');
+      $moreActions.children('.dropdown-menu').on('click', function () {
+        // some action was triggered, should hide this icon
+        var moreIcon = $(this).parent();
+        setTimeout(function(){ moreIcon.hide(); }, 1000);
       });
       $navigationContainer.children('.side-nav-menu').scroll(function () {
         $moreActions.removeClass('open');