added some stents

pgbovine · pgbovine · commit ee2051253642 · 2014-05-28T11:00:09.000-04:00
diff --git a/v3/js/opt-frontend-common.js b/v3/js/opt-frontend-common.js
@@ -350,9 +350,13 @@ function updateAppDisplay(newAppMode) {
     appMode = 'display'; // canonicalize
 
     $("#pyInputPane").hide();
-    $("#pyOutputPane,#surveyHeader").show();
+    $("#pyOutputPane").show();
     $("#embedLinkDiv").show();
 
+    if (!(TogetherJS && TogetherJS.running)) {
+      $("#surveyHeader").show();
+    }
+
     doneExecutingCode();
 
     // do this AFTER making #pyOutputPane visible, or else
diff --git a/v3/js/opt-frontend.js b/v3/js/opt-frontend.js
@@ -67,6 +67,8 @@ var TogetherJSConfig_hubBase = "http://localhost:30035/"; // local
 // can imagine other learners joining into the original session as well
 var isTutor = false;
 
+var manuallySharingUrl = false; // TODO: refactor
+
 // TODO: consider deferred initialization later: "TogetherJS starts up
 // automatically as soon as it can, especially when continuing a
 // session. Sometimes this is problematic, like an application that
@@ -130,6 +132,12 @@ var TogetherJSConfig_getUserName = function () {
   }
 }
 
+// temporary stent:
+function startSharedSession() {
+  manuallySharingUrl = true; // icky global!
+  TogetherJS();
+}
+
 // get this app ready for TogetherJS
 function initTogetherJS() {
   if (isTutor) {
@@ -400,10 +408,9 @@ function initTogetherJS() {
 
       if (dat.helpAvailable) {
         $("#togetherJSHeader").fadeIn(750, redrawConnectors);
-        $("#surveyHeader").remove(); // kill this to save space
       }
       else {
-        if (TogetherJS.running) {
+        if (TogetherJS.running && !manuallySharingUrl) {
           alert("No more live tutors are available now.\nPlease check back later.");
           TogetherJS(); // toggle off
         }
@@ -427,6 +434,8 @@ function initTogetherJS() {
     console.log("TogetherJS ready");
     $("#togetherBtn").html("Stop live help session");
 
+    $("#surveyHeader").hide();
+
     $("#helpQueueUrls").fadeIn(500);
 
     $("#togetherJSHeader").fadeIn(750, redrawConnectors); // always show when ready
@@ -437,10 +446,15 @@ function initTogetherJS() {
       requestSync();
     }
     else {
-      // if you're a learner, request help when TogetherJS is activated
-      $.get(TogetherJSConfig_hubBase + 'request-help',
-            {url: TogetherJS.shareUrl(), id: TogetherJS.shareId()},
-            null /* don't use a callback; rely on SSE */);
+      if (manuallySharingUrl) {
+        console.log('URL TO SHARE', TogetherJS.shareUrl() + '&role=tutor&share=manual');
+      }
+      else {
+        // if you're a learner, request help when TogetherJS is activated
+        $.get(TogetherJSConfig_hubBase + 'request-help',
+              {url: TogetherJS.shareUrl(), id: TogetherJS.shareId()},
+              null /* don't use a callback; rely on SSE */);
+      }
 
       // also log the learner's initial state when they first requested help
       TogetherJS.send({type: "initialAppState", myAppState: getAppState()});
@@ -453,6 +467,10 @@ function initTogetherJS() {
   TogetherJS.on("close", function () {
     console.log("TogetherJS close");
 
+    if (appMode == "display") {
+      $("#surveyHeader").show();
+    }
+
     $("#helpQueueUrls").fadeOut(500);
 
     if (isTutor) {
@@ -578,6 +596,8 @@ $(document).ready(function() {
   var role = $.bbq.getState('role');
   isTutor = (role == 'tutor'); // GLOBAL
 
+  manuallySharingUrl = ($.bbq.getState('share') == 'manual'); // GLOBAL
+
   if (enableTogetherJS || isTutor) {
     initTogetherJS();
   }
diff --git a/v3/visualize.html b/v3/visualize.html
@@ -74,7 +74,7 @@
 <body>
 
 <!-- hide by default -->
-<div id="togetherJSHeader" style="margin-top: 12pt; margin-bottom: 10pt; display: none;">
+<div id="togetherJSHeader" style="margin-top: 12pt; margin-bottom: 12pt; display: none;">
 <button id="togetherBtn" type="button"
         style="color: #b80000; font-size: 12pt; padding: 6px;
         margin-right: 5pt;">Chat with a tutor (experimental)</button>
@@ -105,7 +105,7 @@
   // Version 2 of my display-mode survey, greatly simplified and deployed on 2014-05-24
  -->
 
-<div id="surveyHeader" style="margin-left: 70px; margin-bottom: 20pt; display: none;">
+<div id="surveyHeader" style="margin-left: 70px; margin-bottom: 10pt; display: none;">
   <div id="vizSurveyLabel" style="font-size: 8pt; color: #666; margin-bottom: 8pt;">
     <!-- 2014-05-25 tagline -->
     Help future learners by writing about what you are learning.
@@ -116,9 +116,9 @@
     something new from the visualization:
      -->
   </div>
-  <div style="font-size: 11pt; margin-bottom: 5pt; padding: 1pt;">
+  <div style="font-size: 10pt; margin-bottom: 5pt; padding: 1pt;">
     I just learned that
-    <input style="font-size: 11pt; padding: 1pt;" type="text" id="iJustLearnedInput" size="75"/>
+    <input style="font-size: 10pt; padding: 1pt;" type="text" id="iJustLearnedInput" size="75"/>
 
     <button id="iJustLearnedSubmission" type="button" style="font-size: 12pt;">Submit</button>
 
