From 4f63e079bc2d8dd6291c93319056a045c5c7990d Mon Sep 17 00:00:00 2001 From: gorhill Date: Sat, 27 Feb 2016 17:50:30 -0500 Subject: [PATCH] reverting fix to #441: undesirable side effects on Firefox --- src/css/popup.css | 3 ++- src/js/popup.js | 35 ----------------------------------- 2 files changed, 2 insertions(+), 36 deletions(-) diff --git a/src/css/popup.css b/src/css/popup.css index 761f020..5278696 100644 --- a/src/css/popup.css +++ b/src/css/popup.css @@ -7,7 +7,7 @@ body { min-height: 16em; min-width: 32em; opacity: 1; - overflow-x: auto; + overflow-x: hidden; overflow-y: auto; padding: 0; } @@ -24,6 +24,7 @@ a { left:0; padding: 0; position: fixed; + right: 0; top: 0; z-index: 10; } diff --git a/src/js/popup.js b/src/js/popup.js index 3be03e4..ec90ec3 100644 --- a/src/js/popup.js +++ b/src/js/popup.js @@ -1335,41 +1335,6 @@ var matrixSnapshotPoller = (function() { /******************************************************************************/ -// https://github.com/gorhill/uMatrix/pull/441 -// Make the header scroll horizontally with the document. - -// Ref.: resource-considerate scroll handler: -// https://developer.mozilla.org/en-US/docs/Web/Events/scroll#Example -// Won't cause DOM changes from within scroll handler. - -var lastScrollX = 0; -var onScrollThrottledFired = false; - -var onScrollThrottled = function() { - lastScrollX = window.scrollX; - var style = document.querySelector('.paneHead').style; - if ( lastScrollX === 0 ) { - style.removeProperty('left'); - } else { - style.setProperty('left', '-' + lastScrollX + 'px'); - } - onScrollThrottledFired = false; -}; - -var onScroll = function() { - if ( onScrollThrottledFired || window.scrollX === lastScrollX ) { - return; - } - onScrollThrottledFired = true; - self.requestAnimationFrame(onScrollThrottled); -}; - -if ( typeof self.requestAnimationFrame === 'function' ) { - document.addEventListener('scroll', onScroll); -} - -/******************************************************************************/ - // Below is UI stuff which is not key to make the menu, so this can // be done without having to wait for a tab to be bound to the menu.