merge

Author: williamstein

src/sage/server/notebook/cell.py

@@ -275,9 +275,6 @@ def set_changed_input_text(self, new_text):
 
     def set_output_text(self, output, html, sage=None):
         output = output.replace('\r','')
-        i = output.find(worksheet.SAGE_VARS)
-        if i != -1:
-            output = output[:i]
         if len(output) > MAX_OUTPUT:
             if not self.computing():
                 file = "%s/full_output.txt"%self.directory()

src/sage/server/notebook/css.py

@@ -893,7 +893,8 @@ def css(color='default'):
    font-size:12pt;
    font-family:arial, monospace;
    color:#bbbbbb;
-   background-color: #cccccc;
+   border-left:4px solid #aaffaa;
+   /* background-color: #eeeeee; */
    text-align:left;
 }
 

src/sage/server/notebook/js.py

@@ -1524,11 +1524,6 @@ def notebook_lib():
     return false;
 }
 
-function set_variable_list(variables) {
-    var varlist = get_element('variable_list');
-    varlist.innerHTML = variables;
-}
-
 function set_object_list(objects) {
     var objlist = get_element('object_list');
     objlist.innerHTML = objects;
@@ -1633,7 +1628,6 @@ def notebook_lib():
             set_input_text(id, new_cell_input);
         }
 
-        set_variable_list(variable_list);
         set_object_list(object_list);
         set_attached_files_list(attached_files_list);
     }
@@ -1940,7 +1934,6 @@ def notebook_lib():
     var link = get_element("restart_sage");
     link.className = "restart_sage";
     link.innerHTML = "Restart";
-    set_variable_list('');
     sync_active_cell_list();
 }
 

src/sage/server/notebook/notebook.py

@@ -617,7 +617,7 @@ def object_list_html(self):
         s = []
         a = '<a href="/%s.sobj" class="object_name">\n'
         for name in self.objects():
-            s.append(a%name + name + '&nbsp;'*(m-len(name)) + '</a>\n')
+            s.append(a%name + name + '</a>\n')  # '&nbsp;'*(m-len(name)) +
         return '<br>\n'.join(s)
 
     def defaults(self):
@@ -1054,12 +1054,14 @@ def _html_body(self, worksheet_id, show_debug=False, worksheet_authorized=False)
         body += '     <span class="plusminus" id="object_list_hider">[-]</span>'
         body += '     Saved Objects</div>\n'
         body += '  <div class="object_list" id="object_list">%s</div>\n'%self.object_list_html()
-        body += '<div class="fivepix"></div>\n'
-        body += '  <div class="variables_topbar" onClick="toggle_menu(\'variable_list\');">'
-        body += '     <span class="plusminus" id="variable_list_hider">[-]</span>'
-        body += '     Variables</div>\n'
-        body += '  <div class="variable_list" id="variable_list">%s</div>\n'%\
-                worksheet.variables_html()
+
+        #body += '<div class="fivepix"></div>\n'
+        #body += '  <div class="variables_topbar" onClick="toggle_menu(\'variable_list\');">'
+        #body += '     <span class="plusminus" id="variable_list_hider">[-]</span>'
+        #body += '     Variables</div>\n'
+        #body += '  <div class="variable_list" id="variable_list">%s</div>\n'%\
+        #        worksheet.variables_html()
+
         body += '<div class="fivepix"></div>\n'
         body += '  <div class="attached_topbar" onClick="toggle_menu(\'attached_list\');">'
         body += '     <span class="plusminus" id="attached_list_hider">[-]</span>'
@@ -1443,7 +1445,9 @@ def format_completions_as_html(self, cell_id, completions):
        onMouseOver='this.focus(); select_replacement(%s,%s);'
     >%s</a>
    </li>"""%(cell_id, i, j, cell_id, row[j], i,j,
-             row[j] + '&nbsp;'*(column_width[j]-len(row[j])) )
+             row[j])
+             #row[j] + '&nbsp;'*(column_width[j]-len(row[j])) )
+
                 lists[j].append(cell)
 
         grid = "<ul class='completion_menu_one'>"

src/sage/server/notebook/server.py

@@ -344,8 +344,7 @@ def cell_update(self):
         continously request the evaluation of this function
         to serve two purposes:
         1) To see if the long calculation is done, or
-        2) To interupt the long running calculation.
-
+        2) To interrupt the long running calculation.
         """
         C = self.get_postvars()
         worksheet_id = C['worksheet_id']

src/sage/server/notebook/worksheet.py

@@ -47,7 +47,6 @@
 SAGE_BEGIN=SC+'b'
 SAGE_END=SC+'e'
 SAGE_ERROR=SC+'r'
-SAGE_VARS=SC+'v'
 
 
 _a_sage = None
@@ -61,7 +60,6 @@ def init_sage_prestart():
     cmd = 'from sage.all import *;'
     cmd += 'from sage.all_notebook import *;'
     cmd += 'import sage.server.support as _support_; '
-    #cmd += '__SAGENB__globals = set(globals().keys()); '  # only needed for SAGE_VAR functionality
     E.sendline(cmd)
 
 def one_prestarted_sage():
@@ -577,11 +575,6 @@ def start_next_comp(self):
         if C.time() and not C.introspect():
             input += 'print "CPU time: %.2f s,  Wall time: %.2f s"%(cputime(__SAGE_t__), walltime(__SAGE_w__))\n'
 
-        ## TODO: Disabled since it isn't working anyways, and it
-        ## should be off if left panel is disabled.
-        ## If this is enabled, also enable SAGENB__globals at the top of this file.
-        #if not C.introspect():
-        #    input += 'print "\\n\\n%s'%SAGE_VARS + '=%s"%_support_.variables(True)'
 
         input = self.synchronize(input)
         # Unfortunately, this has to go here at the beginning of the file until Python 2.6,
@@ -738,16 +731,6 @@ def _process_output(self, s):
             i = s.rfind('>>>')
             if i >= 0:
                 return s[:i-1]
-        else:
-            i = s.rfind(SAGE_VARS)
-            if i != -1:
-                t = s[i+len(SAGE_VARS)+1:]
-                t = t.replace("<type '","").replace("<class '","").replace("'>","")
-                try:
-                    self.__variables = eval(t)
-                except:
-                    self.__variables = []
-                s = s[:i-1]
         return s
 
     def is_last_id_and_previous_is_nonempty(self, id):