mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2024-12-27 04:20:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,176 Commits 19 Branches 1,023 Tags 78 MiB
cecac5867f
Commit Graph

2537 Commits

Author SHA1 Message Date
Paul Ivanov
03eedd52e2 minor js test fix 2014-01-13 18:53:54 -08:00
Thomas Kluyver
3673bc6305 Merge pull request #4788 from minrk/warn-pylab-notebook 
warn when notebook is started in pylab mode
 2014-01-13 17:04:20 -08:00
Min RK
ec77ad18b7 Merge pull request #4772 from takluyver/nbserver-files 
Notebook server info files
 2014-01-13 16:57:48 -08:00
Thomas Kluyver
fcb21fed17 Make names in JSON more consistent as per @ellisonbg's suggestion. 2014-01-13 16:25:39 -08:00
MinRK
5e3d463dca marked now adds ids to header tags 2014-01-13 16:25:13 -08:00
Thomas Kluyver
e932429762 Command line entry point to list running notebook servers 2014-01-13 16:22:43 -08:00
MinRK
063bfa9688 we don't bundle lessc anymore, remove its vestiges 2014-01-13 16:17:50 -08:00
MinRK
a485df87eb mention that ipython notebook --pylab will be disabled 2014-01-13 15:19:13 -08:00
MinRK
4d03df98fc b64 unicode literals for images 2014-01-12 21:20:39 -08:00
MinRK
38dabf49ad test append_output with invalid data 2014-01-12 14:43:15 -08:00
MinRK
829495c6b9 validate output types in append_output 
validates from files, as well as from kernels
 2014-01-12 14:34:18 -08:00
MinRK
19e4b74678 revert output area changes 2014-01-12 14:34:03 -08:00
MinRK
d6deaaaf1f protect javascript from invalid mime-type data 
everything is a string, if anything else is sent,
drop it so it doesn't show up in the notebook document.
 2014-01-12 14:24:16 -08:00
Paul Ivanov
5209e82a96 fix mathjax typesetting 2014-01-12 13:54:47 -08:00
Paul Ivanov
5423613ef3 add test for custom mimetypes 2014-01-12 13:54:47 -08:00
Paul Ivanov
8ab7162c07 added svg to/fromJSON tests 2014-01-12 13:54:47 -08:00
Paul Ivanov
dfb21543c6 added jpeg mimetype tests 2014-01-12 13:54:47 -08:00
Paul Ivanov
6976eac897 adding png mimetype tests 2014-01-12 13:54:47 -08:00
Paul Ivanov
9c32f78efe tests for HTML mimetype 2014-01-12 13:54:47 -08:00
Paul Ivanov
369220042a add test for latex to/fromJSON 2014-01-12 13:54:47 -08:00
Paul Ivanov
9be3013d31 refactor clearing and executing first cell in test 2014-01-12 13:54:47 -08:00
Paul Ivanov
ea8a7745d8 love javascript. 
it gives me many opportunities to be sarcastic in my commit messages
 2014-01-12 13:54:47 -08:00
Paul Ivanov
f93b47ac37 more refactoring - test to/fromJSON for mimetypes 2014-01-12 13:54:46 -08:00
Paul Ivanov
744178de32 minor formatting 2014-01-12 13:54:46 -08:00
Paul Ivanov
11eabc2e40 refactor tests with more concise assertion checks 2014-01-12 13:54:46 -08:00
Paul Ivanov
ebe9c20ca2 fix small bug in dropping metadata 2014-01-12 13:54:46 -08:00
Paul Ivanov
0e72314379 minor cleanup 2014-01-12 13:54:46 -08:00
Paul Ivanov
a001003d67 remove dynamic keyword, handling it in fromJSON 
After discussing this in person with @minrk, we decided instead of
passing this parameter around and special-casing javascript, it's easier
to just remove javascript from the display_order for the duration of
fromJSON, since that's the only place where dynamic was set to False,
and then put it back in at the end of the fromJSON call.
 2014-01-12 13:54:46 -08:00
