Revert "[JENKINS-34411] Add overflow override."

This reverts commit bf4ecc5.
jenkinsci · May 18, 2016 · 8603b66 · 8603b66
1 parent 5487fb4
commit 8603b66
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 51 deletions.
diff --git a/src/main/java/org/jenkinsci/test/acceptance/selenium/Scroller.java b/src/main/java/org/jenkinsci/test/acceptance/selenium/Scroller.java
@@ -1,7 +1,5 @@
 package org.jenkinsci.test.acceptance.selenium;
 
-import org.apache.commons.io.IOUtils;
-import org.openqa.selenium.By;
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.Point;
 import org.openqa.selenium.WebDriver;
@@ -68,48 +66,19 @@ public class Scroller extends AbstractWebDriverEventListener {
     /** Vertical margin to use when scrolling to the element. */
     private static final int MARGIN_Y = Integer.getInteger("SCROLL_MARGIN_Y", 200);
 
-    private final String overflowJS;
-
     public Scroller() throws IOException {
-        overflowJS = IOUtils.toString(Scroller.class.getResourceAsStream("overflow.js"));
     }
 
     @Override
     public void beforeClickOn(WebElement element, WebDriver driver) {
         scrollIntoView(element, driver);
     }
 
-    @Override
-    public void afterClickOn(WebElement element, WebDriver driver) {
-        // A click can cause a page change.
-        overideOverflow(driver);
-    }
-
     @Override
     public void beforeChangeValueOf(WebElement element, WebDriver driver) {
         scrollIntoView(element, driver);
     }
 
-    @Override
-    public void afterNavigateTo(String url, WebDriver driver) {
-        overideOverflow(driver);
-    }
-
-    @Override
-    public void afterNavigateBack(WebDriver driver) {
-        overideOverflow(driver);
-    }
-
-    @Override
-    public void afterNavigateForward(WebDriver driver) {
-        overideOverflow(driver);
-    }
-
-    @Override
-    public void afterNavigateRefresh(WebDriver driver) {
-        overideOverflow(driver);
-    }
-
     /**
      * To scroll the element to the view, we scroll the element to the top-edge of the screen.
      * A (configurable) margin is left to account for decorations.
@@ -125,11 +94,4 @@ private void scrollIntoView(WebElement e, WebDriver driver) {
         final String script = String.format("window.scrollTo(%d, %d);", p.getX() - MARGIN_X, p.getY() - MARGIN_Y);
         ((JavascriptExecutor)driver).executeScript(script);
     }
-
-    /** Override overflow behavior (if not done previously). */
-    private void overideOverflow(WebDriver driver) {
-        if (driver.findElements(By.id("ath-overflow-override")).isEmpty()) {
-            ((JavascriptExecutor)driver).executeScript(overflowJS);
-        }
-    }
 }
diff --git a/src/main/resources/org/jenkinsci/test/acceptance/selenium/overflow.js b/src/main/resources/org/jenkinsci/test/acceptance/selenium/overflow.js