Commit Graph

1281 Commits

Author SHA1 Message Date
Matthias BUSSONNIER
3160d67763 css typo 2012-07-31 13:14:46 +02:00
Bussonnier Matthias
99ccdf15d9 Merge pull request #2199 from Carreau/safe-js
Wrap published javascript in try/catch to show a error if it raises.
2012-07-28 04:09:38 -07:00
Matthias BUSSONNIER
33edba2c9a warn on error when user display javascript 2012-07-28 13:02:56 +02:00
Bussonnier Matthias
5c394dab71 Merge pull request #2212 from minrk/protectjs
catch errors in markdown javascript
2012-07-28 03:59:03 -07:00
Bussonnier Matthias
4529b2b05c Merge pull request #2190 from Carreau/update_code_mirror
Update code mirror 2.22 to 2.32

Update codemirror to the latest stable.
And upadte our code here and there to smooth the changes. 
Just the fact that there is a new tab system that was inserting tabs instead of 4 space, we just have to pass a new line when creating e new CM instance.

Should also fix #1464.

See Readme-IPython to see what patch to apply when updating next.
2012-07-28 03:41:00 -07:00
MinRK
4a3e1f3185 make markdown error handling js-specific 2012-07-27 19:57:47 -07:00
Matthias BUSSONNIER
a5bc24d8b2 select correct behavior for backspace in codecell 2012-07-27 22:38:56 +02:00
Matthias BUSSONNIER
2f6117bd46 Force tabs to space in CM 2012-07-27 22:38:56 +02:00
Matthias BUSSONNIER
308c4994d3 patch SingleOperator in CodeMirror2 2012-07-27 22:38:56 +02:00
Matthias BUSSONNIER
370943fff0 update CodeMirror2 to 2.32 2012-07-27 22:38:55 +02:00
MinRK
7e7c2fe9e5 catch js errors when rendering markdown cells 2012-07-27 13:36:44 -07:00
Bussonnier Matthias
9a52bdc18b Merge pull request #2175 from minrk/staticfile
add FileFindHandler for Notebook static files

  * The static file handler now uses a search path, instead of a single dir.

    This allows easier customization of available js/css,
    and provides a place for extra files to go for extending the notebook.


  * An empty custom.js / custom.css are added to the templates for trivial 
    custom user styling/scripting.

    The search only happens once, and the result is cached after the first.

  * A few methods are pulled from tornado 2.2-dev verbatim to have tornado 2.1 compatibility.

  * mathjax is now installed by default in profile.
2012-07-26 00:36:28 -07:00
Fernando Perez
3e180cb217 Merge pull request #2202 from bfroehle/iptest_IPYTHONDIR
Create a unique & temporary IPYTHONDIR for each testing group.

Following #2148 (unification of Windows / Unix code in iptest), and
in progress towards #1880 (Add parallelism to iptest & test_pr), this
pull request launches each iptest test group with a unique & temporary
`IPYTHONDIR`.

This has two benefits:
* Insulates the test suite from any craziness in your own configuration.
  (Try adding `import sys; sys.exit()` to your config file...).
* Allows multiple test suites to be launched in parallel without the worry of
  conflicts.
2012-07-25 18:44:41 -07:00
Bradley M. Froehle
35493dabd2 Create a unique & temporary IPYTHONDIR for each testing group. 2012-07-25 18:35:55 -07:00
Fernando Perez
ac1d401872 Merge pull request #2204 from bfroehle/fix_os_kill_win32
Work around lack of os.kill in win32.

Fixes iptest brokenness on win32 caused by my having merged #2148 too hastily.  Extra credit to @bfroehle and @minrk for working/testing the fix quickly.
2012-07-25 18:08:46 -07:00
Bradley M. Froehle
f2b9bc6016 Print warning message if process could not be killed. 2012-07-25 17:43:50 -07:00
Bradley M. Froehle
4bf8f834ca Work around lack of os.kill in win32.
Fixes iptest brokenness caused by #2148.
2012-07-25 15:04:54 -07:00
Fernando Perez
b3fcc75530 Merge pull request #2148 from bfroehle/no_more_os_system
win32 iptest: Use subprocess.Popen() instead of os.system().

The call to `os.system` in `iptest` prevents us from easily setting `$IPYTHONDIR` to a temporary directory.  In theory we should be able to use `subprocess.Popen` instead of `os.system` in Windows. This would unify the code structure and make it easy to pass in a different environment.

Note that Python < 2.7 does not have `os.kill`.  I've attempted to work around this by using `ctypes` to kill any living processes.
2012-07-24 21:40:32 -07:00
MinRK
4ee5129dad log local mathjax path 2012-07-23 11:59:48 -07:00
MinRK
aa9f5d9e80 add missing methods in FindFileHandler for tornado < 2.2.0 compat 2012-07-23 11:58:28 -07:00
Min RK
8373a99eb8 Merge pull request #2183 from jasongrout/trigger-kernel
Include the kernel object in the event object passed to kernel events
2012-07-21 09:50:15 -07:00
Jason Grout
e9324378e8 Include the kernel object in the event object passed to kernel events 2012-07-21 07:08:49 -05:00
Min RK
d6c3b3f814 Merge pull request #2182 from minrk/fix2159
handle undefined param in notebooklist

