mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-06 11:35:24 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,217 Commits 19 Branches 1,023 Tags 78 MiB
b43f24da5f
Commit Graph

904 Commits

Author SHA1 Message Date
Fernando Perez
d81197455a Merge pull request #1849 from stefanv/octavemagic 
Add %%octave, %octave, %octave_pull and %octave_push magics to facilitate interaction with Octave via oct2py.  This is similar in spirit to the R magic extension.
 2012-06-12 23:52:57 -07:00
MinRK
ace8c72c9c increase duration of save messages 
and write permanent 'failed' message to the save status area on failed save.
 2012-06-12 20:36:29 -07:00
MinRK
ec50e94524 restore collapsed state for cells 
js refactor removed this, but did not document the change.  This restores it, but it would be fine to revert this and update the docs instead.
 2012-06-12 19:26:55 -07:00
MinRK
362feaa295 add empty metadata field on cells/worksheets 
These are unused for now, but will allow adding data to the notebook without a full version bump.
 2012-06-12 19:12:36 -07:00
MinRK
d73b4e428e don't warn in iptest if deathrow/quarantine are missing 2012-06-11 14:21:18 -07:00
MinRK
33b0144b8f skip autoreload tests 2012-06-11 12:37:04 -07:00
mcelrath
160fbcdcbc Alternative solution: silently apply some CSS instead of a dialog box. 2012-06-11 09:53:31 -07:00
MinRK
15689fb664 add toggle output scroll to quickhelp 2012-06-10 21:28:20 -07:00
MinRK
ed4ee44a21 add ^M-O for toggling output scroll 2012-06-10 21:26:17 -07:00
MinRK
5f0b08145e dblclick/double click for humans 2012-06-10 20:00:10 -07:00
MinRK
5b0d89a9ad use glob for bad exclusion warning 
rather than explicit check for .py

closes #1896
 2012-06-10 18:05:54 -07:00
Fernando Perez
4251457d9a Merge pull request #1870 from minrk/captureio 
New `%%capture` cell magic captures stdout/err while running a cell.

Uses `capture_output()` context manager, moved to utils.io from IPython.parallel testing utilities, where it originated.

The caputre objects can be printed as a string, case in which they display the captured stdout, which is also available as `.stdout`.  The captured stderr, if any, is in a `.stderr` attribute.  A `.show()` method can be called to quickly print both, with stderr being correctly printed to the sys.stderr stream (so the notebook displays it with red highlighting).

closes #1863
 2012-06-10 18:01:41 -07:00
Fernando Perez
3fde837087 Merge pull request #1867 from mcelrath/menu_borders 
Fix 1px margin bouncing of selected menu item.

This fixes the margin of the active menu item to zero, so now the text doesn't shift around, even if you use larger fonts.

To reproduce the original error, zoom your notebook (ctrl-mousewheel, or ctrl-+ in most browsers) and try the menu.
 2012-06-10 16:36:38 -07:00
Fernando Perez
b683e0fadc Merge pull request #1889 from invisibleroads/patch-3 
Reconnect when the websocket connection closes unexpectedly.

Closes #1577.
 2012-06-10 16:33:25 -07:00
Fernando Perez
60f6f874fb Merge pull request #1886 from tkf/fix-notebook-rename 
Fix a bug in renaming notebook caused by keeping a stale reference to old names.
 2012-06-10 16:31:20 -07:00
Fernando Perez
1c905f74af Merge pull request #1883 from mcelrath/mono_cursor_offset 
Fix vertical offset due to bold/italics, and bad browser fonts.

Adds a dialog warning users when a problematic monospaced font is detected, so they can change their configuration.
 2012-06-10 13:42:52 -07:00
mcelrath
5b2b7ed604 Add bad font detection, and a dialog informing the user. 2012-06-10 11:32:40 -07:00
Stefan van der Walt
c9a0f40dc5 Skip octavemagic tests if oct2py is unavailable. 2012-06-09 20:18:31 -07:00
MinRK
dd3e610882 third attempt at scrolled long output 
click/double-click on prompt area for toggling scroll/collapse
 2012-06-08 15:22:11 -07:00
Roy Hyunjin Han
ec3babe3ff Reconnect when the websocket connection closes unexpectedly 2012-06-09 04:05:58 +08:00
Takafumi Arakaki
635846dc74 Fix a bug in renaming notebook 
There was a bug in NotebookManager.save_notebook_object.
Here is how to reproduce:

0. Make sure you don't have Untitled0.
1. Open new notebook Untitled0.
2. Rename it to something else.
3. Copy Untitled0.ipynb to the notebook dir from somewhere.
   (Do not use notebook UI.)
