Commit Graph

626 Commits

Author SHA1 Message Date
Thomas Kluyver
93a8b9d215 Use separate option --with-xml-coverage to ask for coverage xml output. 2012-01-27 01:16:46 +00:00
Thomas Kluyver
24af9ac298 Use standard command for coverage. 2012-01-27 01:16:46 +00:00
Thomas Kluyver
e29d417931 Produce coverage xml reports from subprocess test runners. 2012-01-27 01:16:46 +00:00
Min RK
125dc8cb74 Merge pull request #1206 from minrk/fixConsole
The notebook js transforms ANSI-escaped text to HTML.  The transformed HTML was previously persisted to ipynb files, rather than the true output.  This has been fixed, and notebooks with ANSI-colored output will need to be re-run for colored output (tracebacks) to be displayed correctly after this change.
2012-01-26 17:14:29 -08:00
Fernando Perez
df7d91f30a Add linewrapping to text cells (new feature in CodeMirror). 2012-01-25 22:17:12 -08:00
Fernando Perez
ef1cc56996 Merge pull request #1327 from ellisonbg/updatecm2
Updating CodeMirror to the latest dev master. 

We had found a bug in CodeMirror that was forcing us to call refresh/focus/refresh on Firefox. This bug was fixed upstream. This PR pull in the latest CM with the bug fix and removes the extra refresh calls. All known CM bugs should be fixed, yeh!
2012-01-25 22:16:13 -08:00
Fernando Perez
219ba77482 Merge pull request #1326 from ellisonbg/removeace
Removing Ace edit capability.

We have fixed some of the problems with CodeMirror and feel that
the differences between Ace and CodeMirror are not great enough
to justify having both. We may reintroduce a full-window edit
mode using CodeMirror, but that will come separately.
2012-01-25 20:30:36 -08:00
Fernando Perez
1d5c57d6c9 Remove debug print statement left over from PR #1316. 2012-01-25 19:43:14 -08:00
Brian Granger
0bc0c560aa Removing extra refresh that is no longer needed because of CM fix. 2012-01-25 14:03:49 -08:00
Brian Granger
262d73f652 Updating CodeMirror to latest to incorporate bug fixes. 2012-01-25 13:46:48 -08:00
Brian Granger
c29e928054 Removing Ace edit capability.
We have fixed some of the problems with CodeMirror and feel that
the differences between Ace and CodeMirror are not great enough
to justify having both. We may reintroduce a full-window edit
mode using CodeMirror, but that will come separately.
2012-01-25 12:32:06 -08:00
Matthias BUSSONNIER
7e268d8ec8 execute_get_cell -> execute_cell
wrongly rename execute_cell leading to broken execute_all_cell
2012-01-25 15:15:52 +01:00
Matthias BUSSONNIER
8ad0cbe4c0 forgotten selected_cell -> get_selected_cell
somwhere in renaming `selected_cell` to `get_selected_cell` one
occurence has been forgoten in `codecell.js` this was mainly visible by
the fact that the 'show pager' button of the tooltip was non fonctionnal
anymore.
2012-01-25 14:47:15 +01:00
Thomas Kluyver
b01e9ea082 Pass subprocess test runners a suitable location for xunit output. 2012-01-24 21:23:58 +00:00
Brian E. Granger
d8e1b38507 Merge pull request #1303 from ellisonbg/updatecm
This updates CodeMirror and refactors a good bit of the notebook code related to it.

* Updated CodeMirror to the latest stable release.
* Fix numerous bugs related to the CM update.
* Refactored the Cell API and the notebook's cell handling methods.
* Generalized split/merge to work with all cell types.
* Generalized "Edit in Ace" to work with all cell types.
* Loading optimizations: pager starts out hidden, faster loads.
* Shading added to Markdown and HTML cells when they are being edited.
* This branch will require solid usability testing on Safari, FF and Chrome before merging.
* Fixed a number of CM related bugs.
2012-01-23 19:29:53 -08:00
Brian Granger
d3c3c9e712 Fixing auto-indent issues in CodeMirror config.
* Block-level indent/dedent works.
* Tab in docstrings works.
2012-01-23 19:27:18 -08:00
Brian Granger
5947849342 Fixing broken notebook saves. 2012-01-23 19:00:25 -08:00
Brian Granger
c94e6f34d7 Disallow empty notebook names. 2012-01-23 15:36:01 -08:00
MinRK
370078020f flush outgoing heartbeats
Prevents mismatch between heartbeat timer and actual heartbeat send/recv events.