Paul Ivanov
f147e50545 hardcode type into the mimetype specific functions 2014-01-12 13:54:46 -08:00
Paul Ivanov
e094fca4ef dispatch on mime type for append methods 2014-01-12 13:54:46 -08:00
Paul Ivanov
a6be6e9821 love them semicolons 2014-01-12 13:54:46 -08:00
Paul Ivanov
b4c9df8ecc fix stream saving 2014-01-12 13:54:46 -08:00
Paul Ivanov
25a4bb0c26 plain text and json display_data and pyout tests 2014-01-12 13:54:46 -08:00
Paul Ivanov
07823deda3 minor formatting 2014-01-12 13:54:46 -08:00
Paul Ivanov
a7ca25a602 fix toJSON/fromJSON renaming 2014-01-12 13:54:46 -08:00
Paul Ivanov
7c262155f7 add (failling) roundtrip test case 2014-01-12 13:54:46 -08:00
Paul Ivanov
e0aab910da minimal notebook rountrip test 2014-01-12 13:54:46 -08:00
Paul Ivanov
d4ab0f4466 unify key renaming for to/from json short keys 2014-01-12 13:54:46 -08:00
Paul Ivanov
ee9ecc5548 convert back to short names when writing to JSON 2014-01-12 13:54:46 -08:00
Paul Ivanov
6089570dec stop using convert_to_mime_types 
the in-memory representation and the messsage spec now all use mimetype
names for the JSON keys.
 2014-01-12 13:54:46 -08:00
Paul Ivanov
d26ce5ffa2 fix png inlining 2014-01-12 13:54:46 -08:00
Paul Ivanov
7aaa3a9203 convert short names like 'png' to mimetype names 2014-01-12 13:54:46 -08:00
Paul Ivanov
b415af3dba align with current master 2014-01-12 13:54:46 -08:00
Paul Ivanov
ef60127e6e use mime type in memory 2014-01-12 13:54:46 -08:00
Paul Ivanov
509f88534c distinguish display_svg() and display() tests 2014-01-12 13:54:46 -08:00
Paul Ivanov
e8aa99b603 check mime-keyed metadata first, then top level 2014-01-12 13:54:46 -08:00
MinRK
d9e57a5b6a passthrough unrecognized output mime-types 
preserves the bad mime-type -> short name conversion for supported types,
but allows passthrough for additional mime-types,
so at least data is not discarded.
 2014-01-12 13:52:13 -08:00
Paul Ivanov
93831f0dfc clear output in-between test runs 2014-01-12 13:52:13 -08:00
Paul Ivanov
459b5ea7ad use non-mimetype-keyed metadata in the outputarea 2014-01-12 13:52:13 -08:00
Paul Ivanov
2e72ab3cd6 make output code not drop non-mimetype-keyed json 2014-01-12 13:52:13 -08:00
Paul Ivanov
5fefd65d72 added test for display() calls with metadata 
this test is currently failing
 2014-01-12 13:52:13 -08:00
MinRK
db4c814812 warn when notebook is started in pylab mode 
because it is always a bad idea
 2014-01-12 11:43:02 -08:00
Min RK
f7388dd2ea Merge pull request #4785 from SylvainCorlay/master 
Replacing a for-in loop by an index loop on an array
 2014-01-11 15:24:48 -08:00
Sylvain Corlay
a053ba2419 Replacing a for-in loop by an index loop on an array, to avoid enumerating inherited properties 2014-01-11 19:46:07 +00:00
Brian E. Granger
d8db72564a Merge pull request #3605 from ellisonbg/newux 
Modal UI - a whole new world of fun....its like vim, but not!
 2014-01-10 16:10:25 -08:00
Brian E. Granger
06d40366aa Work on shortcuts and examples notebook. 2014-01-10 12:48:56 -08:00
Brian E. Granger
a324259c49 Minor changes to KB handling. 2014-01-10 12:38:19 -08:00
Brian E. Granger
c0fadb245d Fixing design of quickhelp. 2014-01-10 09:32:16 -08:00
Brian E. Granger
506ffe5adf Adding sorting and better layout to the KB shortcuts. 2014-01-09 16:54:26 -08:00
Brian E. Granger
5e706935e1 Semicolon cleanup. 2014-01-09 13:10:31 -08:00
Thomas Kluyver
c0f346c4e3 Merge pull request #4735 from minrk/better-errors 
add some HTML error pages
 2014-01-09 13:03:31 -08:00