4. New copied Untitled0 cannot be opened.
   The renamed notebook is opened when tried.
   Indeed, accessing to http://localhost:XXXX/notebooks shows
   duplicated notebook_id.

The problem was that NotebookManager.rev_mapping keeps old notebook
name after renaming.
 2012-06-08 20:26:46 +02:00
Brian E. Granger
cdfc81c542 Merge pull request #1829 from Carreau/notebook_cellmagic_completion 
[notebook] don't care about leading prct in completion
 2012-06-08 11:13:15 -07:00
Min RK
d4727ba7cf fix missing comma 2012-06-08 11:06:52 -07:00
Brian Granger
d27a86ef77 Removing resizable SVGs from output. 2012-06-08 11:02:39 -07:00
Brian Granger
41dbc82478 SVG images are now resizable in Chrome+FF. 2012-06-08 11:02:39 -07:00
Brian Granger
fc040f5da2 Resolving conflict in utils.js. 2012-06-08 11:02:15 -07:00
Brian Granger
4b1eec0eaf Make svg, jpeg and png images resizable in notebook. 2012-06-08 11:01:05 -07:00
Min RK
ebd26651ab Merge pull request #1674 from mdboom/notebook-carriage-return 
HTML Notebook handles carriage-return special character
 2012-06-08 10:57:06 -07:00
Michael Droettboom
8c053ac40c Fix rebase. 2012-06-08 09:36:16 -04:00
Matthias BUSSONNIER
d4e9858fef pep8 2012-06-08 12:12:20 +02:00
Matthias BUSSONNIER
cc62fc63f9 don't care about lleading prct in completion 
mainly to avoid weird shared start with cell magics
 2012-06-08 12:10:37 +02:00
mcelrath
a1604deeee Fix vertical offset due to bold/italics, and bad browser fonts. 2012-06-07 22:30:58 -07:00
Fernando Perez
9ebbfe3f22 Merge pull request #1841 from Carreau/deduplicate_completion 
[notebook] deduplicate completion results

remove context completions that are duplicates from introspection
completion

fixes #1840
 2012-06-07 20:12:43 -07:00
Michael Droettboom
b471db22e0 Fix the "test for nothing was streamed" so it doesn't add empty elements -- but only when there wasn't already something there. 2012-06-07 19:09:26 -04:00
Michael Droettboom
a9453360a9 Handle carriage return characters ("\r") in HTML notebook output. 
Conflicts:

	IPython/frontend/html/notebook/static/js/utils.js
 2012-06-07 19:08:54 -04:00
Michael Droettboom
f058068f53 Fix carriage-return handling regular expression so it doesn't treat "\r\n" as "\r". 2012-06-07 19:05:30 -04:00
MinRK
07f0eca24f move capture_output util from parallel tests to utils.io 2012-06-06 16:35:06 -07:00
Min RK
f75497d930 Merge pull request #1815 from ellisonbg/nbsavebug 
Make : invalid in filenames in the Notebook JS code.

This only prevents : in the filenames on the JavaScript side of things. Handling this on the server side will be a separate issue that is related to other open issue. I will update those to reflect this. 

closes #1781
 2012-06-06 16:24:04 -07:00
mcelrath
5612d07fea Fix 1px margin bouncing of selected menu item. 2012-06-06 12:33:21 -07:00
Matthias BUSSONNIER
567b6bbcd2 don't need to check for leading dot 2012-06-05 09:37:35 +02:00
Fernando Perez
1bf5ead0e8 Merge pull request #1856 from mcelrath/master 
Fix 1px jumping of cells and menus in Notebook as selection moves around, by careful creation of 1px outlines.
 2012-06-04 18:01:08 -07:00
mcelrath
faa214178e Fix 1px jumping of cells and menus in Notebook. 2012-06-04 17:31:51 -07:00
Fernando Perez
22c5d421fc Merge pull request #1780 from jonathan-taylor/rmagic_extension 
Rmagic extension to use R (the statistical package) seamlessly from IPython.

The rmagic extension allows R inline code as well as cell level magics. An example notebook is provided in docs/examples/notebooks/rmagic_extension.ipynb to demonstrate its usage.

Main points:

1) Allows capture of plots to R via inline png plots (like --pylab inline)

2) Allows capture of R's stdout() connection to the notebook

3) Allows simple push/pull for array data to/from R (via rpy2) with copy only on push to R -- this seems necessary.
 2012-06-04 16:25:44 -07:00
Matthias BUSSONNIER
795cb7bb21 bracket on same line 2012-06-04 12:00:23 +02:00
MinRK
91180c0511 add InlineBackend to ConsoleApp class list 
so it will be included in generated config files / help-all output
 2012-06-03 21:40:01 -07:00
