Browse Source

Remove Google Search stuff which hasn't been working for many years now. Too bad DuckDuckGo doesn't offer something like this.

Martijn Laan 4 years ago
parent
commit
9d05a01e7e
3 changed files with 4 additions and 104 deletions
  1. 0 6
      ISHelp/Staging/contents-template.htm
  2. 2 59
      ISHelp/Staging/contents.css
  3. 2 39
      ISHelp/Staging/contents.js

+ 0 - 6
ISHelp/Staging/contents-template.htm

@@ -16,7 +16,6 @@
 <td><div style="width: 4px"></div></td>
 <td><div style="width: 4px"></div></td>
 <td id="tab-contents" class="selectedtab" onmousedown="select_tab('contents');"><a href="javascript:select_tab('contents');">Contents</a></td>
 <td id="tab-contents" class="selectedtab" onmousedown="select_tab('contents');"><a href="javascript:select_tab('contents');">Contents</a></td>
 <td id="tab-index" class="unselectedtab" onmousedown="select_tab('index');"><a href="javascript:select_tab('index');">Index</a></td>
 <td id="tab-index" class="unselectedtab" onmousedown="select_tab('index');"><a href="javascript:select_tab('index');">Index</a></td>
-<td id="tab-search" class="unselectedtab" onmousedown="select_tab('search');"><a href="javascript:select_tab('search');">Search</a></td>
 <td style="width: 100%">&nbsp;</td>
 <td style="width: 100%">&nbsp;</td>
 </tr>
 </tr>
 </table>
 </table>
@@ -32,11 +31,6 @@
 <div style="margin-top: 1em; text-align: center; color: GrayText">Loading...</div>
 <div style="margin-top: 1em; text-align: center; color: GrayText">Loading...</div>
 </div>
 </div>
 
 
-<div id="tabbody-search" style="display: none; padding: 4px">
-<div style="margin-bottom: 0.5em">Search Inno Setup Help:</div>
-<div id="searchcont"><div style="margin-top: 1em; text-align: center; color: GrayText">Loading...</div></div>
-</div>
-
 </div>
 </div>
 
 
 </body>
 </body>

+ 2 - 59
ISHelp/Staging/contents.css

@@ -1,6 +1,6 @@
 /*
 /*
   Inno Setup
   Inno Setup
-  Copyright (C) 1997-2019 Jordan Russell
+  Copyright (C) 1997-2021 Jordan Russell
   Portions by Martijn Laan
   Portions by Martijn Laan
   For conditions of distribution and use, see LICENSE.TXT.
   For conditions of distribution and use, see LICENSE.TXT.
 
 
@@ -122,61 +122,4 @@ INPUT {
 	color: HighlightText;
 	color: HighlightText;
 	background-color: Highlight;
 	background-color: Highlight;
 	outline-color: WindowText;   /* needed for focus rect to appear on Firefox (3.5) */
 	outline-color: WindowText;   /* needed for focus rect to appear on Firefox (3.5) */
-}
-
-
-#searchcont .gsc-control {
-	font: small Arial, sans-serif;   /* 10pt */
-	width: 100%;
-}
-#searchcont .gsc-tabHeader {
-	display: none;
-}
-#searchcont .gsc-resultsHeader {
-	border: none;
-}
-#searchcont .gs-webResult DIV.gs-visibleUrl-short {
-	display: none;
-}
-#searchcont .gsc-result .gs-title {
-	height: auto;   /* otherwise it clips to one line */
-	overflow: visible;   /* otherwise focus rectangle is chopped off */
-}
-#searchcont .gs-result .gs-title,
-#searchcont .gs-result .gs-title * {
-	color: #008000;
-}
-#searchcont .gs-result .gs-snippet {
-	font-size: 90%;   /* 9pt (9/10) */
-}
-#searchcont .gsc-results .gsc-cursor-box {
-	padding-top: 0.5em;
-	text-align: center;
-}
-#searchcont .gsc-results .gsc-cursor-box .gsc-cursor-page {
-	padding: 1px 5px;
-	border: 1px solid #008000;
-	color: #008000;
-	font-size: 90%;   /* 9pt (9/10) */
-	text-decoration: none;
-	     border-radius: 3px;
-	-moz-border-radius: 3px;			/* for Firefox 3.6 */
-	        box-shadow: #c0c0c0 1px 1px 2px;
-	   -moz-box-shadow: #c0c0c0 1px 1px 2px;	/* for Firefox 3.6 */
-	-webkit-box-shadow: #c0c0c0 1px 1px 2px;	/* for Chrome 6.0 */
-	-moz-user-select: none;
-}
-#searchcont .gsc-results .gsc-cursor-box .gsc-cursor-page:hover {
-	background-color: #008000;
-	color: white;
-	        box-shadow: #008000 0 0 5px, #c0c0c0 1px 1px 2px;
-	   -moz-box-shadow: #008000 0 0 5px, #c0c0c0 1px 1px 2px;	/* for Firefox 3.6 */
-	-webkit-box-shadow: #008000 0 0 5px, #c0c0c0 1px 1px 2px;	/* for Chrome 6.0 */
-}
-#searchcont .gsc-results .gsc-cursor-box .gsc-cursor-current-page {
-	background-color: #008000;
-	color: white;
-}
-#searchcont .gsc-results .gsc-cursor-box .gsc-trailing-more-results {
-	display: none;
-}
+}