Brian E. Granger
c54f48278d canonicalize -> normalize in keyboard manager. 2014-01-09 12:59:17 -08:00
Brian E. Granger
c888f9d3e4 Cleaning up console log messages. 2014-01-09 12:58:16 -08:00
Brian E. Granger
5fcb7d21dd Fixing delete_count logic. 2014-01-09 12:53:55 -08:00
Brian E. Granger
418f3e46f2 Reordering conditional. 2014-01-09 12:32:38 -08:00
Brian E. Granger
201217d847 Renaming execute methods. 2014-01-09 12:30:06 -08:00
Brian E. Granger
8d73a3ac05 Fixing more JS tests. 2014-01-08 21:02:12 -08:00
Thomas Kluyver
15f94953bb Fix writing server info files on Python 2 2014-01-08 17:56:12 -08:00
Brian E. Granger
d83b4ece91 Removing old method on RawCell - just use the base class. 2014-01-08 17:17:39 -08:00
Brian E. Granger
33097b0c1f Adding missig altKey test to CodeCell. 2014-01-08 17:13:57 -08:00
Brian E. Granger
6dcdb26fa4 Fixing a few keyboard codes and shortcuts. 2014-01-08 17:09:16 -08:00
Brian E. Granger
77fd1ff6e5 Focus cells after they are inserted. 2014-01-08 16:58:42 -08:00
Brian E. Granger
cc765e29d9 select next cell in insert cell below in menubar to match kb. 2014-01-08 16:53:00 -08:00
Brian E. Granger
11493ca042 Don't always call focus_cell in Cell.command_mode. 
The focus_cell should only be called when a user enters
command mode by pressing ESC. Calling focus_cell was causing
jumps when command mode was entered through a mouse click.
 2014-01-08 16:45:28 -08:00
Paul Ivanov
b99fce964e Merge pull request #4773 from takluyver/nbtests-dont-wait-forever 
Don't wait forever for notebook server to launch/die for tests
 2014-01-08 16:36:16 -08:00
Paul Ivanov
e3053b0a58 Clarify waiting for notebook server to launch 2014-01-08 15:49:11 -08:00
MinRK
5c9dfd9b58 remove unnecessary conversion of newline to br tag 
relic from when I was using div, not pre
 2014-01-08 15:03:28 -08:00
Thomas Kluyver
9363dd1087 Simplify waiting for notebook server to die. 2014-01-08 14:31:48 -08:00
Thomas Kluyver
b0afd36408 Don't wait forever for notebook server to launch/die for tests 
Should turn occasional hangs into straightforward errors.
 2014-01-08 14:08:45 -08:00
Brian E. Granger
9c2762a516 Adding back doc in Keyboard Shortcut. 2014-01-08 13:37:35 -08:00
Min RK
6ccbf1455f Merge pull request #4727 from takluyver/nbconvert-template-magic 
Remove Nbconvert template loading magic based on module name.

A little more explicit now, plus a few traitlets cleaned up.
 2014-01-08 13:12:36 -08:00
Thomas Kluyver
3fc26c1886 Test for writing and removing server info files 2014-01-08 13:02:50 -08:00
Thomas Kluyver
71902059d3 Write notebook server info file in security directory 2014-01-08 13:02:36 -08:00
Brian E. Granger
b244518871 Special handling for CM's vim keyboard mapping. 2014-01-08 12:35:24 -08:00
Brian E. Granger
89c410d19d Cell splitting merging works with RawCell now. 2014-01-08 10:39:00 -08:00
Brian E. Granger
6c7196a99e Cleanup of cell splitting. 2014-01-08 10:25:34 -08:00
Brian E. Granger
0e4c4887aa TextCell.unrender should not focus CM/select. 2014-01-08 10:11:57 -08:00
Brian E. Granger
b3322fc2d5 Ongoing work on cell splitting. 2014-01-08 10:11:23 -08:00
Brian E. Granger
177fb9bb5d Fixing css class on cell related to selected, rendered, mode. 2014-01-07 16:08:22 -08:00
Brian E. Granger
142b9a4b95 shift-enter should doesn't create a new cell at the bottom. 2014-01-07 15:57:51 -08:00
Brian E. Granger
a07eabe7c5 Fix raw_input. 2014-01-07 15:21:22 -08:00
MinRK
b7563aec7c be more specific about unknown status codes 
per review
 2014-01-07 15:16:13 -08:00
MinRK
7ae363f6d1 turn missing dependencies in nbconvert to 500 errors 
pygments is the only such example at this time
 2014-01-07 15:15:57 -08:00