Matthias BUSSONNIER
9cfdea0d1c take care of token starting by '.' (dot) 2012-06-03 13:18:43 +02:00
Matthias BUSSONNIER
d74a58b3c8 [notebook] deduplicate completion results 
remove context completion that are duplicates from introspection
completion
fixes #1840
 2012-06-03 11:36:07 +02:00
Brian Granger
fc096c7232 Using IPython.utils.keycodes in the nb rename dialog. 2012-05-31 21:57:42 -07:00
Brian Granger
010c35b130 Making the input text area watch for ENTER in nb renames. 2012-05-31 21:55:33 -07:00
Brian Granger
4dc94e29c8 ENTER submits the rename notebook dialog. 2012-05-31 21:55:33 -07:00
Brian E. Granger
c57fa1cd6a Merge pull request #1820 from bfroehle/port_selection_2 
NotebookApp: Make the number of ports to retry user configurable.
 2012-05-31 21:47:35 -07:00
Brian E. Granger
81aa090ce0 Merge pull request #1816 from ellisonbg/nbname 
Always use filename as the notebook name.
 2012-05-31 21:34:49 -07:00
Fernando Perez
d12819830f Merge pull request #1813 from takluyver/nose-assert-methods 
Add assert_in method to nose for Python 2.6.

Closes #1775.
 2012-05-31 18:02:32 -07:00
Bradley M. Froehle
7c1091c299 exit if server cannot start (instead of ugly traceback) 2012-05-31 16:24:22 -07:00
Bradley M. Froehle
6faad7f38f NotebookApp: Make the number of ports to retry user configurable. 
Closes gh-1750.
 2012-05-31 15:06:33 -07:00
Brian Granger
09da6cb8af Always use filename as the notebook name. 2012-05-31 14:01:36 -07:00
Brian Granger
4c2e42e9db Make : invalid in filenames in the Notebook JS code. 2012-05-31 13:33:34 -07:00
Brian Granger
4c31453ea7 Making Notebook.set_dirty an event so CodeCell can set it. 
This allows code outside notebook.js to set the dirty flag, but
doesn't require that code depend on notebook.js.
 2012-05-31 13:29:22 -07:00
Fernando Perez
41665e4483 Ensure that no tests are attempted if numpy or rpy2 are not present. 
This prevents both importing of the extension itself and running of
the test suite.
 2012-05-31 13:25:03 -07:00
Brian Granger
9826a17ae2 Removing cell from execute callbacks in kernel.js. 2012-05-31 13:24:10 -07:00
Thomas Kluyver
b47a0cfda9 Add assert_in method to nose for Python 2.6 2012-05-31 21:23:29 +01:00
Brian Granger
e817bfdaeb Update directview.ipynb & allowing no-callbacks in kernel.execute. 2012-05-31 13:08:34 -07:00
Brian Granger
9c94c996ae Removing extra call to Kernel.stop_channels. 2012-05-31 13:08:33 -07:00
Takafumi Arakaki
0df931d69a Reduce repeated code regarding restarting events 2012-05-31 13:08:33 -07:00
Takafumi Arakaki
db5393c618 Clear window title when kernel is restarted 
When kernel is died and restarted, or restarted while it is in the
busy state, message "(Busy)" on the window title is not updated.  This
problem is fixed by updating document title when restarting.
 2012-05-31 13:08:32 -07:00
Matthias BUSSONNIER
9f319f6da9 click on close cancell stick 2012-05-31 13:08:32 -07:00
Matthias BUSSONNIER
366cba5916 retab tab to space 2012-05-31 13:08:32 -07:00
Matthias BUSSONNIER
523ae0c377 fix tooltip keep focus on wrong cell 
check that the cell the tooltip is giving focus back is the currently
selected cell
 2012-05-31 13:08:31 -07:00
Matthias BUSSONNIER
a083ce93c1 remove less.css 2012-05-31 13:08:31 -07:00
Matthias BUSSONNIER
c06f5b1718 rename show/hide methods to avoid jQuery conflict. 
it seem that show and hide methods fron tooltip where collinding with
jquery, sometime blocking the notebook.

Move from css fadeIn/Out to jQuery fade In/Out, and replace
addRemoveClass by fadeIn/fadeOut
 2012-05-31 13:08:30 -07:00
Matthias BUSSONNIER
3dc363e1e8 Revert "remove less file" 
This reverts commit 8af188d9be201f0dfaea86746705f5ff8b13ab50.
 2012-05-31 13:08:30 -07:00
Brian Granger
8bd7e041cf Misc fixes to the code cell and output area. 2012-05-31 13:08:30 -07:00
Brian Granger
32343c5973 Fixed order of notebook loading and kernel starting. 
For security reasons, the kernel should not be started until
after the notebook content is completely loaded and on the page.
This prevents people from creating notebooks that run nasty code
on the users machine at load time.

