slight jswidget tweaks

convexengineering · Jan 23, 2015 · 753c9c4 · 753c9c4
1 parent 5b90d95
commit 753c9c4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/docs/source/ipynb/Box/Box.rst b/docs/source/ipynb/Box/Box.rst
@@ -555,8 +555,8 @@ notebook hosted by `nbviewer <http://nbviewer.ipython.org/>`__.
                 }
             });
 
-            MathJax.Hub.Typeset()
-            jswidget_0.ractive.onchange()
+        MathJax.Hub.Queue(["Typeset",MathJax.Hub,"jswiget_0_container"]);    
+	jswidget_0.ractive.onchange()
     })</script>
 
 

diff --git a/gpkit/interactive/widget.py b/gpkit/interactive/widget.py
@@ -69,7 +69,7 @@ def jswidget(gp, ractorfn, after, ranges):
         data_init += "%s: %i, " % (varname, (len(array)-1)/2)
         i += 1
 
-    evalarray = ["console.log('unfilled')"]*(np.prod(lengths))
+    evalarray = [""]*(np.prod(lengths))
 
     gp.sweep = {}
     gp.prewidget = gp.last
@@ -100,13 +100,12 @@ def jswidget(gp, ractorfn, after, ranges):
                   document.getElementById("$w-"+varname).innerText = Math.round(100*$w.ranges[varname][idx])/100
                   idxsum += idx*$w.bases[i]
               }
-              if ($w.storage[idxsum] === "console.log('unfilled')") {
+              if ($w.storage[idxsum] === "") {
                 r.infeasibilitywarning = "Infeasible problem"
               } else {
                 r.infeasibilitywarning = ""
                 eval($w.storage[idxsum] + $w.after)
               }
-              console.log(idxsum)
             }
         });
 

diff --git a/ipynb/Box/Box.rst b/ipynb/Box/Box.rst
@@ -1,3 +1,5 @@
+.. figure::  boxlogo.svg
+   :align:   left
 
 BOX
 ===
@@ -355,6 +357,7 @@ points you see.
     </svg>
     <div style="text-align: right; font-weight: 700; font-size: 2em;">{{infeasibilitywarning}}</div>
         </script>
+	<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
         <script>
         var r = {
     infeasibilitywarning: "",
@@ -552,8 +555,8 @@ notebook hosted by `nbviewer <http://nbviewer.ipython.org/>`__.
                 }
             });
 
-            MathJax.Hub.Typeset()
-            jswidget_0.ractive.onchange()
+        MathJax.Hub.Queue(["Typeset",MathJax.Hub,"jswiget_0_container"]);    
+	jswidget_0.ractive.onchange()
     })</script>