[Sciviews-commits] r206 - komodo/SciViews-K/content

Wed Oct 7 11:50:07 CEST 2009

Author: prezez
Date: 2009-10-07 11:50:07 +0200 (Wed, 07 Oct 2009)
New Revision: 206

Added:
   komodo/SciViews-K/content/rsearch.html
Modified:
   komodo/SciViews-K/content/RHelpOverlay.xul
Log:
Just a few corrections to previous changes in RHelpWin.

Modified: komodo/SciViews-K/content/RHelpOverlay.xul
===================================================================

--- komodo/SciViews-K/content/RHelpOverlay.xul	2009-10-06 23:22:45 UTC (rev 205)
+++ komodo/SciViews-K/content/RHelpOverlay.xul	2009-10-07 09:50:07 UTC (rev 206)
@@ -293,9 +293,8 @@
 function _getHomePage(browser, goTo) {
 	var isWin = navigator.platform.search(/Win\d+$/) === 0;
 
-	// Temporarily commented out, as this seems to make R not responging sometimes.
-	//var cmd = 'suppressMessages(make.packages.html()); options(htmlhelp = TRUE); ';
-	var cmd = 'options(htmlhelp = TRUE); ';
+	var cmd = 'suppressMessages(make.packages.html()); ';
+	cmd += 'options(htmlhelp = TRUE); ';
 	cmd += "cat(" + (isWin? "R.home()" : "tempdir()") + ");";
 
 	var res = sv.r.evalCallback(cmd, function (path) {

Added: komodo/SciViews-K/content/rsearch.html
===================================================================
--- komodo/SciViews-K/content/rsearch.html	                        (rev 0)
+++ komodo/SciViews-K/content/rsearch.html	2009-10-07 09:50:07 UTC (rev 206)
@@ -0,0 +1,42 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-2">
+<title>JavaScript Shell 1.4</title>
+
+<script type="text/javascript">
+
+function _getWindowByURI(uri) {
+	var wm = Components.classes['@mozilla.org/appshell/window-mediator;1']
+		.getService(Components.interfaces.nsIWindowMediator);
+	en = wm.getEnumerator("");
+
+	if (uri) {
+		var win;
+		while (en.hasMoreElements()) {
+			win = en.getNext();
+			if (win.location.href == uri)
+				return win;
+		}
+	}
+	return null;
+}
+
+
+var rHelpXulUri = "chrome://sciviewsk/content/RHelpOverlay.xul";
+
+var rHelpWin, sv;
+
+function init() {
+	rHelpWin = _getWindowByURI(rHelpXulUri);
+	sv = rHelpWin.sv;
+}
+
+</script>
+</head>
+
+<body onload="init();">
+<h1>Search results:</h1>
+<div id="results"></div>
+</body>
+</html>