Brian E. Granger
1d9aa63500 Pressing d twice now deletes cell on first try. 2014-01-07 14:58:19 -08:00
Paul Ivanov
30df1c4546 Merge pull request #4766 from minrk/entry-points 
add `python -m` entry points for everything
 2014-01-07 14:55:16 -08:00
Brian E. Granger
47534d2a28 Updating help string for ctrl-enter and alt-enter. 2014-01-07 14:48:01 -08:00
Brian E. Granger
c841e006a3 Adding j/k for select next/prev. Faster than up/down. 2014-01-07 14:48:00 -08:00
Brian E. Granger
673dfe336e Fixing bugs and adding automatic KB shortcut help. 2014-01-07 14:48:00 -08:00
Brian E. Granger
1572df1c65 Like, OMG, keyboardmanager.js is a beast. 2014-01-07 14:48:00 -08:00
Brian E. Granger
b44d535329 HTML and JavaScript output KBM event handling. 2014-01-07 14:48:00 -08:00
Brian E. Granger
8cabefa32d Delete cell only if you press "d" twice in 1 second. 2014-01-07 14:42:37 -08:00
Brian E. Granger
06aa0d540d Using a more specific approach for managing CM focus. 
I used to try and enter command mode when a cell looses focus. The
problem with that is that focusing an output area would remain in
edit mode.

Now, I bind this logic to the code mirror blur event, so that
focusing the output area enters command mode.
 2014-01-07 14:42:37 -08:00
Brian E. Granger
8a8a03a4d3 Fixing delete/undelete logic. 2014-01-07 14:42:36 -08:00
Brian E. Granger
b2f8d17940 Changing a heading cell level should enter edit mode and set dirty 2014-01-07 14:42:36 -08:00
Brian E. Granger
18b2e54a52 Fixing bug in KeyboardManager.enable/disable. 2014-01-07 14:42:36 -08:00
Brian E. Granger
9a3783e2c4 Fixing select when inserting cell using menu. 2014-01-07 14:42:36 -08:00
Brian E. Granger
a2ffedb0ff Carefully manage rendered state in merge cell. 2014-01-07 14:42:36 -08:00
Brian E. Granger
761109e4b7 Add + for merge cell below and carefully manage split cell state. 2014-01-07 14:42:36 -08:00
Brian E. Granger
740b7aa21b Split cell keyboard shortcut wired up. Merge markdown adds 2nd \n. 2014-01-07 14:42:36 -08:00
Brian E. Granger
23b88a9a24 Moving a cell focuses it after the move. 
This way if you move a cell a long way, the noteobook div will
scroll with you.
 2014-01-07 14:42:35 -08:00
Brian E. Granger
71bc8d5cdd Adding missing enable/disable methods. 2014-01-07 14:42:35 -08:00
Brian E. Granger
b865c98567 Removing KBN null mode and replacing with enable/disable. 2014-01-07 14:42:35 -08:00
Brian E. Granger
0000e688d6 Code comments and minor fixes. 2014-01-07 14:42:35 -08:00
Brian E. Granger
c1166ea98a Lots of updates and changes. 
* Cleaning up the code mirror event handlers.
* Adding logic to prevent calling Notebook.command_mode on cell
  focusout.
* Fixing bugs.
 2014-01-07 14:42:35 -08:00
Brian E. Granger
caffba142e Adding keyboard manager logic. 
This is currently very broken.
 2014-01-07 14:42:35 -08:00
Brian E. Granger
c775800714 Removing manual focusing of notebook div. 2014-01-07 14:42:35 -08:00
Brian E. Granger
a37443710b Binding to notebook div not document. 2014-01-07 14:42:34 -08:00
Brian E. Granger
d137535431 Don't bind notebook keyboard events to $(document). 
Keyboard events were previously bound to $(document), which
caused problems with our command mode not allowing other
focused elements (dialogs, etc.) to manage their own keyboard
events. We now bind to the notebook element.
 2014-01-07 14:42:34 -08:00
Brian E. Granger
40977e545b Semi working version of basic dual mode UX. 
As of this point there are lots of things that don't work, but
most of the basic dual mode interactions do work fine.
 2014-01-07 14:42:34 -08:00
