From 495dddc389c0b822f61eb635393d35c3d64a194f Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Sat, 6 Oct 2018 09:04:37 -0400
Subject: [PATCH] fix https://github.com/uBlockOrigin/uMatrix-issues/issues/70

---
 src/css/common.css         |  8 ++++++--
 src/css/logger-ui.css      |  2 +-
 src/js/logger-ui.js        |  7 ++++---
 src/popup.html             | 10 +++++-----
 tools/make-firefox-meta.py | 13 +++----------
 5 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/css/common.css b/src/css/common.css
index e7c7d51..3cbd908 100644
--- a/src/css/common.css
+++ b/src/css/common.css
@@ -44,12 +44,14 @@ body[dir="rtl"] {
     color: black;
     content: attr(data-tip);
     font: 12px sans-serif;
+    left: -10vw;
     line-height: 140%;
     min-width: 25vw;
     opacity: 1;
     padding: 4px 6px;
     pointer-events: none;
     position: absolute;
+    right: 10vw;
     text-align: start;
     top: 110%;
     -webkit-transition: opacity 0.15s 0.5s;
@@ -59,11 +61,13 @@ body[dir="rtl"] {
     }
 body[dir="ltr"] .tip-anchor-left[data-i18n-tip]:hover::after,
 body[dir="rtl"] .tip-anchor-right[data-i18n-tip]:hover::after {
-    left: -3vw;
+    left: 0;
+    right: unset;
     }
 body[dir="ltr"] .tip-anchor-right[data-i18n-tip]:hover::after,
 body[dir="rtl"] .tip-anchor-left[data-i18n-tip]:hover::after {
-    right: -3vw;
+    left: unset;
+    right: 0;
     }
 body.noTooltips *[data-i18n-tip]::after {
     display: none;
diff --git a/src/css/logger-ui.css b/src/css/logger-ui.css
index 01c8f1d..e42e667 100644
--- a/src/css/logger-ui.css
+++ b/src/css/logger-ui.css
@@ -53,7 +53,6 @@ body {
     overflow: hidden;
     position: fixed;
     right: 0;
-    /*top: 0;*/
     z-index: 2000;
     }
 body.popupPanelOn #popupPanelContainer {
@@ -68,6 +67,7 @@ body.popupPanelOn #popupPanelContainer {
     border: 0;
     padding: 0;
     margin: 0;
+    overflow: hidden;
     width: 100%;
     }
 #popupPanelContainer.hide > iframe {
diff --git a/src/js/logger-ui.js b/src/js/logger-ui.js
index 10ed0f9..e0d13ff 100644
--- a/src/js/logger-ui.js
+++ b/src/js/logger-ui.js
@@ -687,9 +687,10 @@ var popupPanel = (function() {
             popupObserver.disconnect();
         }
         popup.setAttribute('src', 'popup.html?tabId=' + tabId);
-        if ( popup.parentNode === null ) {
-            container.appendChild(popup);
-        }
+        if ( popup.parentNode !== null ) { return; }
+        let rect = document.getElementById('toolbar').getBoundingClientRect();
+        container.style.top = rect.height + 'px';
+        container.appendChild(popup);
     };
 
     let stop = function() {
diff --git a/src/popup.html b/src/popup.html
index 2a73555..17e5c85 100644
--- a/src/popup.html
+++ b/src/popup.html
@@ -19,14 +19,14 @@
         <div class="toolbar">
             <span class="scope" id="specificScope"><span>&nbsp;</span></span><!--
          --><span class="scope" id="globalScope" data-scope="*" data-i18n-tip="matrixGlobalScopeTip"><span><span>&#x2217;</span></span></span>
-            <span id="mtxSwitch_matrix-off" class="fa-icon fa-icon-badged scopeRel tip-anchor-left" data-i18n-tip="matrixMtxButtonTip">power-off</span>
+            <span id="mtxSwitch_matrix-off" class="fa-icon fa-icon-badged scopeRel" data-i18n-tip="matrixMtxButtonTip">power-off</span>
             <span id="buttonMtxSwitches" class="fa-icon fa-icon-badged scopeRel" tabindex="-1" data-dropdown-menu="dropDownMenuSwitches">ellipsis-v</span>
-            <span id="buttonRecipes" class="fa-icon fa-icon-badged scopeRel tip-anchor-right" data-dropdown-menu="dropDownMenuRecipes">puzzle-piece</span>
-            <span id="buttonPersist" class="fa-icon fa-icon-badged scopeRel tip-anchor-left" data-i18n-tip="matrixPersistButtonTip">lock</span>
-            <span id="buttonRevertScope" class="fa-icon fa-icon-badged scopeRel tip-anchor-left" data-i18n-tip="matrixRevertButtonTip">reply</span>
+            <span id="buttonRecipes" class="fa-icon fa-icon-badged scopeRel" data-dropdown-menu="dropDownMenuRecipes">puzzle-piece</span>
+            <span id="buttonPersist" class="fa-icon fa-icon-badged scopeRel" data-i18n-tip="matrixPersistButtonTip">lock</span>
+            <span id="buttonRevertScope" class="fa-icon fa-icon-badged scopeRel" data-i18n-tip="matrixRevertButtonTip">reply</span>
             </div>
         <div class="toolbar">
-            <span id="buttonReload" class="fa-icon tip-anchor-left" data-i18n-tip="matrixReloadButton">sync-alt</span>
+            <span id="buttonReload" class="fa-icon tip-anchor-right" data-i18n-tip="matrixReloadButton">sync-alt</span>
             </div>
         <div class="toolbar">
             <span id="buttonRevertAll" class="fa-icon tip-anchor-right" data-i18n-tip="matrixRevertAllEntry">reply-all</span>
diff --git a/tools/make-firefox-meta.py b/tools/make-firefox-meta.py
index 8c03556..1e1e739 100755
--- a/tools/make-firefox-meta.py
+++ b/tools/make-firefox-meta.py
@@ -20,16 +20,9 @@ webext_manifest_file = os.path.join(build_dir, 'manifest.json')
 with open(webext_manifest_file) as f:
     webext_manifest = json.load(f)
 
-match = re.search('^(\d+\.\d+\.\d+)(\.\d+)$', version)
-if match:
-    buildtype = int(match.group(2)[1:])
-    if buildtype < 100:
-        builttype = 'b' + str(buildtype)
-    else:
-        builttype = 'rc' + str(buildtype - 100)
-    webext_manifest['version'] = match.group(1) + builttype
-else:
-    webext_manifest['version'] = version
+webext_manifest['version'] = version
+match = re.search('^\d+\.\d+\.\d+(b|rc)', version)
+if not match:
     # https://bugzilla.mozilla.org/show_bug.cgi?id=1459007
     # By design Firefox opens the sidebar with new installation of
     # uMatrix when sidebar_action is present in the manifest.