← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/webapp/console/overlay.html

  • Committer: David Coles
  • Date: 2010-08-30 03:26:13 UTC
  • Revision ID: coles.david@gmail.com-20100830032613-d14vng0jkelniu3l
python-console: Fix globals broken with new JSON library.

simplejson always returns unicode strings. cJSON would return ordinary strings 
if possible. cPickle.loads() only accepts strings. At present we use pickle 
version 0 so they should all works as ASCII strings. Higher versions of pickle 
are not plain ASCII and are likely to break this and so this should be fixed 
at some point.

Also replaced unconditional exception with one that catches Pickle errors. Not 
sure the best way to report failures of these functions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/console/overlay.html
3
3
      xmlns:py="http://genshi.edgewall.org/" py:strip="">
4
4
      
5
5
  <body py:strip="">
6
 
    <div id="console_body" py:attrs="start_body_attrs">
7
 
      <h1 py:if="not windowpane">Python Console</h1>
8
 
      <div id="console_heading" py:if="windowpane">Python Console
 
6
    <div class="console_body" id="console_body" py:attrs="start_body_attrs">
 
7
      <div class="console_heading" id="console_heading" py:if="windowpane">Python Console
9
8
        <span class="console_button minimize">
10
9
          <a onclick="console_minimize()"
11
10
              title="Minimize the Python console">
13
12
          </a>
14
13
        </span>
15
14
      </div>
16
 
      <div id="console_body2">
17
 
        <pre id="console_output" class='outputMsg'></pre>
18
 
        <div id="console_input">
 
15
      <div class="console_body2">
 
16
        <pre class="console_output outputMsg" id="console_output"></pre>
 
17
        <div class="console_input">
19
18
          <div>
20
19
            <div>
21
 
              <label id="console_prompt">&gt;&gt;&gt; </label>
 
20
              <label class="console_prompt" id="console_prompt">&gt;&gt;&gt; </label>
22
21
            </div>
23
 
            <div id="console_inputCell">
24
 
              <input id="console_inputText" type="text" 
 
22
            <div class="console_inputCell">
 
23
              <input class="console_inputText" id="console_inputText" type="text" 
25
24
                  onkeydown="return catch_input(event.keyCode)" />
26
25
            </div>
27
26
            <div>