From 4517c0b8d9d14864421843f5ac082de823361e44 Mon Sep 17 00:00:00 2001
From: TRAN Trung Thanh <thanhtt@exoplatform.com>
Date: Fri, 27 Sep 2013 17:13:23 +0700
Subject: [PATCH] PLF-5463: Weird behavior on Top Navigation Bar

Fix description:
	- Revert PLF-5315 and PLF-4862
---
 .../main/webapp/WEB-INF/gatein-resources.xml  | 24 -------------------
 .../UIAdminToolbarContainer.gtmpl             |  2 +-
 .../UICreatePlatformToolBarPortlet.gtmpl      |  2 +-
 .../UISetupPlatformToolBarPortlet.gtmpl       |  2 +-
 .../UIUserPlatformToolBarPortlet.gtmpl        |  2 +-
 .../twitter-bootstrap-hover-dropdown.js       | 18 --------------
 6 files changed, 4 insertions(+), 46 deletions(-)
 delete mode 100644 extension/portlets/platformNavigation/src/main/webapp/javascript/eXo/platform/navigation/ToolBarNavigation/twitter-bootstrap-hover-dropdown.js

diff --git a/extension/portlets/platformNavigation/src/main/webapp/WEB-INF/gatein-resources.xml b/extension/portlets/platformNavigation/src/main/webapp/WEB-INF/gatein-resources.xml
index 8151e54664..f878137482 100644
--- a/extension/portlets/platformNavigation/src/main/webapp/WEB-INF/gatein-resources.xml
+++ b/extension/portlets/platformNavigation/src/main/webapp/WEB-INF/gatein-resources.xml
@@ -65,9 +65,6 @@
             <depends>
                 <module>bts_dropdown</module>
             </depends>
-            <depends>
-              <module>bts_hover_dropdown</module>
-            </depends>
         </module>
     </portlet>
     <portlet>
@@ -76,9 +73,6 @@
             <depends>
                 <module>bts_dropdown</module>
             </depends>
-            <depends>
-                <module>bts_hover_dropdown</module>
-            </depends>
         </module>
     </portlet>
     <portlet>
@@ -89,9 +83,6 @@
             </depends>
            <depends>
               <module>bts_dropdown</module>
-           </depends>
-           <depends>
-              <module>bts_hover_dropdown</module>
            </depends>
             <!--
             <depends>
@@ -116,9 +107,6 @@
             <depends>
                 <module>bts_dropdown</module>
             </depends>
-            <depends>
-                <module>bts_hover_dropdown</module>
-            </depends>
         </module>
     </portlet>
     <!--Begin-->
@@ -213,16 +201,4 @@
          <module>jquery</module>
       </depends>
    </module>
-
-   <module>
-      <name>bts_hover_dropdown</name>
-      <load-group>plf_navigation</load-group>
-      <script>
-         <path>/javascript/eXo/platform/navigation/ToolBarNavigation/twitter-bootstrap-hover-dropdown.js</path>
-      </script>
-      <depends>
-         <module>jquery</module>
-         <as>jQuery</as>
-      </depends>
-   </module>
 </gatein-resources>
diff --git a/extension/portlets/platformNavigation/src/main/webapp/groovy/platformNavigation/portlet/UIAdminToolbarPortlet/UIAdminToolbarContainer.gtmpl b/extension/portlets/platformNavigation/src/main/webapp/groovy/platformNavigation/portlet/UIAdminToolbarPortlet/UIAdminToolbarContainer.gtmpl
index 1428eb3b07..1a98e7901b 100644
--- a/extension/portlets/platformNavigation/src/main/webapp/groovy/platformNavigation/portlet/UIAdminToolbarPortlet/UIAdminToolbarContainer.gtmpl
+++ b/extension/portlets/platformNavigation/src/main/webapp/groovy/platformNavigation/portlet/UIAdminToolbarPortlet/UIAdminToolbarContainer.gtmpl
@@ -33,7 +33,7 @@
 %>
 
 <div class="uiAdminToolbarPortlet uiDropdownWithIcon dropdown pull-left" id="$uicomponent.id">
-	<a class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown">
+	<a class="dropdown-toggle" data-toggle="dropdown">
 		<i class="uiIconPLF24x24Edit"></i>$editorLabel
 	</a>
 	
