Commit Graph

815 Commits

Author SHA1 Message Date
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
Brian E. Granger
b14f30c8f1 Merge pull request #1325 from Carreau/fix-tooltip-showpager
forgotten selected_cell -> get_selected_cell
2012-01-25 12:20:40 -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
Fernando Perez
236f4dd401 Merge pull request #1316 from ipython/xunit2
Pass subprocess test runners a suitable location for xunit output.  This enables our Jenkins instance at Shining Panda to display a proper summary instead of just a raw console log.
2012-01-24 18:11:57 -08: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
Min RK
ea354ad249 Merge pull request #1312 from minrk/hb
two small heartbeat changes:

* flush outgoing heartbeats (notebook and parallel):
  - Prevents mismatch between heartbeat timer and actual heartbeat send/recv events.

* relax default heartbeat period in IPython.parallel to 3s from 1s
  - Matches heartbeats elsewhere.  3s should be extremely conservative, as most heartbeat responses are O(1ms) unless there's a bug in our code (like the above flush and previously-discovered GIL issues).

closes #1304
2012-01-23 14:14:18 -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
Fernando Perez
0051df30f3 Merge pull request #1301 from nathan-rice/master
Require pyreadline 1.7.1 on Windows, which fixes a number of small problems for which we had workarounds.

Closes #1202.
2012-01-20 17:20:19 -08:00
Nathan Rice
74b1c7d61e pyreadline dependency pushed to 1.7.1 for all versions of windows. Also, solves an issue that has been observed when IPython is used with some older versions of pyreadline. 2012-01-20 13:21:36 -05:00
Brian Granger
5d303263b2 Merge branch 'issue1290' 2012-01-19 09:47:15 -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
7c5372ba22 Merge branch 'aceify' 2012-01-18 12:25:26 -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