[Sciviews-commits] r221 - in komodo/SciViews-K: . content content/js templates
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Fri Nov 6 16:51:49 CET 2009
Author: phgrosjean
Date: 2009-11-06 16:51:49 +0100 (Fri, 06 Nov 2009)
New Revision: 221
Added:
komodo/SciViews-K/sciviewsk-0.9.7-ko.xpi
Modified:
komodo/SciViews-K/content/RHelpWindow.xul
komodo/SciViews-K/content/js/r.js
komodo/SciViews-K/content/js/sciviews.js
komodo/SciViews-K/content/overlayMain.xul
komodo/SciViews-K/install.rdf
komodo/SciViews-K/templates/R reference.kpz
komodo/SciViews-K/templates/SciViews-K.kpz
komodo/SciViews-K/templates/svGUI_0.9-46.tar.gz
komodo/SciViews-K/templates/svGUI_0.9-46.tgz
komodo/SciViews-K/templates/svGUI_0.9-46.zip
komodo/SciViews-K/templates/svMisc_0.9-56.tar.gz
komodo/SciViews-K/templates/svMisc_0.9-56.tgz
komodo/SciViews-K/templates/svMisc_0.9-56.zip
komodo/SciViews-K/templates/svSocket_0.9-48.tar.gz
komodo/SciViews-K/templates/svSocket_0.9-48.tgz
komodo/SciViews-K/templates/svSocket_0.9-48.zip
Log:
Bugs in R help system solved + sv.getTextRange("word") infinite loop bug when word starts document solved
Modified: komodo/SciViews-K/content/RHelpWindow.xul
===================================================================
--- komodo/SciViews-K/content/RHelpWindow.xul 2009-11-05 18:53:17 UTC (rev 220)
+++ komodo/SciViews-K/content/RHelpWindow.xul 2009-11-06 15:51:49 UTC (rev 221)
@@ -290,7 +290,7 @@
//cmd += 'options(htmlhelp = TRUE); ';
//cmd += "cat(" + (isWin? "R.home()" : "tempdir()") + ");";
// Make sure that help is started, but do not open a browser
- var cmd = 'help.start(browser = function(...) return()); ';
+ var cmd = 'invisible(capture.output(suppressMessages(help.start(browser = function(...) return())))); ';
// return the home page of R 2.10 help system
cmd += 'cat(paste("\n", "http://127.0.0.1:", tools:::httpdPort, "/doc/html/index.html", sep = ""))';
Modified: komodo/SciViews-K/content/js/r.js
===================================================================
--- komodo/SciViews-K/content/js/r.js 2009-11-05 18:53:17 UTC (rev 220)
+++ komodo/SciViews-K/content/js/r.js 2009-11-06 15:51:49 UTC (rev 221)
@@ -1396,7 +1396,7 @@
// Switch temporarily to the session directory and try loading
// .RData and Rhistory files
var dir = sv.prefs.getString("sciviews.session.dir", "");
- var cmd = 'rm(list = ls(pattern = "\\.active.", all.names = TRUE))\n' +
+ var cmd = 'rm(list = ls(pattern = "[.]active[.]", all.names = TRUE))\n' +
'rm(list = ls()); .savdir. <- setwd("' + dir + '")\n' +
'if (file.exists(".RData")) load(".RData")\n' +
'if (file.exists(".Rhistory")) loadhistory()\n' +
Modified: komodo/SciViews-K/content/js/sciviews.js
===================================================================
--- komodo/SciViews-K/content/js/sciviews.js 2009-11-05 18:53:17 UTC (rev 220)
+++ komodo/SciViews-K/content/js/sciviews.js 2009-11-06 15:51:49 UTC (rev 221)
@@ -60,7 +60,7 @@
var sv = {
// TODO: set this automatically according to the plugin version
version: 0.9,
- release: 6,
+ release: 7,
showVersion: true,
checkVersion: function (version) {
if (this.version < version) {
@@ -172,11 +172,15 @@
for (pStart = scimoz.positionBefore(curPos);
- (pStart > -1) && wordCharTest(scimoz.getWCharAt(pStart));
+ (pStart > 0) && wordCharTest(scimoz.getWCharAt(pStart));
pStart = scimoz.positionBefore(pStart)) {
};
- pStart += 1;
+ // PhG: correction for infinite loop if the name is at the beginning
+ // of the document
+ if (pStart != 0 | !wordCharTest(scimoz.getWCharAt(0))) {
+ pStart += 1;
+ }
for (pEnd = scimoz.currentPos;
(pEnd < scimoz.length) && wordCharTest(scimoz.getWCharAt(pEnd));
Modified: komodo/SciViews-K/content/overlayMain.xul
===================================================================
--- komodo/SciViews-K/content/overlayMain.xul 2009-11-05 18:53:17 UTC (rev 220)
+++ komodo/SciViews-K/content/overlayMain.xul 2009-11-06 15:51:49 UTC (rev 221)
@@ -89,7 +89,6 @@
<command id="cmd_sv_OpenPkgManager" key="key_cmd_sv_OpenPkgManager"
oncommand="sv.command.openPkgManager();" disabled="true"
desc="R: &pkgMgr;" label="&pkgMgr;" accesskey="&pkgMgr.key;"/>
-
<command id="cmd_sv_OpenHelp" key="key_cmd_sv_OpenHelp"
oncommand="sv.command.openHelp();"
desc="R: &helpStart;" label="&helpStart;" accesskey="&helpStart.key;"/>
Modified: komodo/SciViews-K/install.rdf
===================================================================
--- komodo/SciViews-K/install.rdf 2009-11-05 18:53:17 UTC (rev 220)
+++ komodo/SciViews-K/install.rdf 2009-11-06 15:51:49 UTC (rev 221)
@@ -4,7 +4,7 @@
<Description about="urn:mozilla:install-manifest">
<em:id>sciviewsk at sciviews.org</em:id>
<em:name>SciViews-K</em:name>
- <em:version>0.9.6</em:version>
+ <em:version>0.9.7</em:version>
<em:description>Edit R (http://www.r-project.org) code with Komodo</em:description>
<em:creator>Philippe Grosjean</em:creator>
<em:homepageURL>http://sciviews.org/SciViews-K</em:homepageURL>
Added: komodo/SciViews-K/sciviewsk-0.9.7-ko.xpi
===================================================================
(Binary files differ)
Property changes on: komodo/SciViews-K/sciviewsk-0.9.7-ko.xpi
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: komodo/SciViews-K/templates/R reference.kpz
===================================================================
(Binary files differ)
Modified: komodo/SciViews-K/templates/SciViews-K.kpz
===================================================================
(Binary files differ)
Modified: komodo/SciViews-K/templates/svGUI_0.9-46.tar.gz
===================================================================
(Binary files differ)
Modified: komodo/SciViews-K/templates/svGUI_0.9-46.tgz
===================================================================
(Binary files differ)
Modified: komodo/SciViews-K/templates/svGUI_0.9-46.zip
===================================================================
(Binary files differ)
Modified: komodo/SciViews-K/templates/svMisc_0.9-56.tar.gz
===================================================================
(Binary files differ)
Modified: komodo/SciViews-K/templates/svMisc_0.9-56.tgz
===================================================================
(Binary files differ)
Modified: komodo/SciViews-K/templates/svMisc_0.9-56.zip
===================================================================
(Binary files differ)
Modified: komodo/SciViews-K/templates/svSocket_0.9-48.tar.gz
===================================================================
(Binary files differ)
Modified: komodo/SciViews-K/templates/svSocket_0.9-48.tgz
===================================================================
(Binary files differ)
Modified: komodo/SciViews-K/templates/svSocket_0.9-48.zip
===================================================================
(Binary files differ)
More information about the Sciviews-commits
mailing list