PR #2159 introduced a bug preventing the notebook list from drawing
2012-07-20 23:40:23 -07:00
MinRK
d77e9a4eba handle undefined param in notebooklist
PR #2159 introduced a bug preventing the notebook list from drawing
2012-07-21 01:38:47 -05:00
Min RK
8b34dfc405 Merge pull request #2051 from jasongrout/stream-metadata
Add a metadata attribute to messages

subheader is removed in favor of the new metadata dict,
reducing degeneracy.
2012-07-20 22:16:50 -07:00
MinRK
25aa3003ac add metadata to javascript msg spec implementation 2012-07-20 22:16:12 -05:00
Jason Grout
7095b9eb87 Make top-level metadata dictionary not optional. 2012-07-20 22:16:08 -05:00
Jason Grout
4ad79b41f6 Set default metadata for javascript callback 2012-07-20 22:14:33 -05:00
Jason Grout
9436f33035 Add an optional metadata attribute to all messages and add a session-level default metadata attribute. 2012-07-20 22:14:32 -05:00
Jason Grout
009e5583cf Pass the header of output and clear_output messages to javascript callbacks 2012-07-20 22:14:32 -05:00
Bussonnier Matthias
260a107d80 Merge pull request #2159 from Carreau/dashbord_refresh_on_error
show message on notebook list if server is unreachable
2012-07-20 16:46:02 -07:00
Matthias BUSSONNIER
cf2cfa45e1 pep8 2012-07-20 18:39:07 -05:00
MinRK
3c6c38289a handle single static path in FileFindHandler 2012-07-20 15:06:48 -05:00
Bussonnier Matthias
70ffbd609b Merge pull request #2090 from v923z/master
Notebook, Alt-enter : execute cell, append codecell below.
2012-07-20 10:32:10 -07:00
MinRK
2891a0a8ca add empty custom.js/css
With FileFindHandler, these will be useful for small user overrides of css/js.
2012-07-20 12:04:39 -05:00
MinRK
8aa6fb3fc3 fix missing quotation mark in notebook.html 2012-07-20 12:02:05 -05:00
MinRK
96158cff3f use FileFindHandler in NotebookApp
adds NotebookApp.extra_static_paths configurable for extending the search path.

The default is to include profile/static.
2012-07-20 12:01:49 -05:00
MinRK
a627f3d955 add FileFindHandler for serving static files from a search path 2012-07-20 11:59:52 -05:00
v923z
eaf53eeb9a Replaced .toJSON().input by .get_text() 2012-07-20 16:07:23 +03:00
v923z
0e4dbb2880 Added checking for emptiness of cell below. 2012-07-20 15:03:33 +03:00
v923z
eb47f0eb8d Added some comments to the Alt-Enter code part, and also added checking whether a new code cell is really needed. 2012-07-19 22:35:38 +03:00
Bussonnier Matthias
3730b710e6 Merge pull request #2158 from Carreau/tuple_params
Remove tuple auto unpack in function definition 

This is for 2to3 compatibility., and also deactivate the application of 
the corresponding 2to3 fix when using python3 and setup.py.
2012-07-18 05:43:06 -07:00
Thomas Kluyver
70f8062ce8 Merge pull request #2089 from bfroehle/unittest_deprecation_warnings
Fix unittest DeprecationWarnings
2012-07-18 02:31:52 -07:00
Matthias BUSSONNIER
268fdd80c3 remove tuple_params fix from 2to3 in setup.py 2012-07-17 23:48:20 -05:00
Matthias BUSSONNIER
23cf94023d show message on notebook list if server is unreachable
usefull when :
server goes down, you don't notice it on dashboard

restart on https, cookies is unvalid, autoreload don't work
2012-07-17 23:21:07 -05:00
Bradley M. Froehle
cfc86faefb s/nt.assert_equals/nt.assert_equal/ 2012-07-17 08:30:53 -07:00
Bradley M. Froehle
05a30fa6d4 s/assertEquals/assertEqual/ 2012-07-17 08:30:53 -07:00
Thomas Kluyver
aaf911c5e5 Merge pull request #2140 from bfroehle/2to3_has_key
2to3: Apply `has_key` fixer.
2012-07-17 04:58:13 -07:00
Bradley M. Froehle
71b4bf797c win32 iptest: Use subprocess.Popen() instead of os.system(). 2012-07-16 17:29:02 -07:00
Bradley M. Froehle
9ff624471d Skip has_key when running 2to3. 2012-07-15 09:55:56 -07:00