+ 2 - 39
ISHelp/Staging/contents.js

@@ -1,14 +1,12 @@
 /*
 /*
   Inno Setup
   Inno Setup
-  Copyright (C) 1997-2020 Jordan Russell
+  Copyright (C) 1997-2021 Jordan Russell
   Portions by Martijn Laan
   Portions by Martijn Laan
   For conditions of distribution and use, see LICENSE.TXT.
   For conditions of distribution and use, see LICENSE.TXT.
 
 
   JavaScript code used by contents.htm
   JavaScript code used by contents.htm
 */
 */
 
 
-var searchTabBaseUrl = "https://jrsoftware.org/ishelp/";
-
 function get_absolute_top(obj)
 function get_absolute_top(obj)
 {
 {
 	var y = obj.offsetTop;
 	var y = obj.offsetTop;
@@ -217,7 +215,7 @@ function sync_contents()
 
 
 function select_tab(newTab)
 function select_tab(newTab)
 {
 {
-	var tabs = ["contents", "index", "search"];
+	var tabs = ["contents", "index"];
 
 
 	var i;
 	var i;
 	for (i = 0; i < tabs.length; i++) {
 	for (i = 0; i < tabs.length; i++) {
@@ -231,7 +229,6 @@ function select_tab(newTab)
 	document.getElementById("tabbody-" + newTab).style.display = "";
 	document.getElementById("tabbody-" + newTab).style.display = "";
 
 
 	if (newTab == "index") init_index_tab();
 	if (newTab == "index") init_index_tab();
-	if (newTab == "search") init_search_tab();
 }
 }
 
 
 var indexTabInited = false;
 var indexTabInited = false;
@@ -295,37 +292,3 @@ function index_tab_element_clicked(evt)
 		}
 		}
 	}
 	}
 }
 }
-
-var searchTabInited = false;
-
-function init_search_tab()
-{
-	if (searchTabInited) return;
-	searchTabInited = true;
-
-	var script = document.createElement("script");
-	script.src = "http://www.google.com/jsapi?callback=google_loader_callback";
-	script.type = "text/javascript";
-	document.getElementsByTagName("head")[0].appendChild(script);
-}
-
-function google_loader_callback()
-{
-	google.load("search", "1", {"callback" : google_searchapi_callback});
-}
-
-function google_searchapi_callback() {
-	var drawOptions = new google.search.DrawOptions();
-	drawOptions.setDrawMode(google.search.SearchControl.DRAW_MODE_TABBED);
-
-	var webSearch = new google.search.WebSearch();
-	webSearch.setSiteRestriction(searchTabBaseUrl);
-	webSearch.setUserDefinedLabel("Results");
-
-	var searchControl = new google.search.SearchControl();
-	searchControl.setLinkTarget("bodyframe");
-	searchControl.setResultSetSize(google.search.Search.LARGE_RESULTSET);
-	searchControl.addSearcher(webSearch);
-	searchControl.setNoResultsString("No results");
-	searchControl.draw(document.getElementById("searchcont"), drawOptions);
-}