diff --git a/extension/portlets/platformNavigation/src/main/webapp/groovy/platformNavigation/portlet/UICreatePlatformToolBarPortlet/UICreatePlatformToolBarPortlet.gtmpl b/extension/portlets/platformNavigation/src/main/webapp/groovy/platformNavigation/portlet/UICreatePlatformToolBarPortlet/UICreatePlatformToolBarPortlet.gtmpl
index ab8733c91c..799c416945 100644
--- a/extension/portlets/platformNavigation/src/main/webapp/groovy/platformNavigation/portlet/UICreatePlatformToolBarPortlet/UICreatePlatformToolBarPortlet.gtmpl
+++ b/extension/portlets/platformNavigation/src/main/webapp/groovy/platformNavigation/portlet/UICreatePlatformToolBarPortlet/UICreatePlatformToolBarPortlet.gtmpl
@@ -38,7 +38,7 @@ JavascriptManager jsmanager = rcontext.getJavascriptManager();
 %>
 
 <div class="uiCreateToolBarPortlet uiDropdownWithIcon dropdown pull-right" id="$uicomponent.id">
-	<a href="#" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown"><i class="uiIconPLF24x24Add"></i></a>
+	<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="uiIconPLF24x24Add"></i></a>
 	<%uicomponent.renderChild(UICreateList.class);%>
 </div>
 
diff --git a/extension/portlets/platformNavigation/src/main/webapp/groovy/platformNavigation/portlet/UISetupPlatformToolBarPortlet/UISetupPlatformToolBarPortlet.gtmpl b/extension/portlets/platformNavigation/src/main/webapp/groovy/platformNavigation/portlet/UISetupPlatformToolBarPortlet/UISetupPlatformToolBarPortlet.gtmpl
index 12b7d7129b..db379fef43 100644
--- a/extension/portlets/platformNavigation/src/main/webapp/groovy/platformNavigation/portlet/UISetupPlatformToolBarPortlet/UISetupPlatformToolBarPortlet.gtmpl
+++ b/extension/portlets/platformNavigation/src/main/webapp/groovy/platformNavigation/portlet/UISetupPlatformToolBarPortlet/UISetupPlatformToolBarPortlet.gtmpl
@@ -49,7 +49,7 @@ if(pagesNodes!=null && !pagesNodes.isEmpty()) {
 
 %>
   <div class="uiSetupPlatformToolBarPortlet uiDropdownWithIcon dropdown pull-left" id="$uicomponent.id">
-      <a class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown">
 				<i class="uiIconPLF24x24Setup"></i><%=_ctx.appRes("UISetupPlatformToolBarPortlet.label.administration")%>
 			</a>
       <ul class="dropdown-menu">
diff --git a/extension/portlets/platformNavigation/src/main/webapp/groovy/platformNavigation/portlet/UIUserPlatformToolBarPortlet/UIUserPlatformToolBarPortlet.gtmpl b/extension/portlets/platformNavigation/src/main/webapp/groovy/platformNavigation/portlet/UIUserPlatformToolBarPortlet/UIUserPlatformToolBarPortlet.gtmpl
index 113543e104..fd681ac7fd 100644
--- a/extension/portlets/platformNavigation/src/main/webapp/groovy/platformNavigation/portlet/UIUserPlatformToolBarPortlet/UIUserPlatformToolBarPortlet.gtmpl
+++ b/extension/portlets/platformNavigation/src/main/webapp/groovy/platformNavigation/portlet/UIUserPlatformToolBarPortlet/UIUserPlatformToolBarPortlet.gtmpl
@@ -59,7 +59,7 @@
 %>
 <div class="uiUserToolBarPortlet uiDropdownWithIcon dropdown pull-right" id="$uicomponent.id">
     
-        <a class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown">
+        <a class="dropdown-toggle" data-toggle="dropdown">
             <%
               EntityEncoder encoder = EntityEncoder.FULL;
               fullName = encoder.encode(user.fullName);
diff --git a/extension/portlets/platformNavigation/src/main/webapp/javascript/eXo/platform/navigation/ToolBarNavigation/twitter-bootstrap-hover-dropdown.js b/extension/portlets/platformNavigation/src/main/webapp/javascript/eXo/platform/navigation/ToolBarNavigation/twitter-bootstrap-hover-dropdown.js
deleted file mode 100644
index 4929ea540f..0000000000
--- a/extension/portlets/platformNavigation/src/main/webapp/javascript/eXo/platform/navigation/ToolBarNavigation/twitter-bootstrap-hover-dropdown.js
+++ /dev/null
@@ -1,18 +0,0 @@
-(function($, window, undefined) {
-  $.fn.dropdownHover = function() {
-    $(this).hover( function() {
-      if ( !$(this).parent().hasClass("open")) {
-        $(this).click();
-      }}, function (){}
-    );
-  }
-
-  $(document).ready(function() {
-    // apply dropdownHover to all elements with the data-hover="dropdown" attribute
-    $('[data-hover="dropdown"]').dropdownHover();
-  });
-  $(document).ajaxComplete(function() {
-    // apply dropdownHover to all elements with the data-hover="dropdown" attribute
-    $('[data-hover="dropdown"]').dropdownHover();
-  });
-})(jQuery, this);