From 06e675167cc217d5346d706e0d52af0726710e3d Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Tue, 7 Jul 2015 23:58:52 +0100
Subject: Delete trailing whitespace

---
 haddock-api/resources/html/haddock-util.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'haddock-api/resources/html/haddock-util.js')

diff --git a/haddock-api/resources/html/haddock-util.js b/haddock-api/resources/html/haddock-util.js
index 9a6fccf7..ba574356 100644
--- a/haddock-api/resources/html/haddock-util.js
+++ b/haddock-api/resources/html/haddock-util.js
@@ -131,11 +131,11 @@ function perform_search(full)
     var text = document.getElementById("searchbox").value.toLowerCase();
     if (text == last_search && !full) return;
     last_search = text;
-    
+
     var table = document.getElementById("indexlist");
     var status = document.getElementById("searchmsg");
     var children = table.firstChild.childNodes;
-    
+
     // first figure out the first node with the prefix
     var first = bisect(-1);
     var last = (first == -1 ? -1 : bisect(1));
@@ -166,7 +166,7 @@ function perform_search(full)
         status.innerHTML = "";
     }
 
-    
+
     function setclass(first, last, status)
     {
         for (var i = first; i <= last; i++)
@@ -174,8 +174,8 @@ function perform_search(full)
             children[i].className = status;
         }
     }
-    
-    
+
+
     // do a binary search, treating 0 as ...
     // return either -1 (no 0's found) or location of most far match
     function bisect(dir)
@@ -201,9 +201,9 @@ function perform_search(full)
             if (checkitem(i) == 0) return i;
         }
         return -1;
-    }    
-    
-    
+    }
+
+
     // from an index, decide what the result is
     // 0 = match, -1 is lower, 1 is higher
     function checkitem(i)
@@ -212,8 +212,8 @@ function perform_search(full)
         if (s == text) return 0;
         else return (s > text ? -1 : 1);
     }
-    
-    
+
+
     // from an index, get its string
     // this abstracts over alternates
     function getitem(i)
@@ -250,7 +250,7 @@ function addMenuItem(html) {
 
 function adjustForFrames() {
   var bodyCls;
-  
+
   if (parent.location.href == window.location.href) {
     // not in frames, so add Frames button
     addMenuItem("<a href='#' onclick='reframe();return true;'>Frames</a>");
-- 
cgit v1.2.3


From 7656bf86a661c5c755dc9874f709df2fc4833257 Mon Sep 17 00:00:00 2001
From: Phil Ruffwind <rf@rufflewind.com>
Date: Sun, 14 Jun 2015 23:12:09 -0400
Subject: Avoid JavaScript error during page load in non-frame mode

In non-frame mode, parent.window.synopsis refers to the synopsis div
rather than the nonexistent frame.  Unfortunately, the script wrongly
assumes that if it exists it must be a frame, leading to an error where
it tries to access the nonexistent attribute 'replace' of an undefined
value (synopsis.location).

Closes #406
---
 haddock-api/resources/html/haddock-util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'haddock-api/resources/html/haddock-util.js')

diff --git a/haddock-api/resources/html/haddock-util.js b/haddock-api/resources/html/haddock-util.js
index ba574356..fc7743fe 100644
--- a/haddock-api/resources/html/haddock-util.js
+++ b/haddock-api/resources/html/haddock-util.js
@@ -229,7 +229,7 @@ function perform_search(full)
 }
 
 function setSynopsis(filename) {
-    if (parent.window.synopsis) {
+    if (parent.window.synopsis && parent.window.synopsis.location) {
         if (parent.window.synopsis.location.replace) {
             // In Firefox this avoids adding the change to the history.
             parent.window.synopsis.location.replace(filename);
-- 
cgit v1.2.3