Skip to content

Commit

Permalink
more cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Carlos Scheidegger committed Mar 20, 2013
1 parent a0b76c0 commit 4d5e607
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 42 deletions.
14 changes: 0 additions & 14 deletions htdocs/js/rcloud_bundle.js
Expand Up @@ -753,8 +753,6 @@ RClient = {
}); });
}, },
// FIXME: I couldn't get this.post_* to work from here so this is just to avoid the error ... it's nonsensical, obviously // FIXME: I couldn't get this.post_* to work from here so this is just to avoid the error ... it's nonsensical, obviously
"img.url.update": function(v) { return v; },
"img.url.final": function(v) { return v; },
"dev.new": function(v) { return ""; }, "dev.new": function(v) { return ""; },
"dev.close": function(v) { return ""; }, "dev.close": function(v) { return ""; },
"internal_cmd": function(v) { return ""; }, "internal_cmd": function(v) { return ""; },
Expand Down Expand Up @@ -790,18 +788,6 @@ RClient = {
if (cmds[cmd] === undefined) { if (cmds[cmd] === undefined) {
return this.post_error("Unknown command " + cmd); return this.post_error("Unknown command " + cmd);
} }
if (cmd == "img.url.update" || cmd == "img.url.final") {
throw "Who's doing this?";
// FIXME: this is a bad hack storing in the window - do something more reasonable ;)
// var ix = window.devImgIndex;
// if (!ix) window.devImgIndex = ix = 1;
// if (cmd == "img.url.final") window.devImgIndex++;
// var div = document.getElementById("dimg"+ix);
// if (div) // FIXME: we may want to move the div down as well -- maybe just remove the old one and add a new one?
// div.innerHTML = "<img src="+data.value[1].value[0]+">";
// else
// this.post_div("<div id=dimg"+ix+"><img src="+data.value[1].value[0]+"></div>");
}
return cmds[cmd].call(this, data.json()[1]); return cmds[cmd].call(this, data.json()[1]);
}, },


Expand Down
2 changes: 1 addition & 1 deletion htdocs/js/rcloud_bundle.min.js

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions htdocs/main.html
Expand Up @@ -42,8 +42,6 @@
"HTML-CSS": { minScaleAdjust: 125 } }); "HTML-CSS": { minScaleAdjust: 125 } });
</script> </script>


<!-- <script type="text/javascript" src="test_cookies.js"></script> -->

<script type="text/javascript" src="js/rcloud_bundle.js"></script> <script type="text/javascript" src="js/rcloud_bundle.js"></script>


<script type="text/javascript" src="main.js"></script> <script type="text/javascript" src="main.js"></script>
Expand Down
9 changes: 0 additions & 9 deletions htdocs/test_cookies.html

This file was deleted.

10 changes: 0 additions & 10 deletions htdocs/test_cookies.js

This file was deleted.

6 changes: 0 additions & 6 deletions rcloud.support/R/rcloud.support.R
Expand Up @@ -91,10 +91,6 @@ rcloud.record.cell.execution <- function(user, json.string) {
# everything that is common to all connections # everything that is common to all connections
# the per-connection setup is done by start.rcloud() # the per-connection setup is done by start.rcloud()
configure.rcloud <- function () { configure.rcloud <- function () {
## FIXME: the defaults should be configurable
.session$WSdev.width <- 300
.session$WSdev.height <- 300

## it is useful to have access to the root of your ## it is useful to have access to the root of your
## installation from R scripts -- for RCloud this is *mandatory* ## installation from R scripts -- for RCloud this is *mandatory*
.rc.conf$root <- Sys.getenv("ROOT") .rc.conf$root <- Sys.getenv("ROOT")
Expand Down Expand Up @@ -149,8 +145,6 @@ configure.rcloud <- function () {
if (exists("CairoFonts")) if (exists("CairoFonts"))
CairoFonts("Arial:style=Regular","Arial:style=Bold","Arial:style=Italic","Helvetica","Symbol") CairoFonts("Arial:style=Regular","Arial:style=Bold","Arial:style=Italic","Helvetica","Symbol")


options(device=WSdev)

## Load any data you want ## Load any data you want
.rc.conf$data.fn <- file.path(.rc.conf$configuration.root, "data.RData") .rc.conf$data.fn <- file.path(.rc.conf$configuration.root, "data.RData")
if (isTRUE(file.exists(.rc.conf$data.fn))) { if (isTRUE(file.exists(.rc.conf$data.fn))) {
Expand Down

0 comments on commit 4d5e607

Please sign in to comment.