[Sciviews-commits] r351 - in komodo/SciViews-K: . content/js

[noreply at r-forge.r-project.org]

Author: prezez
Date: 2011-01-31 11:50:49 +0100 (Mon, 31 Jan 2011)
New Revision: 351

Added:
   komodo/SciViews-K/sciviewsk-0.10.dev-ko.xpi
Modified:
   komodo/SciViews-K/content/js/prefs.js
Log:
prefs.js: fixed - svRApplication/svRInterpreter were not set initially
Added xpi for a development/cut-down version: 0.10.dev (eg. no extra icons, old R-packages using socket only)


Modified: komodo/SciViews-K/content/js/prefs.js
===================================================================
--- komodo/SciViews-K/content/js/prefs.js	2011-01-25 18:47:26 UTC (rev 350)
+++ komodo/SciViews-K/content/js/prefs.js	2011-01-31 10:50:49 UTC (rev 351)
@@ -135,17 +135,21 @@
 //TODO: Rework this with respect to Mac and R.app
 // Default R interpreter Id: use a reasonable default, given the platform
 if (navigator.platform.indexOf("Win") === 0) {
-	sv.prefs.setString("svRApplication", "r-gui", false);
+	sv.prefs.setString("svRApplication", "r-gui", !sv.prefs.getString("svRApplication", "r-gui"));
 	if (!svRDefaultInterpreter)
 		svRDefaultInterpreter = sv.tools.file.whereIs("Rgui");
 } else {
-	sv.prefs.setString("svRApplication", "r-terminal", false);
+	sv.prefs.setString("svRApplication", "r-terminal", !sv.prefs.getString("svRApplication", "r-gui"));
 	if (!svRDefaultInterpreter)
 		svRDefaultInterpreter = sv.tools.file.whereIs("R");
 }
-sv.prefs.setString("svRDefaultInterpreter", svRDefaultInterpreter, false);
+sv.prefs.setString("svRDefaultInterpreter", svRDefaultInterpreter, 
+	!sv.prefs.getString("svRDefaultInterpreter", "r-gui"));
 
 
+sv.prefs.setString("sciviews.client.type", "socket", true); // DEBUG: Force "socket"
+
+
 // This is required by sv.helpContext() for attaching help to snippets (hack!)
 // Create empty preference sets to be used with snippet help system hack
 // [[%pref:R-help:value]] which displays nothing when the snippet is used

Added: komodo/SciViews-K/sciviewsk-0.10.dev-ko.xpi
===================================================================
(Binary files differ)


Property changes on: komodo/SciViews-K/sciviewsk-0.10.dev-ko.xpi
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream