Changeset 889

Timestamp:

02/14/14 02:22:53 (10 years ago)

Author:

ngw8

Message:

Web parser now scrolls back to the original position once it's finished

File:

• trunk/src/org/expeditee/io/WebParser.java (modified) (3 diffs)

trunk/src/org/expeditee/io/WebParser.java

@@ -431 +431 @@
                                                                 // Initializing the counter used when scrolling the page
                                                                 + "var scrollCounter = 0;"
-                                                                + "var scrollCounterHorizontal = 0;");
+                                                                + "var scrollCounterHorizontal = 0;"
+                                                                
+                                                                // Storing the current scroll position
+                                                                + "var originalScrollX = window.pageXOffset;"
+                                                                + "var originalScrollY = window.pageYOffset");
+                                                
+                                                
 
                                                 // Setting up the element that contains the CSS to hide all text. Also hiding readability mode buttons.
@@ -535 +541 @@
                                                         // Will never reach 100% here, as the processing is not quite finished - progress is set to 100% at the end of
                                                         // the addPageToFrame loop below
-                                                        progressBar.set((50 * (j + 1)) / nodesLength);
+                                                        try {
+                                                                progressBar.set((50 * (j + 1)) / nodesLength);
+                                                        } catch (ArrayIndexOutOfBoundsException e) {
+                                                                e.printStackTrace();
+                                                        }
                                                 }
 
@@ -652 +662 @@
                                 @Override
                                 public void run() {
+                                        // Scrolling to the original position on the page
+                                        webEngine.executeScript("window.scrollTo(originalScrollX, originalScrollY)");
                                         // Reloading the page once the parsing is done - only realistic way to reset (i.e. remove all the added WordSpan tags)
                                         // the page