Applied in notebook and parallel.
2012-01-23 13:42:00 -08:00
Brian Granger
244ed795d3 Adding refresh/focus/refresh back to edit to fix bug in FF. 2012-01-23 11:56:07 -08:00
Brian Granger
e6e7d41f5b Fixing bugs in CodeMirror refreshing. 2012-01-23 11:33:02 -08:00
Brian Granger
1e2e086508 Optimizing notebook loading. 2012-01-23 11:33:01 -08:00
Brian Granger
bf0353ae47 Start the pager out collapsed. 2012-01-23 11:33:01 -08:00
Brian Granger
a997e50782 Ace editor now works with Markdown and HTML cells with proper modes. 2012-01-23 11:33:01 -08:00
Brian Granger
68fe221a29 Lots of small notebook improvements.
* Merge/split works for all cell types.
* Notebook.select won't select an already selected cell.
* Bugs in markdown cell editing fixed.
* border-box-sizing used for Markdown cells to get correct css boxes.
* Shading/border added to Markdown cell editor.
2012-01-23 11:33:01 -08:00
Brian Granger
ecfdfad2bf Refactoring of the notebooks cell management.
* Cell insertion code completely rewritten. We now have two methods
  rather than 9: insert_cell_above, insert_cell_below.
* Renaming methods to be more consistent.
* Creating new methods to provide a uniform API.
* Minor bug fixes.
2012-01-23 11:33:01 -08:00
Brian Granger
ccd4de93c7 Updating cell logic.
* Added placeholder to the base Cell class.
* Removed the \u0000 char at the beginning of the TextCell
  placeholder that was there for a CodeMirror bug workaround.
* Other refactoring of Cell related Notebook methods.
2012-01-23 11:33:01 -08:00
Brian Granger
e1a8835dfa Work on the base Cell API.
* Added set_text/get_text in favor of get_code/set_code and
  get_source/set_source.
* Added methods to the base class (get_text, set_text, refresh,
  edit, render, toJSON, fromJSON).
2012-01-23 11:33:01 -08:00
Brian Granger
deb800daff Fixing bugs that have shown up since updating CM to 2.2. 2012-01-23 11:33:01 -08:00
Brian Granger
13ca0054f7 Updating to CodeMirror 2.2, latest stable release. 2012-01-23 11:33:01 -08:00
Brian Granger
1b8b716b48 Removing left over console.logs. 2012-01-19 09:47:05 -08:00
Brian Granger
e93d4a9308 Minor, but important fixes to cut/copy/paste.
When enabling paste, I was adding the click callback multiple
times causing paste to overwrite multiple cells. I also found
a bug that was doing paste above instead of paste below.
2012-01-19 09:47:05 -08:00
Brian Granger
43c82a2b80 Fixing minor typo in menubar.js. 2012-01-18 12:47:53 -08:00
Brian Granger
183e9ccfb1 Minor changes to Ace widget.
* Font size and family matches that of our CodeMirror editors.
* Help link to Ace keyboard shortcuts added to help.
2012-01-18 12:16:39 -08:00
Brian Granger
f04e31b80c Add Ace editing mode for code cells. 2012-01-18 10:31:59 -08:00
Brian Granger
d369606683 Cell splitting and merging is done! 2012-01-17 18:27:58 -08:00
Brian Granger
b42cafa15d More of the initial split cell capability. 2012-01-17 18:27:58 -08:00
Brian Granger
23b5fd856a Basic code cell splitting implemented. 2012-01-17 18:27:57 -08:00
Min RK
41149ba246 Merge pull request #1253 from ivanov/profile_auto_create
set auto_create flag for notebook apps