Brian E. Granger
2a530ff30d More work on the dual mode UX. 2014-01-07 14:42:34 -08:00
Brian E. Granger
54088a0105 Adding new logic to cells. 2014-01-07 14:42:34 -08:00
Brian E. Granger
2181a29be7 Starting work on select/focus logic. 2014-01-07 14:42:33 -08:00
MinRK
a94983e035 add python -m entry points for everything 2014-01-07 12:32:31 -08:00
MinRK
9865c4f02f whitelist alphanumeric characters for cookie_name 
should fix #4761
 2014-01-06 14:57:34 -08:00
Min RK
96c1af0ce4 Merge pull request #4715 from minrk/tornado-static-url 
restore use of tornado static_url in templates
 2013-12-31 10:58:09 -08:00
Matthias Bussonnier
880bcfc122 Merge pull request #4658 from stevefox/dev 
Bug fix for #4643: Regex object needs to be reset between calls in toolt...
 2013-12-29 08:05:18 -08:00
MinRK
668d221bb6 exclude html nbconvert tests if nbconvert is not importable 2013-12-23 12:45:59 -08:00
MinRK
1044fda774 skip nbconvert html tests without pandoc 2013-12-23 12:41:59 -08:00
MinRK
91d3326923 allow notebook to start without nbconvert 
catches import / key errors and turns them into proper http errors
 2013-12-23 12:39:27 -08:00
MinRK
21632ac564 add error css 2013-12-22 17:58:27 -08:00
MinRK
84df1a5e26 add error page templates 2013-12-22 17:58:15 -08:00
MinRK
f9dc2f7b7e catch pandoc failures in nbconvert handlers 2013-12-22 17:46:53 -08:00
MinRK
b62da23660 render custom HTML for error pages 2013-12-22 17:46:41 -08:00
Thomas Kluyver
1dc80a609e Drop unused traitlet imports 2013-12-21 12:48:15 -08:00
Thomas Kluyver
4e7972bd64 Remove magic for loading templates from module names 2013-12-20 19:07:21 -08:00
Min RK
556627a637 Merge pull request #4656 from takluyver/nbconvert-service 
Nbconvert HTTP service
 2013-12-20 14:22:29 -08:00
Thomas Kluyver
147f33118e Extract output preprocessor only extracts specified formats 2013-12-19 17:14:24 -08:00
Thomas Kluyver
be6a5d32ea Serve nbconvert output as zip when it has multiple files 2013-12-19 16:07:27 -08:00
Thomas Kluyver
57642b3847 Move notebook URL fragment regexen into IPython.html.base.handlers 2013-12-19 13:01:00 -08:00
Thomas Kluyver
75109fa2f3 Pass config into nbconvert exporters 2013-12-19 12:35:19 -08:00
Min RK
8be6c4b617 Merge pull request #4575 from minrk/encode_paths 
make sure to encode URL components for API requests
 2013-12-19 09:49:16 -08:00
MinRK
fd0e9e865c don't raise 404 in get_absolute_path 
raise in validate_absolute_path, where it belongs
 2013-12-18 14:18:09 -08:00
MinRK
15780ad055 restore use of tornado static_url 
instead of jinja macro that doesn't write hashes

closes #4714
 2013-12-18 14:17:35 -08:00
Steve Fox
9681bdd177 Tabs converted to spaces for #4643 2013-12-17 21:06:09 -06:00
MinRK
a73f00f62a test save_notebook with escaped name 2013-12-16 14:29:36 -08:00
MinRK
da2f38c24e uniformity in ajax error handler arguments 
send arguments on failed events
 2013-12-16 12:50:51 -08:00
MinRK
5d02c111bb actually remove irunner 
and mkdoctests, which was the only user of it
 2013-12-16 11:21:46 -08:00
Thomas Kluyver
eb680ddaa6 Fix notebook tests w/ new stream capturing API. 2013-12-13 15:05:58 -08:00
Thomas Kluyver
9da24dda50 Download as always starts downloads in new window/tab 
This is a slightly worse user experience if it succeeds, because the new
tab flashes up before closing again, but it will let us display an
informative error page if it fails, without navigating the user away
from the interactive notebook view.
 2013-12-13 14:46:51 -08:00
Thomas Kluyver
30e8939a27 Separate listing nbconvert exporters to /api/nbconvert 2013-12-13 14:46:51 -08:00