Changed name of ipython-http per ccordoba12's suggestion, fixed a cli…

…ck bug in messages, and added a favicon
jamesgao · Oct 27, 2010 · c02891f · c02891f
1 parent 9a75ab3
commit c02891f
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 4 deletions.
diff --git a/IPython/frontend/html/favicon.ico b/IPython/frontend/html/favicon.ico
diff --git a/IPython/frontend/html/js/ui.js b/IPython/frontend/html/js/ui.js
@@ -293,6 +293,7 @@ InputArea.prototype.activate = function () {
     this.update()
 
     var thisObj = this
+    this.text.click(function(e) { e.stopPropagation() })
     this.text.keydown(function (e) {thisObj.keyfunc(e)})
     this.text.keyup(function (e) {
         thisObj.msg.code = e.target.value

diff --git a/IPython/frontend/html/kernelmanager.py b/IPython/frontend/html/kernelmanager.py
@@ -46,7 +46,8 @@ def __contains__(self, client_id):
         return client_id in self.clients
 
     def heartbeat(self, client_id):
-        self.clients[client_id][0] = time.time()
+        if client_id in self.clients:
+            self.clients[client_id][0] = time.time()
 
     def send(self, msg_type, *args):
         if msg_type == "connect_request":

diff --git a/IPython/frontend/html/notebook.html b/IPython/frontend/html/notebook.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
     <head>
         <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 
-        <title>AJAX test</title>
+        <title>IPython session</title>
         <link rel="stylesheet" type="text/css" href="css/defaults.css" />
         <link rel="stylesheet" type="text/css" href="css/notebook.css" />
         <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js"></script>

diff --git a/IPython/scripts/ipython-webnb b/IPython/scripts/ipython-webnb
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from IPython.frontend.html.ipythonhttp import main
+
+main()
diff --git a/setup.py b/setup.py
@@ -209,7 +209,7 @@ def cleanup():
         'console_scripts': [
             'ipython = IPython.frontend.terminal.ipapp:launch_new_instance',
             'ipython-qtconsole = IPython.frontend.qt.console.ipythonqt:main',
-            'ipython-http = IPython.frontend.html.ipythonhttp:main',
+            'ipython-webnb = IPython.frontend.html.ipythonhttp:main',
             'pycolor = IPython.utils.PyColorize:main',
             'ipcontroller = IPython.kernel.ipcontrollerapp:launch_new_instance',
             'ipengine = IPython.kernel.ipengineapp:launch_new_instance',

diff --git a/setupbase.py b/setupbase.py
@@ -262,7 +262,7 @@ def find_scripts():
                pjoin(kernel_scripts, 'ipcluster'),
                pjoin(main_scripts, 'ipython'),
                pjoin(main_scripts, 'ipython-qtconsole'),
-               pjoin(main_scripts, 'ipython-http'),
+               pjoin(main_scripts, 'ipython-webnb'),
                pjoin(main_scripts, 'pycolor'),
                pjoin(main_scripts, 'irunner'),
                pjoin(main_scripts, 'iptest')