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
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
Bradley M. Froehle
71b4bf797c
win32 iptest: Use subprocess.Popen() instead of os.system().
2012-07-16 17:29:02 -07:00
Bussonnier Matthias
0b44186d76
Merge pull request #2100 from Carreau/2to3fixes
...
python 2 and 3 compatibility without 2to3
apply some fixes :
- apply (deactivated in setup.py now)
- repr (deactivated in setup.py now)
- print (only in modules with print >>)
- raise (partially)
don't touch deathrow and quarantine.
2012-07-13 01:07:56 -07:00
Bussonnier Matthias
f38cf983c5
Merge pull request #2128 from Carreau/fixes-2120
...
open notebook copy in different tabs
2012-07-12 11:31:37 -07:00
Bussonnier Matthias
22e757f91d
Merge pull request #2073 from Carreau/fixes-1997
...
Allows both password and prefix for notebook at the same time.
2012-07-12 11:28:33 -07:00
Matthias BUSSONNIER
ca65de9fa2
open notebook copy in different tabs
...
returning false to allow modifier+click,
otherwise open 2 tabs at once.
2012-07-12 18:19:13 +02:00
Matthias BUSSONNIER
cc663005e4
dont use string as dict key, better redability
2012-07-12 16:37:21 +02:00
Bussonnier Matthias
4ec828c3db
Merge pull request #1993 from Carreau/printview
...
Update print-view css, and link the print css when trying to print a notebook without going through the print view.
2012-07-12 06:18:25 -07:00
Matthias BUSSONNIER
53d2a34336
correcty inherign the main toolbar
2012-07-11 16:30:26 +02:00
Matthias BUSSONNIER
ac04f1f437
load maintoolbar.js
2012-07-11 16:24:25 +02:00
Matthias BUSSONNIER
04d7e96aa8
add maintoolbar file
2012-07-11 16:20:22 +02:00
Matthias BUSSONNIER
2f28e4c4a1
Allow toolbar construction in js
...
Base of allowing a full toolbar construction in js without altering the
html template, and use it to construct our toolbar as example.
still need some work to be totally decoupled.
2012-07-11 16:07:53 +02:00
Matthias BUSSONNIER
011403a14f
use print function in module with print >>
2012-07-05 14:32:56 +02:00
Thomas Kluyver
b43f24da5f
Merge pull request #2064 from Carreau/pep-3110
...
Use new style "except Exception as e" syntax.
2012-07-04 13:50:45 -07:00
Zoltán Vörös
a2665ef341
Added new short key for cell execution
2012-07-03 20:55:02 +02:00
Fernando Perez
22071dfede
Skip notebook 'static' dir in test suite.
...
There's nothing there we should be running python tests on, and
occasionally python files may appear there that cause problems to nose
(e.g. mathjax ships a non-py3 valid conf.py that breaks py3 testing).
2012-07-01 13:14:47 -07:00
Matthias BUSSONNIER
3c743846a7
use full base_url in html and js
2012-07-01 21:59:09 +02:00
Matthias BUSSONNIER
51d715d00a
allows password and prefix for notebook
...
fixes #1997
2012-07-01 12:04:10 +02:00
Matthias BUSSONNIER
d85f075ad7
conform to pep 3110
...
brutally replace all `exeption <type>, <name>:` by
`exception <type> as <name> :`
`exception <type>, <type> :` should not be present anywhere in the code
anymore, or should be present with explicit tuple as
`exception (<type>, <type>)`
2012-06-30 18:34:56 +02:00
Matthias BUSSONNIER
df4192ae2a
Allow direct print of the notebook.
...
this improve the current css of the print page and add css to the
classical notebook with print as target to get a better print view ant
the ability to directly print a notebook without going through the print
view
2012-06-30 13:39:02 +02:00
MinRK
ae177a38cb
remove empty IPython.scripts test group
2012-06-30 01:00:56 -07:00
MinRK
722e90d50a
only add quotes around xunit-file on Windows
2012-06-28 11:23:13 -07:00
Min RK
360e40feca
Merge pull request #2047 from minrk/badFirefox
...
disable auto-scroll on mozilla
2012-06-27 19:57:41 -07:00
MinRK
422965cb3d
disable auto-scroll on mozilla
...
see #2041 for details
2012-06-27 15:07:07 -07:00
Jörgen Stenarson
9919f31095
2012-06-27 22:04:54 +02:00
Jörgen Stenarson
13b30ed3c4
2012-06-27 22:03:54 +02:00
MinRK
fae43d51d4
double auto-scroll threshold to 100 lines
...
it is more important that we not be surprising or annoying than we hide moderately long output.
2012-06-26 14:41:32 -07:00
MinRK
da17f26fbe
ignore shift keydown
...
prevented case-sensitive shortcuts if shift was pressed after control key
2012-06-26 11:41:53 -07:00
MinRK
ab2de249ed
disable ^C^C confirmation on Windows
2012-06-24 16:06:12 -07:00
Jonathan March
3edd709ab6
BUG: test runner fails in Windows if filenames contain spaces.
2012-06-23 19:55:07 -05:00
MinRK
603b7d9598
relax profile regex in notebook
...
Almost any text is a valid profile name, and the previous code
only included ascii alphanumeric strings.
closes #2011
2012-06-23 12:34:16 -07:00
Fernando Perez
6226f830a0
Merge pull request #2012 from mcelrath/mono_cursor_offset
...
Fix spurious appearance of the #fontarea when fonts don't have any problem; also remove loud dialog when problematic font is detected and simply adjust baseline. Users will have a slightly offset baseline for bold/italic highlights, but without any functional problems.
Fixes #2005 .
2012-06-22 22:54:35 -07:00
mcelrath
591a8eac23
Fix spurious appearance of #fontarea at end of document.
2012-06-22 21:22:59 -07:00
mcelrath
5a070dcd1a
Merge remote-tracking branch 'upstream/master' into mono_cursor_offset
2012-06-22 21:22:43 -07:00
Bradley M. Froehle
7ae0c9482f
notebook: Print a warning (but do not abort) if no webbrowser can be found.
...
Closes gh-2006.
2012-06-22 17:39:15 -07:00
Min RK
e306daad47
Merge pull request #1981 from tkf/kill-bg-processes
...
Clean BG processes created by %%script on kernel exit
* uses less forceful shutdown of kernels in the notebook, allowing atexit machinery to fire
* enables daemon BackgroundJobs
* cleanup %%script --bg subprocesses at shutdown
2012-06-20 13:35:56 -07:00
Min RK
87f3762e64
Merge pull request #1951 from minrk/nbdir
...
minor notebook startup/notebook-dir adjustments
* change inaccurate / distressing "Overwriting profile..." log message
* `ipython notebook path` results in setting notebook-dir if it's a dir,
rather than unconditionally setting file-to-run
* file-to-run overrides no-browser
* kernels start in the notebook dir, rather than the Server's cwd
* notebook dir is validated, and created if it doesn't exist (only if parent exists, like ~all other such things)
closes #1985
closes #1980
2012-06-20 13:06:30 -07:00
Bussonnier Matthias
f200bd0392
Merge pull request #1974 from Carreau/notebook-path-completion
...
Allow path completion on notebook.
add slash (/) for unix, backslash (\) and colon (:) for windows
as authorized characters in completions.
2012-06-19 23:42:32 -07:00
MinRK
d72d3f7e30
add tests for notebook_dir validation
2012-06-19 20:55:25 -07:00
MinRK
61bbd632ef
use shutdown_kernel instead of hard kill in notebook
2012-06-18 18:08:37 -07:00
MinRK
20f5c1b0cf
enable graceful restart of kernels in notebook
2012-06-18 17:52:37 -07:00
MinRK
0fba6618cd
create notebook-dir if it doesn't exist
...
closes #1980
2012-06-18 15:37:44 -07:00
Min RK
e97f84acd8
Merge pull request #1970 from minrk/resize
...
dblclick to restore resized images
2012-06-18 14:34:19 -07:00
Min RK
c797237e59
Merge pull request #1978 from kinverarity1/dot_truncation
...
Notebook names were truncating at the first period
2012-06-17 22:13:06 -07:00
Kent Inverarity
25ffbd89e0
change to minrk's suggestion from mailing list
2012-06-18 14:32:45 +09:30
Min RK
137f4cb441
Merge pull request #1825 from minrk/elide2
...
second attempt at scrolled long output
Some amount of CSS tweaking will probably want to be done before 0.13 final,
but this is good enough for beta.
closes #1553
2012-06-17 20:36:16 -07:00
Kent Inverarity
ef162c6d5c
Fix nb name truncating at first period in filename
2012-06-18 10:35:16 +09:30
Fernando Perez
f52a1f689c
Merge pull request #1934 from minrk/cellmd
...
Cell/Worksheet metadata
* metadata dicts are attached to cells and worksheets
* restores collapsed flag to the nbformat - this change happened in the refactor, and was undocumented, and possibly accidental. But we should either document it or fix it, and this includes a fix.
* adds a new field, `nbformat_minor`, used to denote minor bumps of the notebook format that expose new capabilities but don't prevent loading by older clients.
* Add a warning in Javascript if loading a multiworksheet notebook (which will exist in the future) as current JS code will only save the first.
closes #1915
2012-06-17 17:21:35 -07:00
MinRK
18bb591723
add future-warning about multiple notebooks
2012-06-17 16:26:10 -07:00
Matthias BUSSONNIER
0161c55594
Allow path completion on notebook.
...
add -(dash) /(slash) \(antislash for windows) : (colon) ~(tilde)
as part of words symbol for notebook completer to help for path
completion
Fixes #1969
2012-06-17 13:37:55 +02:00
MinRK
9963980f37
use chained delay for setting resizable images
2012-06-16 21:20:04 -07:00
MinRK
e04fd13086
dblclick to restore size of images
2012-06-15 14:51:08 -07:00
Min RK
643837dff3
Merge pull request #1965 from ivanov/fix-1678
...
fix for #1678 , undo no longer clears cells
With these changes, Ctrl-Z inside of codemirror cells will only undo up to the text that was in the cell when it was loaded from JSON.
closes #1678
2012-06-15 13:44:15 -07:00
Min RK
5a57dc5a1a
Merge pull request #1952 from minrk/wsclose
...
avoid duplicate "Websockets closed" dialog on ws close
2012-06-15 01:54:04 -07:00
Paul Ivanov
ad07d0cf44
fix for #1678 , undo no longer clears cells
...
I found another bug where switching the cell type causes the loss of all
undo history for that cell. With this commit, switching the cell type
simply resets the history
2012-06-14 17:36:34 -07:00
MinRK
c20b2e1056
slightly more subtle prompt overlay
2012-06-14 11:46:35 -07:00
MinRK
fa55ba2b43
fix margin typo on output prompt
2012-06-14 11:45:01 -07:00
MinRK
654fed95be
avoid double websocket-close message
2012-06-13 14:52:39 -07:00
MinRK
272b954d7b
use notebook-dir as cwd for kernels
2012-06-13 14:31:24 -07:00
MinRK
26a1cc7ee2
minor notebook-dir config adjustments
...
* `ipython Notebook /path/to/dir` sets notebook-dir to dir, not parent.
* add info message reporting notebook-dir
* file-to-run overrides no-browser
2012-06-13 13:48:56 -07:00
MinRK
afff38aabf
Change distressing / inaccurate debug message about overwriting profiles
2012-06-13 13:47:43 -07:00
MinRK
224f024257
add dialog when loading newer minor-version notebooks
2012-06-13 02:27:23 -07:00
Fernando Perez
00ea424ed9
Merge pull request #1940 from Carreau/completer-css-patch
...
Fix completer css on some Chrome versions (was causing completer to be drawn at the wrong size).
Fixes #1833
2012-06-13 00:55:08 -07:00
Fernando Perez
b77baae951
Merge pull request #1938 from minrk/xreqxrep
...
Remove remaining references to deprecated XREP/XREQ names.
There was only one actual use of the deprecated constants in code, but numerous mentions in docstrings, etc.
These names have been removed from the next libzmq release, and will presumably be removed from pyzmq someday.
2012-06-13 00:53:08 -07:00
Matthias BUSSONNIER
623bb06c43
fix completer css on some Chrome versions
...
Fixes #1833
2012-06-13 09:50:36 +02:00
MinRK
58705f3a33
remove remaining references to deprecated XREP/XREQ names
...
only one line of actual code is changed.
these names have been removed from the next libzmq release,
and will presumably be removed from pyzmq someday.
2012-06-13 00:36:09 -07:00
Fernando Perez
ea6e18abf3
Merge pull request #1936 from minrk/savenotify
...
Increase duration of save messages and write permanent 'failed' message to the save status area on failed save.
Not a pop-up as described in #1461 , but significantly more prominent, and most importantly permanent when saving fails, at least until the next successful save.
Closes #1461 .
2012-06-13 00:22:58 -07:00
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
Matthias BUSSONNIER
a280495173
remove less CSS
2012-05-31 13:08:21 -07:00
Brian Granger
0d6a698688
Major refactoring of the Notebook, Kernel and CodeCell JavaScript.
...
* Kernel doesn't depend on Notebook or CodeCell.
* CodeCell doesn't depend on Notebook, only Kernel.
* All of the kernel management logic has been moved out of the
Notebook into the Kernel.
* Public methods of the Kernel (execute, complete, etc) take
a callbacks object that registers the callbacks for that msg.
(rebased, cherrypicked, by Bussonnier Matthias <bussonniermatthias@gmail.com>)
(and tabs removed)
Conflicts:
IPython/frontend/html/notebook/static/js/codecell.js
IPython/frontend/html/notebook/static/js/completer.js
IPython/frontend/html/notebook/static/js/tooltip.js
2012-05-31 13:08:20 -07:00
Matthias BUSSONNIER
94d8683400
allow number in tokens
2012-05-31 13:08:20 -07:00
Matthias BUSSONNIER
068a60a8b7
fix print view
...
construct a completer only if the class exist
otherwise print view won't load.
2012-05-31 13:08:20 -07:00
Matthias BUSSONNIER
507a66235b
fix typo that->this
2012-05-31 13:08:20 -07:00
Matthias BUSSONNIER
b6fcb806d6
fix cancel_stick typo
2012-05-31 13:08:20 -07:00
Matthias BUSSONNIER
d7b42270ee
remove console.log
2012-05-31 13:08:20 -07:00
Matthias BUSSONNIER
73cc002110
clean and comment tooltip file
2012-05-31 13:08:19 -07:00
Matthias BUSSONNIER
5064568730
should fix click on close works when sticky
2012-05-31 13:08:19 -07:00
Matthias BUSSONNIER
d2f803bff2
multiple tooltip action
...
consecutives tab pressing with tooltip does :
- fisrt : show it
- second : expand it
- third : make it sticky for 10s (typing wont dismiss it)
- forth : send the content into the Pager
2012-05-31 13:08:19 -07:00
Matthias BUSSONNIER
72e3ea89ee
remove global
2012-05-31 13:08:19 -07:00
Matthias BUSSONNIER
5d8f0da694
almost all logic in tooltip.js, padding right button
2012-05-31 13:08:19 -07:00
Matthias BUSSONNIER
ca68062413
call tooltip after time
2012-05-31 13:08:18 -07:00
Matthias BUSSONNIER
0bfa18dd46
call tooltip by cell reference
2012-05-31 13:08:18 -07:00
Matthias BUSSONNIER
52d5f3beb2
move arow with tooltip positoin
2012-05-31 13:08:18 -07:00
Matthias BUSSONNIER
fa5aae3f43
shorten prearrow
2012-05-31 13:08:18 -07:00
Matthias BUSSONNIER
17a4f13a81
animation if already shown
2012-05-31 13:08:18 -07:00
Matthias Bussonnier
e0cf20b423
animate tooltip position
2012-05-31 13:08:17 -07:00
Matthias Bussonnier
b26b20e94f
fix scrolltop
2012-05-31 13:08:17 -07:00
Matthias Bussonnier
a84a7f03b0
play with tooltip growing css
...
don't forget to reenqble keyframe with a more
recent less compiler
2012-05-31 13:08:17 -07:00
Matthias Bussonnier
775c9e9317
comment a little
2012-05-31 13:08:17 -07:00
Matthias BUSSONNIER
22a44e79f8
change new tooltip appearence
...
temporarly (or maybe not) use less css to produce the css for the
tooltip.
2012-05-31 13:08:17 -07:00
Matthias BUSSONNIER
7b5b591425
improve new tooltip
2012-05-31 13:08:16 -07:00
Matthias BUSSONNIER
b463c64b32
new tooltip style
2012-05-31 13:08:16 -07:00
Matthias Bussonnier
85a09de995
tooltip to mac
2012-05-31 13:08:16 -07:00
Matthias Bussonnier
0247ac16f6
tooltip to mac
2012-05-31 13:08:16 -07:00
Matthias BUSSONNIER
7e7df86761
more cleaning
2012-05-31 13:08:15 -07:00
Matthias BUSSONNIER
cf19389cdd
clean code, remove duplicate unused lines
2012-05-31 13:08:15 -07:00
Matthias BUSSONNIER
6a658a6fa8
move more code into the completer itself
2012-05-31 13:08:15 -07:00
Matthias BUSSONNIER
e4784b984b
be smarter for context completion
...
Completion source based on context is smarter and use codemirror token
mecanisme to propose completions, instead of just plitting text at
whitespace and before dots.
2012-05-31 13:08:15 -07:00
Matthias BUSSONNIER
23ef964f06
add ctrlKey.which to utils
...
and modifies some file to use it
2012-05-31 13:08:15 -07:00
Matthias BUSSONNIER
3919267750
Removing some code that seem not to be usefull anymore
...
if having problem with Tab Completion try to revese this commit
2012-05-31 13:08:15 -07:00
Matthias BUSSONNIER
cfaa7ba427
import Utils keycodes into the completer
2012-05-31 13:08:14 -07:00
Matthias BUSSONNIER
fa6b8974ea
add a keycodes structure to utils
...
this structure (IPython.utils.keycodes)
add some common keycodes like tab...etc
and start modifying codecell.js to use it for better readability
2012-05-31 13:08:14 -07:00
Matthias BUSSONNIER
472fe4c19e
fix replace range bug
...
pylab.l<tab><tab> would be replace by .l because of a bug in common
start finding .l on the fifth position of pylab.start.
2012-05-31 13:08:14 -07:00
Matthias BUSSONNIER
839b8489c8
comment more
2012-05-31 13:08:14 -07:00
Matthias BUSSONNIER
0fa8b2236a
fix and retab javascript
2012-05-31 13:08:14 -07:00
Matthias BUSSONNIER
856c872ba7
use strict and clean a little.
...
adding 'use strict' in some place to be more agressive on the
delaration of the variables.
clean name and details here and there
2012-05-31 13:08:13 -07:00
Matthias BUSSONNIER
5076118509
implement the completer in a separate class
...
more feature like
-completion based on 2 sources :
* introspection in kernel
* context of current cell (complete with matching words)
* each source has its color in the completer
2012-05-31 13:08:13 -07:00
Fernando Perez
9af0496692
Merge pull request #1811 from minrk/exclusions
...
Warn on nonexistent exclusions in iptest. This will help us avoid common and often baffling errors from simple typos, as well as keeping the exclusions list updated as the code evolves.
2012-05-31 12:35:23 -07:00
MinRK
45a3230d70
test for exclusions based on ipython_package_dir
2012-05-31 12:17:51 -07:00
Brian E. Granger
675aa0bbef
Merge pull request #1808 from Carreau/alternate-upload-ff
...
Reposition alternate upload for firefox [need cross browser/OS/language test]
2012-05-31 12:13:18 -07:00
MinRK
cd6fd19fd8
remove stale exclusions revealed by warning
2012-05-31 11:57:13 -07:00
MinRK
65ac94d8f4
warn on nonexistent exclusions
2012-05-31 11:56:06 -07:00
MinRK
3ac79da49c
add missing cython exclusion in iptest
2012-05-31 10:06:13 -07:00
Matthias BUSSONNIER
a4dc3f1e3f
position upload form for firefox
2012-05-31 18:58:03 +02:00
Bussonnier Matthias
711c2ef6cc
Merge pull request #1739 from Carreau/dashboardImprovement
...
Dashboard improvement
see #1658 #1676
Allow to shutdown the kernels from the dashboard,
autorefresh dashboard,
add a native upload method, especially for https/chrome/linux that prevent drag and drop
2012-05-31 00:24:14 -07:00
Matthias BUSSONNIER
981738f9e3
change upload sentense
2012-05-31 08:33:52 +02:00
Fernando Perez
c15e0fa132
Merge pull request #1770 from ellisonbg/cython_magic
...
Cython related magic functions: offers the new cell magics %%cython_inline, %%cython_pyximport and %%cython to make it very easy to put cython-accelerated code in a cell and have it loaded interactively.
2012-05-30 22:17:34 -07:00
Brian Granger
26e8363d46
More code review changes:
...
* Added extension to the Sphinx docs.
* Fixed unicode issues.
2012-05-30 22:01:34 -07:00
Fernando Perez
5378cba25a
Merge pull request #1755 from minrk/pygmentstest
...
test for pygments before running qt tests, to avoid an error in the test suite itself if pygments isn't present.
2012-05-29 14:04:46 -07:00
Brian E. Granger
13cc762f4c
Merge pull request #1630 from minrk/mergekernel
...
Merge divergent Kernel implementations
2012-05-25 16:43:27 -07:00
Bussonnier Matthias
242d3df5c2
Merge pull request #1705 from Carreau/draggablePager
...
[notebook] Make pager resizable, and remember size...
2012-05-25 00:20:19 -07:00
Thomas Kluyver
89b6bc664a
Merge pull request #1606 from Carreau/loadpycat
...
Share code for %pycat and %loadpy, make %pycat aware of URLs
2012-05-24 02:26:35 -07:00
Matthias BUSSONNIER
1eeff0e5c8
Revert "esc collapse pager"
...
This reverts commit c8e47d45dbd7c17293de0d9218e8f52247b79d1d.
2012-05-23 20:35:50 +02:00
MinRK
b037cf18a4
move default log setup to _log_default from init_logging
...
allows classes to be passed log attribute, avoiding duplicate setup and occasional errors if things are done in the wrong order.
2012-05-22 22:07:23 -07:00
MinRK
1cd79e1461
test for pygments before running qt tests
2012-05-22 14:38:59 -07:00
MinRK
e0cdb267de
fix date objects in _reserialize_reply
2012-05-21 22:07:47 -07:00
Matthias BUSSONNIER
73ff1c5cde
fix upload button selection by class
...
superseed #1676 #1658 (and correct bug in 1676 where one con't upload
notebook because of refresh)
2012-05-15 21:57:05 +02:00
Matthias BUSSONNIER
b2291b14dc
Drag target bigger for empty notebook dashboard
...
When no notebooks, show "Notebook list empty", which increase the size
of the drag target.
fixes #1492
2012-05-15 21:54:09 +02:00
Matthias BUSSONNIER
1eae6f060a
do not expose enable/disable autorefresh
2012-05-15 21:54:09 +02:00
Matthias BUSSONNIER
40bdd81f5c
replace b by strong for semantic, more change in boilerplate
2012-05-15 21:53:22 +02:00
Matthias BUSSONNIER
231e8f93f2
remove underscore in filename
2012-05-15 21:53:22 +02:00
Matthias BUSSONNIER
0ada7dd847
bold click here in dashboard
2012-05-15 21:53:22 +02:00
Matthias BUSSONNIER
ee857f1bd9
remove extra console.log
2012-05-15 21:53:22 +02:00
Matthias BUSSONNIER
d549731d32
add 'Close and halt' in notebook filemenu
2012-05-15 21:53:22 +02:00
Matthias BUSSONNIER
13cf61912b
prevent autorefresh when pending upload
...
don't clear list if 'upload' button are present to avoid clearing the
list and the upload form
2012-05-15 21:53:22 +02:00