Fixes first use of bundled profiles when used with the notebook (e.g. ipython --profile=sympy).
2012-01-17 18:27:55 -08:00
Brian Granger
06cc810b80 Adding keyboard sortcuts for cut/copy/paste. 2012-01-17 18:27:52 -08:00
Brian Granger
ccc5aa04b2 Added cell level cut/copy/paste. 2012-01-17 18:27:51 -08:00
Brian Granger
0051dd3bda Fixing docstring in the notebook manager. 2012-01-17 18:27:51 -08:00
Brian Granger
eef6d192e4 Created new print view for notebook printing. 2012-01-17 18:27:50 -08:00
Brian Granger
76f500b3c3 Improving the save notification.
* Added last saved with time/date display.
* Reimplemented save widget status updates.
2012-01-17 18:27:50 -08:00
Brian Granger
2a7666639c Fixing bug in dialog closing, drafting print css. 2012-01-17 18:27:50 -08:00
Brian Granger
531cfee407 Remove Rename dialog from the DOM upon closing it. 2012-01-17 18:27:49 -08:00
Brian Granger
1f1132c5a4 More minor theme/styling changes. 2012-01-17 18:27:49 -08:00
Brian Granger
bf5ffad6f8 Minor style changes. Using better fonts, indenting menu items. 2012-01-17 18:27:49 -08:00
Brian Granger
10a76e8537 Solid first go at jquery-ui based menus. 2012-01-17 18:27:49 -08:00
Brian Granger
b3de72087c Minor fixes to the menu shortcuts. 2012-01-17 18:27:47 -08:00
Brian Granger
be8f252e78 Finishing work on "Make a Copy" functionality. 2012-01-17 18:27:47 -08:00
Brian Granger
8cd495c38f Beginning work on notebook duplication. 2012-01-17 18:27:46 -08:00
Brian Granger
52a2600c87 Improved notebook renaming.
There is not a rename dialog that is available in the File menu and
when you click on the notebook name.
2012-01-17 18:27:46 -08:00
Brian Granger
b010d14f58 Cleaning up menu code.
* QuickHelp button has been removed in favor of a Help menu item.
* Keyboard shortcuts are now in the menus.
* Numerous fixes to subtle aspects of the wijmenu implementation.
2012-01-17 18:27:46 -08:00
Brian Granger
33f5cea94b Implemented menu based UI using Wijmo. 2012-01-17 18:27:45 -08:00
Brian Granger
e4489da763 Initial work to add Wijmo based menu. 2012-01-17 18:27:45 -08:00
Paul Ivanov
9e475c3dc5 set auto_create flag for notebook apps 2012-01-10 16:52:07 -08:00
Matthias BUSSONNIER
096ba3fcc4 fix weird magic completion
should fix #1243

handle magic as a special case, but the completer should be moved in it's
own clase for 0.13
2012-01-08 16:39:11 +01:00
Min RK
e4beaf0a73 Merge pull request #1211 from minrk/localfiles
Files in notebook-dir are served by the nbserver as `files/<relativepath>`.
2012-01-06 02:00:14 -08:00
Min RK
7be995118d Merge pull request #1224 from minrk/dblclick
* edit text cells on double-click instead of single-click
* render text cells on unselect instead of focusout.
  Only renders when selecting another cell, and prevents rendering when 
  switching applications/windows/tabs.
2012-01-06 01:59:02 -08:00
MinRK
87877e9a7f explicit for-loop in cleanup_kernels
makes single-iteration clearer than while loop, as reviewed by @fperez.
2012-01-05 21:53:34 -08:00
MinRK
1385ef8ebb log heartbeat failure in notebook 2012-01-05 21:12:58 -08:00
MinRK
655bf1bacc prevent delayed heartbeat from starting on closed sessions 2012-01-05 20:05:32 -08:00
MinRK
2c8106bf42 trigger textcell render on unselect instead of focusout 2012-01-05 19:20:17 -08:00
MinRK
5cce816d2a edit text cells on double-click instead of single-click
Single-click to edit gets in the way of using interactive elements (e.g. non-flash videos),
and select/copy of the rendered HTML.  Switching to double-click makes the edit action more intentional.
2012-01-05 19:12:44 -08:00
MinRK
1d65883212 serve local files as files/foo 2012-01-03 11:40:15 -08:00
MinRK
ba5e2538b5 use absolute URLs for static files 2012-01-03 11:37:15 -08:00
MinRK
d67865c73c authenticate local file access
adds AuthenticatedFileHandler, which extends StaticFileHandler with
a simple authentication check before providing access to files local
to the notebook dir.
2012-01-03 11:30:00 -08:00
MinRK
831fb175f8 serve files in notebook-dir as local/foo 2012-01-03 11:30:00 -08:00
MinRK
7691f4f9fc store nonexistent prompt number as null 2011-12-24 10:59:17 -08:00
MinRK
220a5f0664 don't preserve fixConsole output in json 2011-12-24 10:45:47 -08:00
MinRK
15ca2aaa20 add first_beat delay to notebook heartbeats
Heartbeats start immediately, causing false heart failures on slow systems that can take a while to start kernel subprocesses.

Also adds a 'flush' to the heartbeat callback (just like in IPython.parallel), to protect against server load being detected as heart failures.
2011-12-22 22:45:44 -08:00
MinRK
13fc7e5c41 cleanup connection files on notebook shutdown
Kernels would not linger, but the KernelManagers are not garbage-collected on shutdown.
This means that connection files for kernels still running at notebook shutdown would not be removed.

