[Pkg-mozext-commits] [all-in-one-sidebar] 36/49: Minor: Fix #56: fix sidebar menu separators

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository all-in-one-sidebar.

commit de9b69ed6b1a67e17a19da804f6c0a1508e6f7f6
Author: Ingo Wennemaring <github at addonlab.com>
Date:   Wed Sep 10 17:36:50 2014 +0200

    Minor: Fix #56: fix sidebar menu separators
---
 content/_lib.js  | 10 +++++-----
 content/aios.xul | 13 +++++++------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/content/_lib.js b/content/_lib.js
index 1d3f3e1..bbff93e 100644
--- a/content/_lib.js
+++ b/content/_lib.js
@@ -70,13 +70,13 @@ function aios_modSidebarMenu() {
         }
     }
 
-    var mitemsep1 = document.getElementById('aios-sidebar-mitem-sep1');
-    if(mitemsep1.nextSibling.id == "aios-sidebar-mitem-sep0" || mitemsep1.nextSibling.getAttribute('observes') == "viewConsole2Sidebar" || mitemsep1.nextSibling.getAttribute('observes') == "viewDmtSidebar")
-        mitemsep1.setAttribute('hidden', true);
+    // var mitemsep1 = document.getElementById('aios-sidebar-mitem-sep1');
+    // if(mitemsep1.nextSibling.id == "aios-sidebar-mitem-sep0" || mitemsep1.nextSibling.getAttribute('observes') == "viewConsole2Sidebar" || mitemsep1.nextSibling.getAttribute('observes') == "viewDmtSidebar")
+    //     mitemsep1.setAttribute('hidden', true);
 
 
     // Menueeintraege anzeigen/verbergen (Sidebar oeffnen/schliessen und Einstellungen) und verschieben
-    var showhideMenuseparator = document.getElementById('aios-sidebar-mitem-sep0');
+    //var showhideMenuseparator = document.getElementById('aios-sidebar-mitem-sep0');
     var paneltabMitem1 = document.getElementById('aios-sidebar-mitem-paneltab1');
     var paneltabMitem2 = document.getElementById('aios-sidebar-mitem-paneltab2');
     var sidebarshowMitem = document.getElementById('aios-sidebar-mitem-show');
@@ -108,7 +108,7 @@ function aios_modSidebarMenu() {
     // Menueeintraege ganz nach unten verschieben, wenn das Menue noch nicht bearbeitet wurde
     if(!aios_getBoolean(fx_sidebarMenu, 'aios-modified')) {
 
-        fx_sidebarMenu.appendChild(showhideMenuseparator);
+        //fx_sidebarMenu.appendChild(showhideMenuseparator);
         fx_sidebarMenu.appendChild(paneltabMitem1);
         fx_sidebarMenu.appendChild(paneltabMitem2);
         fx_sidebarMenu.appendChild(sidebarshowMitem);
diff --git a/content/aios.xul b/content/aios.xul
index 689ab44..a449e56 100644
--- a/content/aios.xul
+++ b/content/aios.xul
@@ -409,18 +409,19 @@
     <!-- Fx-Menue: Ansicht > Sidebar - popupshowing-Ueberwachung in aios_initSidebar() (hier wg. Komp. mit MenuManipulator) -->
     <menupopup id="viewSidebarMenu" onpopupshowing="aios_modSidebarMenu();">
 
-        <menuseparator id="bookmarks_sep" position="3" />
+        <menuitem id="downloads-mitem" observes="viewDownloadsSidebar" position="3" key="key_openDownloads" />
+
+        <menuseparator id="places_sep" position="4" />
 
-        <menuitem id="downloads-mitem" observes="viewDownloadsSidebar" position="4" key="key_openDownloads" />
         <menuitem id="addons-mitem" observes="viewAddonsSidebar" position="5" key="aiosKey_addons" />
+        <menuitem id="multipanel-mitem" observes="viewWebPanelsSidebar" position="6" key="aiosKey_multiPanel" />
+        <menuitem id="pageinfo-mitem" observes="viewPageInfoSidebar" position="7" key="aiosKey_pageInfo" />
 
-        <menuseparator position="6" />
+        <menuseparator id="addons_sep" position="8" />
 
-        <menuitem id="multipanel-mitem" observes="viewWebPanelsSidebar" position="7" key="aiosKey_multiPanel" />
-        <menuitem id="pageinfo-mitem" observes="viewPageInfoSidebar" position="8" key="aiosKey_pageInfo" />
         <menuitem id="console-mitem" observes="viewConsoleSidebar" position="9" key="key_errorConsole" />
 
-        <menuseparator id="aios-sidebar-mitem-sep1" position="10" />
+        <!-- <menuseparator id="aios-sidebar-mitem-sep1" position="10" /> -->
 
         <menuseparator id="aios-sidebar-mitem-sep0" position="94" />
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/all-in-one-sidebar.git