In order to implement this, we had to create a CodeCell.set_kernel
method that allows the kernel attribute of a CodeCell to be set
at a later time.  This also fixes some error messages we were
seeing related to the kernel's channels not being setup properly
when a send was attempted.
 2012-05-31 13:08:29 -07:00
Matthias BUSSONNIER
186c995041 rename context-hint to contexthint 2012-05-31 13:08:29 -07:00
Matthias BUSSONNIER
88befeb497 space after function keyword in context-hint 2012-05-31 13:08:29 -07:00
Matthias BUSSONNIER
b1e5e99bcd beautify context-hint.js 2012-05-31 13:08:28 -07:00
Matthias BUSSONNIER
129f114868 Uppercase constant keycode in utils.js 2012-05-31 13:08:28 -07:00
Matthias BUSSONNIER
f3ff31b75a remove CamelCasse methods from completer.js 2012-05-31 13:08:28 -07:00
Matthias BUSSONNIER
b2a04396d8 space before function keyword in js 2012-05-31 13:08:27 -07:00
Matthias BUSSONNIER
ea325c095b beautify completer.js 2012-05-31 13:08:27 -07:00
Matthias BUSSONNIER
0f34ca4346 beautify tooltip.js 2012-05-31 13:08:27 -07:00
Matthias BUSSONNIER
27be46264a remove less file 2012-05-31 13:08:27 -07:00
Matthias BUSSONNIER
8d5d2d2446 shrink less and css, typo in css 2012-05-31 13:08:26 -07:00
Matthias BUSSONNIER
d823325be4 make sticky time configurable 2012-05-31 13:08:26 -07:00
Matthias BUSSONNIER
7d069cd792 Notification + tooltip demo 
Use notification to quicky remind use of the tooltip

Use javascript in notebook to make a live demo in
01_notebook_introduction

tooltip docstring is remplaceid for the first use by a live tutorial
 2012-05-31 13:08:26 -07:00
Matthias BUSSONNIER
c804c036ec tooltip, pager bring pager 
execute xxxx? on behalf of the cell to bring the pager.
 2012-05-31 13:08:25 -07:00
Matthias BUSSONNIER
b1a9677cc0 fix less css 2012-05-31 13:08:25 -07:00
Matthias BUSSONNIER
370b723cb6 Revert "remove less CSS" 
This reverts commit 185c4ee21a4b658b55d313d1813a5bfeccaa20ef.
 2012-05-31 13:08:25 -07:00
Brian Granger
644b1f85ed Fixing bug in prompt_area handling of OutputArea. 2012-05-31 13:08:25 -07:00
Brian Granger
6268e0a4b1 Removing stale code in CodeCell. 2012-05-31 13:08:24 -07:00
Brian Granger
fd4ecebc9d Adding missing var statements in notebook.js. 2012-05-31 13:08:24 -07:00
Brian Granger
b274a86b8c Adding back kernel dead choice for user. 
I had removed the choice for the user to not restart a dead kernel
but we are using that elsewhere. Eventually we may not give them
a choice, but for now we will use that model.
 2012-05-31 13:08:23 -07:00
Brian Granger
ae2bea23fa Refactored CodeCell to use new OutputArea object for output. 
This allows us to have a reusable object for formatting output.
Javascript widgets can now use this to format output as well.
 2012-05-31 13:08:23 -07:00
Brian Granger
f306423c7e Adding options to Kernel.execute with a default of silent=true. 2012-05-31 13:08:22 -07:00
Matthias BUSSONNIER
2976d8ea10 fix multiple busy in title bar due to completer 2012-05-31 13:08:22 -07:00
Matthias BUSSONNIER
7301213124 simplify completer logic as we don't exec on behalf of cell 
also skip making kernel completion request if kernel is busy
 2012-05-31 13:08:22 -07:00
Matthias BUSSONNIER
e8632ff7ee clean code, show clock if tooltip is 'sticky' 
- make code more concise
- remove trailing space
- add some animation
- put some function/variable private with leading underscore
 2012-05-31 13:08:22 -07:00
Matthias BUSSONNIER
8f33caf0dc make tooltip tabs fonction configurable 2012-05-31 13:08:21 -07:00
Matthias BUSSONNIER
bf5cf0dd3a move some tooltip logic away from codecell.js 2012-05-31 13:08:21 -07:00
Matthias BUSSONNIER
98303f5f7d Clean code, retab and minor fix 
remove unused code, convert some tab to space, and correct some
semicolon according to jslint

jlint fixes
 2012-05-31 13:08:21 -07:00