Also disable the unnecessary (and actively unhelpful) SIGINT handler inherited from the original
copy/paste from the qt app.
2011-12-20 12:32:08 -08:00
Fernando Perez
572e1eb56f Add message about how to stop the notebook. 2011-12-18 21:55:05 -08:00
MinRK
602d2ec18a fix IOPub parent checking in notebook
prevented 'dead kernel' messages from arriving.
2011-12-18 18:21:47 -08:00
Bradley M. Froehle
930ba99b19 Show class init and call tooltips in notebook.
Closes #1094.
2011-12-18 12:36:38 -08:00
Fernando Perez
7c7a48e2ce Define flags in application that's going to use them. 2011-12-17 18:12:41 -08:00
Fernando Perez
b3d5732690 Fix typo in help string 2011-12-17 14:31:33 -08:00
Fernando Perez
fd485e23fc Add --script flag as shorthand for the script autosave notebook option. 2011-12-17 13:38:52 -08:00
Stefan van der Walt
6a8a66fa8b Correctly set read_only meta name for use in javascript. Note that this has a different meaning than in the Python code: not whether the read-only flag was specified upon launch, but whether the notebook is in read-only mode and input should be disabled. 2011-12-13 18:02:17 -08:00
Stefan van der Walt
4476c69984 Hide top login/logout buttons on login/logout pages. 2011-12-13 17:44:29 -08:00
Stefan van der Walt
52a2f081fe Split read-only logic into three functions: read_only, logged_in, and login_available. Move display logic from javascript into templates. 2011-12-13 17:22:13 -08:00
Stefan van der Walt
3bf57a7f5d Improve three-state read-only logic. 2011-12-13 16:15:20 -08:00
Stefan van der Walt
23ff0c2f88 On the login page, focus on the password field. 2011-12-13 16:13:34 -08:00
Stefan van der Walt
06d34fea72 Redirect to front page upon read-only logout. 2011-12-13 16:13:34 -08:00
Stefan van der Walt
ec89b7c98b Display login button in read-only mode. 2011-12-13 16:13:34 -08:00
Fernando Perez
b98a86f818 Merge pull request #1146 from minrk/savescript
Allow saving notebook.py next to notebook.ipynb.  This allows notebooks to be imported or %run via their .py companion file.
2011-12-12 22:38:45 -08:00
MinRK
dca65fa91d include error in 'Unexpected error' message. 2011-12-12 21:09:42 -08:00
MinRK
6947e47822 Merge PR #1132
Improve read-only style

closes #1132
2011-12-12 15:19:04 -08:00
MinRK
218a88a47b move drag_info show/hide to page.ready, to avoid flouc 2011-12-12 15:17:20 -08:00
Matthias BUSSONNIER
c6457428c8 notebook : update logo
Change Notebook logo to IP[y]:Notebook
    Make it clickable to return to the dashboard
    Thanks to @MinRK for the css.

    closes #607

    png logo is 48px high (2x display), for balance of
    browser display / zoomed appearance.
2011-12-12 15:03:38 -08:00
MinRK
a8425e5c62 Merge PR 1135
settings for tornado web application can now be specified via the
NotebookApp.webapp_settings configurable.  This principally allows
users/admins to serve custom templates, css, and javascript, without
having to modify IPython's shipped sources.

closes #1135
2011-12-12 14:17:07 -08:00
MinRK
88340d682c update iptest exclusions with recent changes 2011-12-12 11:47:51 -08:00
Matthias BUSSONNIER
16946ef7bb unhide on not read-only instead of inverse 2011-12-11 13:02:13 +01:00
Timo Paulssen
eb51077b26 look for mathjax in the custom static path if it's supplied. 2011-12-10 22:44:12 +01:00
Timo Paulssen
7fa16984cc this is how the configuration system is supposed to be used. 2011-12-10 18:49:41 +01:00
Timo Paulssen
ec0026bbf9 use IPythons config subsystem to allow overrides to the tornado web app. 2011-12-10 16:30:12 +01:00
Matthias BUSSONNIER
540f77f96a [notebook] read-only disable element
* remove the drag file to upload text
    * prevent drag binding to show upload form
2011-12-09 16:45:19 +01:00
Matthias BUSSONNIER
b0ad2c6f29 [notebook] read-only: disable name field 2011-12-09 12:36:11 +01:00
MinRK
d7970d29a5 skip codemirror key-event handling when read-only 2011-12-08 12:47:08 -08:00