mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-12 11:45:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,231 Commits 20 Branches 1,036 Tags 78 MiB
bcc2ce15a3
Commit Graph

2585 Commits

Author SHA1 Message Date
Jonathan Frederic
c20859a5c9 Add button widget 2014-01-16 10:56:00 +00:00
Jonathan Frederic
e619bdf313 Flex box system improvements 
Now to set a container to vbox or hbox you call .vbox() or .hbox()
 2014-01-16 10:56:00 +00:00
Jonathan Frederic
2ad57f6f9d Attempt 1, HBox and VBox implementation. 2014-01-16 10:56:00 +00:00
Jonathan Frederic
65a6000919 Renamed widget python classes to avoid name stomping 2014-01-16 10:56:00 +00:00
Jonathan Frederic
f3a3e7c9cb Added int widget 2014-01-16 10:56:00 +00:00
Jonathan Frederic
26f31184e7 Added float widget 2014-01-16 10:56:00 +00:00
Jonathan Frederic
55a6e00788 Added missing import reference for bool widget 2014-01-16 10:56:00 +00:00
Jonathan Frederic
40a923c5b6 Lots of updates to widget(s) js 
Use require.js (again)
Allow IntTextView and FloatTextView to be used without min/max
 2014-01-16 10:55:59 +00:00
Jonathan Frederic
f7d96da585 Added toggle button view 2014-01-16 10:55:59 +00:00
Jonathan Frederic
03a832753e Changed js loading, 
Use require.js in js files
Assume 1 on 1 mapping of py file names to js file names
 2014-01-16 10:55:59 +00:00
Jonathan Frederic
f037f2bd42 Cleaned up python widget classes 2014-01-16 10:55:59 +00:00
Jonathan Frederic
7490cab0c1 Added boolean widget 2014-01-16 10:55:59 +00:00
Jonathan Frederic
1b5f3d3203 Added togglebutton group 2014-01-16 10:55:59 +00:00
Jonathan Frederic
990303f3eb Removed require.js scheme since it forces async event driven model, 
this model does not work with the comm/widget communication model.
We need to be able to load the dependencies before we send the
show() message to the widget manager.  Otherwise a race condition
will exist where the widget manager may recieve the show message
before the dependencies have been loaded (happened almost every time).
 2014-01-16 10:55:59 +00:00
Jonathan Frederic
4b55ef61b0 Added system that allows js to be required by widgets. 2014-01-16 10:55:59 +00:00
Jonathan Frederic
c9d604d54e Use require.js where possible. 2014-01-16 10:55:59 +00:00
Jonathan Frederic
42e32d2ff8 Renamed widget js files since they contain views too now. 2014-01-16 10:55:59 +00:00
Jonathan Frederic
3d72269dcc Use require.js to load widget manager. 2014-01-16 10:55:59 +00:00
Jonathan Frederic
e88950238f Moved view code into model files 2014-01-16 10:55:59 +00:00
Jonathan Frederic
bc0363039e Removed funky javascript loading mechanism 
NOTE: UNTIL THE NEW JS LOADING MECHANISM IS IN PLACE, THIS BREAKS THE SYSTEM
 2014-01-16 10:55:59 +00:00
Jonathan Frederic
f939713d14 Updated imports to reflect class move 2014-01-16 10:55:59 +00:00
Jonathan Frederic
fffaba9a7b Moved widget js into static 2014-01-16 10:55:58 +00:00
Jonathan Frederic
5cac3fceae Fixed glitch when widgetarea wouldn't get completely hidden upon re-execution 2014-01-16 10:55:58 +00:00
Jonathan Frederic
cb7eb8354f Fixed bug where properties couldn't be set on model till model was shown 2014-01-16 10:55:58 +00:00
Jonathan Frederic
dde9018ab3 Register init_widget_js 
and remove cls parameter
 2014-01-16 10:55:58 +00:00
Jonathan Frederic
119104f2e8 Register new widgets in IPython.html.widgets namespace 2014-01-16 10:55:58 +00:00
Jonathan Frederic
a0d03e30f0 Add string widget 2014-01-16 10:55:58 +00:00
Jonathan Frederic
1b6062beee Add selection widget 2014-01-16 10:55:58 +00:00
Jonathan Frederic
c9a44b86cb Add container widget 2014-01-16 10:55:58 +00:00
Jonathan Frederic
e3d6467809 Don't try to load widget.js automatically since it was moved 
load using init_widget_js
 2014-01-16 10:55:58 +00:00
Jonathan Frederic
4dc1155c7e Handle widget hide/show logic 
also only create a widget manager once
 2014-01-16 10:55:58 +00:00
Jonathan Frederic
4d2bcf02e5 Adjust weidget box so widget_subarea aligns with codecell 2014-01-16 10:55:58 +00:00
Jonathan Frederic
686dd7aea0 Clear widgets upon cell execute 2014-01-16 10:55:58 +00:00
Jonathan Frederic
2b3d6ab2e4 Added clear widget area button 2014-01-16 10:55:57 +00:00
Jonathan Frederic
3a16f603b9 Updates to widget.py 
Added global init js function
Moved init comm logic to show function
 2014-01-16 10:55:57 +00:00
Jonathan Frederic
f32f450d0f Moved widget.js into widget code directory 2014-01-16 10:55:57 +00:00
Jonathan Frederic
22dcf3aa68 Basic display logic 
s/show/_repr_...
Added code to display Javascript in frontend.
 2014-01-16 10:55:57 +00:00
Jonathan Frederic
3e36dd0c92 Added apply method to base model. 
Allows model to propogate changes to all views except
for the one specified.
 2014-01-16 10:55:57 +00:00
Brian E. Granger
50213707ea Fixing infinite recursion. 2014-01-16 10:55:57 +00:00
Jonathan Frederic
a576a0c8a1 Fixed widget.js and notebook.js so IPython.notebook.widget_manager is created. 2014-01-16 10:55:57 +00:00
Jonathan Frederic
0230fa8c09 Added widjet.js 
Other commit actually added notebook.js changes
 2014-01-16 10:55:57 +00:00
Jonathan Frederic
918d57050a Added widget.py 2014-01-16 10:55:57 +00:00
Jonathan Frederic
5d9dcfc39e Added widget.js 2014-01-16 10:55:57 +00:00
Jonathan Frederic
a1f6d0fe02 Added dependencies to page.html template and added widget.js to notebook.html 2014-01-16 10:55:57 +00:00
Jonathan Frederic
43b857619e Add widget subarea style 2014-01-16 10:55:57 +00:00
Jonathan Frederic
ac874a4bf6 Added widget output area 2014-01-16 10:55:57 +00:00
Matthias Bussonnier
0ec0534ce9 Merge pull request #4796 from minrk/update-components 
update components

closes #4765
 2014-01-16 09:53:07 -08:00
Min RK
dc2fd94d4e Merge pull request #4799 from ivanov/minor-jstest 
minor js test fix
 2014-01-13 18:54:55 -08:00
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