hiding programs.

dyoo · Apr 12, 2013 · 97fc56a · 97fc56a
1 parent 06154d3
commit 97fc56a
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 8 deletions.
diff --git a/war-src/js/openEditor/editor.js b/war-src/js/openEditor/editor.js
@@ -489,7 +489,16 @@ var WeSchemeEditor;
  		"/openEditor?publicId=" +
  		    encodeURIComponent(aProgram.getPublicId()));
  	    that.filenameEntry.attr("value", aProgram.getTitle());
- 	    that.defn.setCode(aProgram.getSourceCode());
+
+            if (attrs.pid) {
+ 	        that.defn.setCode(aProgram.getSourceCode());
+            } else {
+                if (attrs.publicId && aProgram.isSourcePublic()) {
+ 	            that.defn.setCode(aProgram.getSourceCode());
+                } else {
+ 	            that.defn.setCode(";;  << Source code has not been shared >>");
+                }
+            }
 
 	    if (that.userName === aProgram.getOwner()) {
 		that._setIsOwner(true);

diff --git a/war-src/js/run.js b/war-src/js/run.js
@@ -3,8 +3,9 @@
 // interactive evaluation.
 
 goog.require("plt.wescheme.AjaxActions");
+goog.require("plt.wescheme.WeSchemeProperties");
 goog.require("plt.wescheme.makeDynamicModuleLoader");
-
+goog.require("plt.wescheme.RoundRobin");
 goog.provide("plt.wescheme.runner");
 
 (function() {
@@ -96,6 +97,32 @@ goog.provide("plt.wescheme.runner");
     };
 
 
+    // Configures the evaluator to use round-robin compilation between
+    // a set of servers.  Compilation will also fall back to other
+    // servers under network failure.
+    var initializeRoundRobinCompilation = function(evaluator, after) {
+        var that = this;
+        // Initializes the evaluator to use round-robin compilation, given a list of
+        // servers.
+        var compilation_servers = plt.wescheme.WeSchemeProperties.compilation_servers.split(/\s+/);
+        plt.wescheme.RoundRobin.initialize(
+            compilation_servers,
+            function() {
+                evaluator.setCompileProgram(
+                    plt.wescheme.RoundRobin.roundRobinCompiler);
+                after();
+            },
+            function() {
+                // Under this situation, all compilation servers are inaccessible.
+                evaluator.setCompileProgram(plt.wescheme.RoundRobin.roundRobinCompiler);
+                alert("WeScheme appears to be busy or unavailable at this time." +
+                      "  Please try again later.");
+                after();
+            });
+    };
+
+
+
 
     function init(compilationServerUrl, publicId) { 
         var runner = 
@@ -146,10 +173,16 @@ goog.provide("plt.wescheme.runner");
             if (programCode) {
 	        runner.runCompiledCode(programCode, permissions);
             } else  {
+
+
                 ///
                 // FIXME: add call to queue/retrieve a server-side compilation here.
                 ///
-	        runner.runSourceCode(title, sourceCode, permissions);
+                // Only do this if we have no other choice.
+                initializeRoundRobinCompilation(runner.evaluator,
+                                                function() {
+	                                            runner.runSourceCode(title, sourceCode, permissions);
+                                                });
             }
         };
         new plt.wescheme.AjaxActions().loadProject(

diff --git a/war-src/js/sharingdialog.js b/war-src/js/sharingdialog.js
@@ -91,11 +91,6 @@ goog.require("plt.wescheme.WeSchemeIntentBus");
 
                                    // Quietly ignore errMessage.
                                    // We'll deal with it during Run time.
-                                   try {
-                                       if (console.log && errMessage) {
-                                           console.log(errMessage);
-                                       }
-                                   } catch(e) {}
                                    //
                                    // // Add error message content if something weird happened during the build.
                                    // if (errMessage !== false) {

diff --git a/war/run.jsp b/war/run.jsp
@@ -28,6 +28,10 @@
 
 <script src="/js/jquery/jquery-1.3.2-min.js" type="text/javascript"></script>
 <script src="/editor/jquery.createdomnodes-min.js" type="text/javascript"></script>
+<script src="/js/easyXDM/easyXDM-min.js" type="text/javascript"></script>
+<script type="text/javascript">
+    easyXDM.DomHelper.requiresJSON("/js/easyXDM/json2-min.js");
+</script>
 <script src="/js/mzscheme-vm/support-min.js" type="text/javascript"></script>
 <script src="/js/mzscheme-vm/evaluator-min.js" type="text/javascript"></script>
 <script src="/js/loadScript-min.js" type="text/javascript"></script>