[Sciviews-commits] r330 - komodo/SciViews-K/content/js

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

Author: prezez
Date: 2010-10-04 23:35:03 +0200 (Mon, 04 Oct 2010)
New Revision: 330

Modified:
   komodo/SciViews-K/content/js/commands.js
   komodo/SciViews-K/content/js/pref-R.js
Log:
commands.js,pref-R.js: Fixed some more overlooked errors (introduced during revision merging)

Modified: komodo/SciViews-K/content/js/commands.js
===================================================================
--- komodo/SciViews-K/content/js/commands.js	2010-10-04 21:03:42 UTC (rev 329)
+++ komodo/SciViews-K/content/js/commands.js	2010-10-04 21:35:03 UTC (rev 330)
@@ -101,28 +101,21 @@
 		sv.translate("Default R interpreter is not (correctly) set in " +
 			     "Preferences. Do you want to do it now?"),
 			"OK", null, "SciViews-K") == "OK") {
-		prefs_doGlobalPrefs("svPrefRItem", true);
+			prefs_doGlobalPrefs("svPrefRItem", true);
 	    }
 	    return;
 		}
 
-	var id=sv.prefs.getString("svRApplication",
+	var isWin = navigator.platform.indexOf("Win") === 0;
+	var id = sv.prefs.getString("svRApplication",
                                 isWin? "r-gui" : "r-terminal");
 
-		var id = sv.prefs.getString("svRApplicationId");
 	// runIn = "command-output-window", "new-console",
 	// env strings: "ENV1=fooJ\nENV2=bar"
 	// gPrefSvc.prefs.getStringPref("runEnv");
 
-	// Reasonable default values are set in prefs.js... but just in case, we
-	// make sure to redefine reasonable default values here
-	var isWin = navigator.platform.indexOf("Win") === 0;
-	// Default preferredRApp on Windows is r-gui
-	var preferredRApp = sv.prefs.getString("svRApplicationId",
-		isWin? "r-gui" : "r-terminal");
-
-	var env = ["koId=" + sv.prefs.getString("sciviews.client.id",
-		"SciViewsK"),
+	var env = [
+		"koId=" + sv.prefs.getString("sciviews.client.id", "SciViewsK"),
 		"koHost=localhost",
 		"koActivate=FALSE",
 		"Rinitdir=" + sv.prefs.getString("sciviews.session.dir", "~"),
@@ -449,7 +442,6 @@
         //sv.log.debug("Controllers has been set.");
 }
 
-
 // Code below is for extra items in editor context menu (eg. "run selection"),
 // Commented out because it is still buggy
 //	function editorContextMenuOnShowing (event) {

Modified: komodo/SciViews-K/content/js/pref-R.js
===================================================================
--- komodo/SciViews-K/content/js/pref-R.js	2010-10-04 21:03:42 UTC (rev 329)
+++ komodo/SciViews-K/content/js/pref-R.js	2010-10-04 21:35:03 UTC (rev 330)
@@ -220,7 +220,7 @@
     document.getElementById("svRDefaultInterpreter").value);
     prefset.setStringPref("svRApplication",
     document.getElementById('svRApplication')
-    .selectedItem.getAttribute("value"));
+		.selectedItem.getAttribute("value"));
 	prefset.setStringPref("svRApplicationId",
     document.getElementById('svRApplication').selectedItem.id);
 
@@ -238,6 +238,7 @@
         "SciViews-K preferences");
         return(false);
     }
+	prefset.setStringPref("svRCommand", PrefR_updateCommandLine(false));
 
 	//The 'r.csv.*.arg' prefs are replaced by simply 'r.csv.dec'/'r.csv.sep'
 	//as they escaped strings anyway (e.g. string "\\t" not tab character)
@@ -256,13 +257,6 @@
         prefset.setStringPref("sciviews.server.socket", serverPort);
         sv.socket.serverStart();
     }
-
-
-
-
-
-
-
 	return(true);
 }