Commit Graph

1852 Commits

Author SHA1 Message Date
Min RK
a7cf16ce98 Merge pull request #3660 from minrk/focusclick
refocus active cell on dialog close

if there is one.

Otherwise the cursor is lost on kernel restart, etc. and the mouse must be used to get back to work.
2013-07-18 11:13:06 -07:00
Matthias BUSSONNIER
38fc90a1b0 add mising semicolon 2013-07-18 18:48:27 +02:00
Matthias BUSSONNIER
42fb90acac patch header-cell and use-strict 2013-07-18 18:29:41 +02:00
Matthias BUSSONNIER
e166732257 linting and remove unused var 2013-07-18 18:24:25 +02:00
Matthias BUSSONNIER
7a452f10ca statelessify matjaxutils
stateless-ification of function that was using module level
variable to share data.

Now varaible are passed around, and usage of replace math
require user to pass a return value of remove_math around
2013-07-18 18:24:24 +02:00
Matthias Bussonnier
ba24f709cb Merge pull request #3673 from minrk/cm-comment
enable comment/uncomment selection in notebook

Bound to `(cmd|ctrl)-/`
2013-07-18 08:56:16 -07:00
Jonathan Frederic
7782f29910 Re-enable files directory exclusion. 2013-07-17 16:17:25 -07:00
Jonathan Frederic
ed83c16fa4 Travis, test without exclusion... 2013-07-17 15:58:45 -07:00
Jonathan Frederic
86b4f48476 Exclude nbconvert testing config files from iptest interpretation. 2013-07-17 15:40:30 -07:00
MinRK
127a0669ff enable comment/uncomment selection
with `(cmd|ctrl)-/`

closes #1540
2013-07-17 14:27:07 -07:00
Min RK
374579a65c Merge pull request #3559 from minrk/create_delete_events
add create.Cell and delete.Cell js events

closes #3154
2013-07-17 14:08:48 -07:00
Min RK
5ac40d0746 Merge pull request #3651 from minrk/cleanup
remove a bunch of unused `default_config_file` assignments

These are never used, I don't know where they came from.
2013-07-16 15:00:52 -07:00
MinRK
79d9f0f039 refocus active cell on dialog close
if there is one

Otherwise, the cursor is lost on kernel restart, etc.
2013-07-16 14:51:06 -07:00
Min RK
117d99ad2a Merge pull request #3630 from minrk/css
CSS adjustments

- remove boilerplate.css, as it is redundant with bootstrap's own reset.less
- add ipython.less / ipython.min.css for IPython-only CSS
- move font-awesome to outermost style.less, so it is not included in ipython.min.css,
  where it is not desirable.

This doesn't do any of the naming / scoping cleanup that we should ultimately do, but it does create the file where that will have its desired effect.
2013-07-16 14:09:20 -07:00
Min RK
99a9782eb7 Merge pull request #3601 from minrk/headingmath2
Markdown in heading cells (take 2)

closes #3053
closes #3597
2013-07-16 13:00:32 -07:00
Min RK
f395271e95 Merge pull request #3621 from minrk/htmlerror
catch any exception appending output

HTML output can have javascript with errors, etc.

No output should ever raise, no matter what.

closes #3620
2013-07-15 17:10:30 -07:00
MinRK
af7564253d remove a bunch of unused default_config_file assignments
These are never used, I don't know where they came from
2013-07-15 17:01:43 -07:00
Min RK
51f4b08174 Merge pull request #3571 from damianavila/split_shortcut
Added `^M -` as shorcut to split cell.
2013-07-15 11:21:17 -07:00
Min RK
f3fa5cd181 Merge pull request #3624 from minrk/argunicode
fix some unicode in zmqhandlers

Prevented session identity from being set properly, which in turn prevented stdin from working in the notebook in Python 3.

closes #3494
2013-07-14 11:19:57 -07:00
MinRK
7ff586a134 move font-awesome to style.less from notebook-specific less
allows it to be excluded from ipython.min.css,
where it doesn't make much sense.
2013-07-13 17:57:10 -07:00
MinRK
68c314cb39 add IPython-only CSS
adds static/style/ipython.less and ipython.min.css

Which should contain minimal styling that conflicts with other CSS.

As we improve our CSS scoping and naming,
this file should eventually be enough to play nice with embedding IPython in other HTML contexts.
2013-07-13 17:56:12 -07:00
MinRK
409a1bb6e1 remove boilerplate.css
it is redundant with bootstrap reset
2013-07-13 14:44:55 -07:00
Paul Ivanov
03006024ba passing cell to showInPager, closes #3625 2013-07-13 00:08:30 -07:00
MinRK
638c36a7f7 fix some unicode in zmqhandlers
prevented session identity from being set properly,
which in turn prevented stdin from working in the notebook in Python 3.

closes #3494
2013-07-12 18:47:56 -07:00
MinRK
38869a60e4 catch any exception appending output
HTML output can have javascript with errors, etc.

No output should ever raise, no matter what.

closes #3620
2013-07-12 14:26:43 -07:00
MinRK
c800ed9671 be pedantic about VT100 vs ANSI in comments 2013-07-12 11:56:59 -07:00
MinRK
13a89a74e3 add indexed-color in 256-color support 2013-07-12 11:47:59 -07:00
MinRK
49e6a36f7c add ansi background colors 2013-07-12 11:47:48 -07:00
MinRK
1186d575a9 expand ANSI color support
adds support for 256 colors

does not yet add support for themed 16-color mapping ([01;38;5;[0-15])

closes #3617
2013-07-11 17:47:28 -07:00
MinRK
55192ef881 fix regular expression for ANSI escapes
wouldn't catch `\x1b[01;`, only `\x1b[0;` or `\x1b[1;`.

closes #3614
2013-07-11 12:19:03 -07:00
MinRK
47061360da remove unnecessary heading-anchor
residue from when the heading text itself was a link

the id is on the header tag itself,
and the link is anchor-link
2013-07-10 15:14:02 -07:00
MinRK
185769d1b9 merge heading lines
markdown headings must be a single line
2013-07-10 14:41:03 -07:00
MinRK
b5f0be18de truncate invalid multi-line headers 2013-07-10 14:36:12 -07:00
MinRK
45d0dd0a45 Markdown in heading cells (take 2)
small typo prevented the previous implementation from working.

This also moves the rendering to the 'render' method,
away from set_rendered.

closes #3053

(again)
2013-07-10 13:43:07 -07:00
Min RK
2e417e82f0 Merge pull request #3594 from Carreau/fixes-3563
Fix duplicate completion in notebook

comparaison between kernel completion and context-completin were
returning duplicate entry in some cases, due to trailing space.
sripping trailing space in comparaison prevent this.

closes #3563
2013-07-10 10:18:59 -07:00
Matthias Bussonnier
f373e850ae Merge pull request #3595 from Carreau/rever-md-in-head
Revert "allow markdown in heading cells"
2013-07-10 07:06:36 -07:00
Matthias BUSSONNIER
1fbf5a6a2c Revert "allow markdown in heading cells"
This reverts commit 8c83c3b958b3c9f65d9446f69b2704a0b263b07b.
2013-07-10 15:58:45 +02:00
Matthias BUSSONNIER
1e75582e48 Fix duplicate completion in notebook
comparaison between kernel completion and context-completin were
returning duplicate entry in some cases, due to trailing space.
sripping trailing space in comparaison prevent this.

fixes #3563

example

    import bar
    from foo im<tab>

used to propose `import` twice (actually `import` and `import[space]` as$
`import` was a token on the first line) now just complete directly to$
`import[space]`.
2013-07-10 14:16:35 +02:00
Matthias Bussonnier
9b08a557e5 Merge pull request #3538 from minrk/launch_ip
add IPython.start_ipython

A public API for starting a real (non-embedded) IPython instance.

should avoid API breakage in the future due to simple module renames, as has just happened with the removal of frontend.

For implementation purposes, I have added launch_new_instance as a classmethod on Application. I did this, because I wanted to add the ability to pass arguments to the instance, and didn't want to manually update every duplicate launch_new_instance.

closes #1537
2013-07-10 01:59:53 -07:00
damianavila
7aab2ec291 Added '-' as a shortcut for splitting cells. 2013-07-09 17:55:13 -03:00
Min RK
f0db998d4d Merge pull request #3560 from minrk/longcell
Remove max_msg_size

The max_msg_size safety limit is just removed.

closes #3124
2013-07-09 11:50:53 -07:00
MinRK
39578beabc remove max_msg_size altogether
It was a security feature without an application.
2013-07-09 09:37:36 -07:00
Matthias Bussonnier
b0922caa81 Merge pull request #3567 from Carreau/app-init-event
Trigger a single event on js app initilized.
2013-07-09 08:41:56 -07:00
Matthias Bussonnier
1f2c975c84 Merge pull request #3531 from minrk/headingmath
allow markdown in heading cells
2013-07-09 08:34:14 -07:00
Matthias BUSSONNIER
755b13a7c4 Simplify codemirror ipython-mode
make it a subset of python mode, only with configuration
2013-07-08 10:49:05 +02:00
Matthias BUSSONNIER
2272edf715 correct static path for CM modes autoload
this shoudl also allow to require CM python mode for ipython mode and
only pass a config options.
2013-07-07 18:56:07 +02:00
Matthias Bussonnier
e9c2ac802d Merge pull request #3561 from minrk/double-c-c
mention double-control-C to stop notebook server in the initial log message.
2013-07-07 01:42:29 -07:00
damianavila
73e88b6677 Added shorcuts to split cell, merge cell above and merge cell below. 2013-07-06 18:59:54 -03:00
Matthias Bussonnier
fc5ea27155 Merge pull request #3566 from Carreau/fix-event-name
fix event names
2013-07-06 11:18:04 -07:00
MinRK
7fe1b00cdc mention double-control-C to stop notebook server
in the initial log message.

closes #2971
2013-07-06 10:50:11 -07:00
Matthias BUSSONNIER
621c8c40a3 Trigger a single event on js app initilized
Usefull to bind to extension loading, to load only once
2013-07-06 19:49:24 +02:00
Matthias BUSSONNIER
41c84eb40e fix event names 2013-07-06 19:43:23 +02:00
MinRK
4408ab6ca1 warn about messages dropped due to oversize 2013-07-05 22:17:40 -07:00
MinRK
563d9372bf up default max_msg_size to 1MB 2013-07-05 22:17:39 -07:00
MinRK
5e20d457cd add create.Cell and delete.Cell js events
The events fire after the cell has been created or deleted.

closes #3154
2013-07-05 22:05:53 -07:00
MinRK
0c6fe836ca open markdown links in new tabs
restores earlier behavior lost when we switched to marked.

closes #3439
2013-07-05 20:56:51 -07:00
MinRK
ee6f7f4c3d set overflow-x: hidden on Firefox only
workaround crazy Firefox-only behavior when selecting newlines

closes #3549
2013-07-05 12:31:48 -07:00
Brian E. Granger
7941da8fe2 Merge pull request #3498 from ellisonbg/nbname
When a notebook is written to file, name the metadata name u''.
2013-07-05 11:31:41 -07:00
Paul Ivanov
735ed2c67f Merge pull request #3548 from takluyver/save-icon
Change to standard save icon in Notebook toolbar

What used to be a hard drive image is now the more traditional floppy image
2013-07-05 09:51:55 -07:00
Thomas Kluyver
e7bfd55357 Change to standard save icon in Notebook toolbar
Closes gh-3545
2013-07-05 17:00:16 +01:00
Matthias Bussonnier
cefbcbead1 Merge pull request #3526 from minrk/clusterlist
ensure 'default' is first in cluster profile list

when sorting, 'default' is transformed to ''.
2013-07-05 07:35:59 -07:00
Matthias Bussonnier
8e211a1290 Merge pull request #3525 from minrk/utc
Fix basic timezone info

minor tweaks to jsonutil, to include timezone info if available
add IPython.utils.tz, which just has basic info for making utcnow(), etc. include tzinfo in the datetime object
use this tzinfo in the last_modified keys in notebook managers, which fixes Firefox's timezone offset for checkpoints
2013-07-05 07:35:27 -07:00
Matthias Bussonnier
2052b1f1cf Merge pull request #3513 from minrk/nocp
add 'No Checkpoints' to Revert menu
2013-07-05 05:03:43 -07:00
MinRK
3ffc6d0ab5 Application.launch_instance
removes `new` from method name, since it isn't accurate.
2013-07-04 12:48:07 -07:00
MinRK
63b65b8c6c use launch_new_instance classmethod to launch apps 2013-07-04 12:23:31 -07:00
MinRK
09567f835b remove debug statement
and anchor
2013-07-04 08:58:43 -07:00
Matthias Bussonnier
9640b57161 Merge pull request #3528 from minrk/staticbase
fix local mathjax with custom base_project_url
2013-07-04 02:24:34 -07:00
Matthias Bussonnier
1bbbeddafd Merge pull request #3518 from takluyver/unused-imports
Clear up unused imports

Static analysis revealed a load of things that are imported but not used. I've tried to leave things that look like part of the API, and clear up other things.

Noticed a few test functions which had been copy-pasted without changing the name, in which case only the later one will run. I gave them separate names.
2013-07-04 02:24:15 -07:00
MinRK
d1a8c06c91 allow markdown in heading cells
italics, bold, math, etc.

closes #3053
2013-07-03 18:33:57 -07:00
MinRK
b20845172b fix local mathjax with custom base_project_url
closes #2720
2013-07-03 17:34:00 -07:00
MinRK
13408ecf71 ensure 'default' is first in cluster profile list
when sorting, `'default'` is transformed to `''`.
2013-07-03 16:18:10 -07:00
MinRK
bc4a457fdc add timezone info to last_modified in notebook managers
now Firefox won't get confused, turning utc timestamps into local times.

closes #3396
2013-07-03 12:16:22 -07:00
Thomas Kluyver
679458f3b9 Fix test import 2013-07-02 23:03:29 +01:00
Thomas Kluyver
1b66bd9615 Remove unused imports in IPython.testing 2013-07-02 23:00:28 +01:00
Thomas Kluyver
a2bf752dba Remove unused imports in IPython.html 2013-07-02 22:31:40 +01:00
MinRK
d12a9b19c9 use bootstrap disabled instead of ui-state-disabled
in menubar
2013-07-02 10:42:12 -07:00
MinRK
40b882906f add 'No Checkpoints' to Revert menu
when there are None, rather than an empty menu.

closes #3261
2013-07-02 10:38:05 -07:00
MinRK
b9706f23f5 use window.onbeforeunload= for nav-away warning
Firefox 22 broke `$(window).on("beforeunload")` somehow, for some reason,
resulting in always showing a dialog, regardless of the function's return value.

The only fix I could find was resorting to the basic low-level API.
2013-07-01 21:49:39 -07:00
MinRK
88668e65f8 don't use parent=self in handlers
handlers aren't configurable, so shouldn't be passed as parent.

closes #3502
2013-07-01 10:55:48 -07:00
Brian E. Granger
13c93844ed Merge pull request #3500 from ipython/nbconvert
Merge nbconvert into IPython
2013-07-01 10:33:20 -07:00
Brian E. Granger
202dec41e6 Merge pull request #3478 from minrk/rewarn
restore "unsaved changes" warning on unload
2013-06-30 21:52:19 -07:00
Brian E. Granger
b3dc666ac9 Merge pull request #3493 from minrk/restart-dialog
add a dialog when the kernel is auto-restarted
2013-06-30 21:50:09 -07:00
Brian E. Granger
70f726517a Merge pull request #3488 from takluyver/test_autoreload
Add test suite for autoreload extension
2013-06-30 21:42:40 -07:00
Brian E. Granger
c323717fe7 Merge pull request #3430 from minrk/configinstance
add parent to Configurable
2013-06-30 21:27:46 -07:00
Brian E. Granger
7d7912d732 Fixing test logic for nbconvert to get tests to pass. 2013-06-30 20:59:21 -07:00
Brian E. Granger
390717c53a Fixing import for nbconvert. 2013-06-30 18:04:56 -07:00
MinRK
c7355b8ba7 move nbconvert into place as subpackage 2013-06-30 18:03:29 -07:00
MinRK
1d64597ea8 move restart dialog to notebook.js 2013-06-29 15:48:14 -07:00
MinRK
d8fa8eea04 add a dialog when the kernel is auto-restarted
adds the autorestart status event for the dialog

so that user-restart is distinct from server-side auto restart.

closes #3490
2013-06-29 15:35:39 -07:00
Thomas Kluyver
acb7eefef8 Remove unexpected keyword parameter to remove_kernel
Closes gh-3474
2013-06-29 23:01:34 +01:00
Thomas Kluyver
e4a08d1036 Add test suite for autoreload extension
Closes gh-1912
2013-06-29 22:29:51 +01:00
MinRK
bd03a99e28 use parent=self throughout IPython
instead of `config=self.config`

only real effective change: IPythonKernelApp.parent has been renamed to IPKernelApp.parent_handle.
2013-06-29 12:41:17 -07:00
Victor Zverovich
99eedefa41 Use absolute path to iptest, because the tests are not always run from $IPYTHONDIR. 2013-06-29 07:36:28 -07:00
Brian E. Granger
a8dfc449a6 When a notebook is written to file, name the metadata name u''. 2013-06-28 21:35:20 -05:00
MinRK
a51f9e1a6e update before unload message
mention pending autosave, if applicable
2013-06-28 15:40:40 -07:00
MinRK
09c7bba2b4 restore "unsaved changes" warning on unload
Autosave is triggered at this event, but it seems to fail sometimes (perhaps when it's too slow?).

closes #3475
2013-06-28 15:40:40 -07:00
MinRK
a3653e34b1 update references for IPython.html 2013-06-27 11:14:10 -07:00
MinRK
cf726d6a40 mv IPython.html.notebook -> IPython.html 2013-06-27 11:14:10 -07:00
Fernando Perez
a1c0b749ff Fix imports in test suite. 2013-06-27 11:14:08 -07:00
Fernando Perez
f150b6f6a9 Fix all remaining imports that used IPython.frontend. 2013-06-27 11:14:07 -07:00
Fernando Perez
9858a93794 Fix all imports for the notebook. 2013-06-27 11:14:07 -07:00
Fernando Perez
20a015c1e6 Move frontend/html directory to top level. 2013-06-27 11:14:04 -07:00
Min RK
5a193bead5 Merge pull request #3456 from ivanov/noscript
Add notice for users who disable javascript
2013-06-24 15:26:02 -07:00
Paul Ivanov
df02517c93 use less.css for the style of the noscript message 2013-06-24 14:37:08 -07:00
Paul Ivanov
d57d6da8f0 Notice for users who disable javascript 2013-06-21 17:01:29 -07:00
Paul Ivanov
b76f839a9b fix cell execution in firefox, closes #3447
location.origin is specific to WebKit only. The fix is to use a
combination of location.protocol and location.host
2013-06-20 15:27:59 -07:00
Brian E. Granger
cfcc56b139 Merge pull request #3393 from minrk/bootstrap
[WIP] bootstrapify
2013-06-17 12:57:46 -07:00
MinRK
7f3f064067 compress menubar a few pixels vertically 2013-06-16 12:48:51 -04:00
MinRK
bff456dd49 menubar not full-width
let it hang from the header

match inner shadow on menubar container for symmetry
2013-06-16 12:40:57 -04:00
MinRK
5a932602b6 fix cell alignment by a few pixels 2013-06-15 18:07:24 -04:00
MinRK
d4a9cade35 reduce height of notification_widget by a few pixels 2013-06-15 15:34:32 -04:00
MinRK
3761f6270e add break between prompt and input in Rename dialog 2013-06-15 15:30:22 -04:00
MinRK
dea453be98 reduce horizontal padding for pager-container 2013-06-15 15:28:02 -04:00
MinRK
25f2f7406d use IPython border color for tree view 2013-06-15 15:25:09 -04:00
MinRK
2a063c6f5b process escapes in mathjax
allows  to enter dollar signs in markdown.
2013-06-13 15:21:18 -04:00
MinRK
9c755781ce tweak quick-help
- increase maximum height of dialogs
- toggle display of the help dialog, only create it once.
2013-06-13 11:16:23 -04:00
MinRK
427a4806cb specify end-space height in less 2013-06-13 10:51:15 -04:00
MinRK
236bbc8325 remove extra console.log 2013-06-13 10:46:30 -04:00
MinRK
df2b86d39c don't color delete buton 2013-06-13 10:44:06 -04:00
MinRK
1afda874eb fix cell toolbar 2013-06-12 22:43:59 -04:00
MinRK
41ff201dca fix raw_input
double-focus, size, and use `val()` instead of `attr("value")`
2013-06-12 22:26:30 -04:00
MinRK
a3dbdfeb52 bootstrapify notification widget 2013-06-12 13:31:18 -04:00
MinRK
76062a3940 use named tabs in tree 2013-06-11 12:11:55 -07:00
MinRK
a01f5590f8 fix tab hash / url behavior
clicking tabs sets hash, loading hash url implies tabs
2013-06-11 12:09:57 -07:00
MinRK
a453f8219b don't remove nav-tab border 2013-06-11 12:01:58 -07:00
MinRK
8a4e398b75 fix Invalid Password message location 2013-06-11 11:51:32 -07:00
MinRK
5ac293bb97 fix select alignment on FF 2013-06-11 11:45:20 -07:00
MinRK
f2b045b14d remove console.log 2013-06-11 11:36:57 -07:00
MinRK
167a734964 bootstrapify quickhelp 2013-06-11 11:26:21 -07:00
MinRK
b2d9b9beb8 bootstrapify delete dialog 2013-06-11 11:14:10 -07:00
MinRK
d1416665dc use row-fluid for cluster list 2013-06-11 11:04:53 -07:00
MinRK
7f3995eded use row-fluid for tree_list 2013-06-11 10:37:33 -07:00
MinRK
e5891be78c pager styling
fixes occasional hiding of top 16px of the header
2013-06-09 14:48:46 -07:00
MinRK
c4ad524cef inherit bootstrap properly
need *both* bootstrap and responsive in style.less, neither in page.html.
2013-06-09 14:48:46 -07:00
MinRK
638b30ff90 shrink navbars a little 2013-06-09 14:48:46 -07:00
MinRK
864ef914ae fight with bootstrap a little less in tree view 2013-06-09 14:48:46 -07:00
MinRK
0beb0a7828 add missing cell_type = "code"; 2013-06-09 14:48:46 -07:00
MinRK
265a8e7edb only put the notebook in a container
allows pager to be full-width
2013-06-09 14:48:46 -07:00
MinRK
116a461bce fix bad $(body) 2013-06-09 14:48:45 -07:00
MinRK
b67fff1d39 tweak header styling
use nabbers, so they are internally consistent
2013-06-09 14:48:45 -07:00
MinRK
0d94351fd5 disabile bootstrap's capitalized nav-header 2013-06-09 14:48:45 -07:00
MinRK
3d233ff22f fix wrong arrow direction 2013-06-09 14:48:45 -07:00
MinRK
9f2e3975b3 add missing dialog.js 2013-06-09 14:48:44 -07:00
MinRK
78199220da hide save status as it shrinks 2013-06-09 14:48:44 -07:00
MinRK
87a4a3827c tweak header 2013-06-09 14:48:44 -07:00
MinRK
251a94969b use responsive bootstrap 2013-06-09 14:48:44 -07:00
MinRK
d0b9e325b3 center login 2013-06-09 14:48:44 -07:00
MinRK
fa9b8b86bd ipython-main-app should be a bootstrap container 2013-06-09 14:48:43 -07:00
MinRK
b145150b52 bootstrap button output area 2013-06-09 14:48:43 -07:00
MinRK
970fab8dff tree style tweaks 2013-06-09 14:48:43 -07:00
MinRK
d79c0e7471 bootstrap dialogs 2013-06-09 14:48:43 -07:00
MinRK
aec9331c83 use components jquery-ui 2013-06-09 14:48:43 -07:00
MinRK
26528b108d don't use $(document).append (it's wrong and broken) 2013-06-09 14:48:42 -07:00
MinRK
24abe87de1 bootstrap tree 2013-06-09 14:48:40 -07:00
MinRK
4296134a41 shrink login button 2013-06-09 14:48:12 -07:00
MinRK
64f669dc69 bootstrap toolbar 2013-06-09 14:48:12 -07:00
MinRK
9da648b4d0 bootstrap menubar 2013-06-09 14:48:12 -07:00
MinRK
7de8d3debb jquery-ui.custom has been renamed 2013-06-09 14:48:12 -07:00
MinRK
b8bf0831f2 overriding baseLineHeight is not a good idea 2013-06-09 14:48:12 -07:00
MinRK
1ee1ce3b3c bootstrap base, auth 2013-06-09 14:48:11 -07:00
MinRK
bebc1a0460 start using bootstrap 2013-06-09 14:48:11 -07:00
Matthias Bussonnier
6938e76ccc Merge pull request #3364 from Carreau/requirejs
Inject requirejs in notebook and start using it.

Mainly because the behavior of Marked change when require is injected.
So only apply the modification needed for marked to behave.
2013-06-07 01:40:20 -07:00
Matthias Bussonnier
4469559b19 Merge pull request #3401 from minrk/rollbackcmcss
rollback #3358

#3358 was a workaround for a CodeMirror (actually Chrome seems to be the one at fault) bug drawing scrollbars over text, when there isn't anything to scroll. The workaround was a compromise, always drawing the space for the scrollbars to prevent the overlay, but reducing the margin so it isn't quite so annoying in the ~99% of the time that there are no scrollbars. It turns out (#3397, #3399) that the margins are not reliable, so the margin adjustment could cause the very same problem.

closes #3391, #3397, #3399

For users who need to hide the scrollbars while zooming text while we wait for a CodeMirror release, you can add the following to your custom.css:

.CodeMirror-scroll, .CodeMirror-wrap .CodeMirror-scroll {
 overflow: scroll;
}

.CodeMirror-vscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-hscrollbar {
   visibility: hidden;
}
or just put CodeMirror master in your profile's static/components directory.
2013-06-04 14:51:42 -07:00
Matthias Bussonnier
e066135a7c Merge pull request #3373 from minrk/cookiesecret
make cookie_secret configurable

Allows config to specify logins that survive across server instances (default behavior unchanged).

Add warning about not sharing config files with cookie secret.
2013-06-04 14:48:53 -07:00
MinRK
1f841c64e5 add note about sharing config files with cookie_secret 2013-06-04 14:37:19 -07:00
Matthias BUSSONNIER
9f229a8e1c Use {{static_url}} as require search root 2013-06-04 20:47:38 +02:00
MinRK
977b96ef1f rollback #3358
closes #3391

For users who need to hide the scrollbars while zooming text in the meantime, you can add the following to your custom.css:

```css
.CodeMirror-scroll, .CodeMirror-wrap .CodeMirror-scroll {
  overflow: scroll;
}

.CodeMirror-vscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-hscrollbar {
    visibility: hidden;
}
```
2013-06-04 11:22:49 -07:00
Matthias BUSSONNIER
66ff7dde48 de-require-config 2013-06-04 10:11:41 +02:00
Matthias Bussonnier
32ac1e9421 Merge pull request #3307 from minrk/wsproto
switch default ws_url logic to js side

In some cases (proxies, #3305), the request object doesn't have the right information about the originating information. This changes the default behavior, so that ws_url is generally empty by default, which the javascript takes to mean 'the same as http'. This is simpler and should be more resilient than trying a guess on server-side.

also replaces unused websocket_host with websocket_url

Rather than specifying only the hostname, it makes much more sense to specify the whole protocol,host,port in a single go.
2013-06-02 11:36:17 -07:00
Matthias BUSSONNIER
b52aa7e66d restore anchore on h2-h6 links 2013-06-02 18:19:39 +02:00
Matthias Bussonnier
ceef803109 Merge pull request #3369 from Carreau/auto-scroll
Use different treshold for (auto)scroll in output

Use different treshold for (auto)scroll in output
Allow, in particular to switch to scolling for longer input (or disable
it) by still keeping the possibility to manually toggle the output to
scroll.

cf jsdoc, 
OutputArea.auto_scroll_threshold
and
OutputArea.minimum_scroll_threshold

OutputArea.auto_scroll_threshold < 0 will prevent auto_scroll from ever happening.
2013-06-02 08:46:25 -07:00
Matthias Bussonnier
fea07e81ce Merge pull request #3370 from minrk/nonasciicp
used in comparison check for notebook name change.

Unless the filenames are normalized, unchanged names may result in false positives for a name change (e.g. OS X uses NFD on the filesystem, so u'\xfc' roundtripped to the filesystem will be u'u\u0308'), which can result in the first save of a notebook after open performing the following actions:

save the recently opened notebook
old_name != new_name, so name change detected
delete old_name (which is actually new_name), which ultimately deletes the just-saved notebook
In master, this has a symptom of the first checkpoint failing because the first save actually deleted the file, and you can't checkpoint a notebook that doesn't exist.

closes #3360
2013-06-02 08:43:20 -07:00
Matthias Bussonnier
874ee503cd Merge pull request #3372 from minrk/cookiename
base default cookie name on request host+port
2013-06-02 08:42:36 -07:00
Matthias Bussonnier
c7a13d15b8 Merge pull request #3378 from minrk/dragDropSafari
disable CodeMirror drag/drop on Safari
2013-06-02 08:40:49 -07:00
Matthias Bussonnier
a063c9a094 Merge pull request #3358 from minrk/cm-scroll
workaround spurious CodeMirror scrollbars
2013-06-02 08:39:07 -07:00
Matthias Bussonnier
3d57f9b0a0 Merge pull request #3371 from minrk/dirty-event
make setting the notebook dirty flag an event
2013-06-02 08:35:44 -07:00
MinRK
711edfaed9 use dirty event to set autosaved/unsaved changes
instead of last-saved timestamp
2013-05-31 21:42:49 -07:00
Matthias Bussonnier
665a7b9acc Merge pull request #3357 from minrk/heading-links
move anchor-link off of heading text
2013-05-30 10:02:31 -07:00
MinRK
d48409cdf6 use .text() instead of .html() 2013-05-30 09:59:16 -07:00
MinRK
7fb4e218dc toggle heading-link visibility with CSS alone 2013-05-30 09:47:48 -07:00
Matthias Bussonnier
17e4486de2 set autoscroll default back to 100 2013-05-30 09:08:01 +03:00
MinRK
438216ce5e replace unused websocket_host with websocket_url
Rather than specifying only the hostname, it makes much more sense
to specify the whole protocol,host,port in a single go.
2013-05-29 15:53:09 -07:00
MinRK
2b45d245a4 switch default ws_url logic to js side
In some cases (proxies, #3305), the request object doesn't have the right information about the originating information.  This changes the default behavior, so that `ws_url` is generally empty by default, which the javascript takes to mean 'the same as http'.  This is simpler and should be more resilient than trying a guess on server-side.
2013-05-29 15:53:04 -07:00
Matthias BUSSONNIER
0c6c87b446 document undefined behavior for 0 parameter 2013-05-29 11:19:19 +02:00
MinRK
f2138c0167 disable CodeMirror drag/drop on Safari
workaround for marijnh/CodeMirror#332

closes #3375
2013-05-28 22:43:22 -07:00
MinRK
f3a2d5fa27 remove unused is_typing js util 2013-05-28 14:16:39 -07:00
MinRK
4d8bbeb356 trigger dirty on CM change 2013-05-28 14:14:24 -07:00
MinRK
b0d0ed0505 make cookie_secret configurable
allows config to specify logins that survive across server instances (default behavior unchanged).

Depends on PR #3372
2013-05-28 13:34:08 -07:00
MinRK
78d5827c47 base default cookie name on request host+port
instead of random.

The random cookie name meant that every time you restarted the notebook it would get a new key in the cookie for the same host, resulting in an ever-growing cookie full of obsolete data.
2013-05-28 13:23:01 -07:00
Matthias BUSSONNIER
0c2dd44f8d rename scroll_threshold, add minimum_ prefix 2013-05-28 21:51:46 +02:00
MinRK
04726d2563 setting the notebook dirty flag is now an event
set_dirty.Notebook
2013-05-28 12:44:08 -07:00
MinRK
91c82dcfae add is_typing utility
simple, liberal check for whether a keypress is probably typing or not.
2013-05-28 12:43:03 -07:00
Matthias BUSSONNIER
84d9694a59 improve js documentation 2013-05-28 21:25:21 +02:00
MinRK
718bf61bd3 normalize unicode notebook filenames
used in comparison check for notebook name change.

Unless the filenames are normalized,
unchanged names may result in false positives for a name change
(e.g. OS X uses NFD on the filesystem,
so u'\xfc' roundtripped to the filesystem will be u'u\u0308'),
which can result in the first save of a notebook after open performing the following actions:

1. save the recently opened notebook
2. `old_name != new_name`, so name change detected
3. delete old_name (which is actually new_name), which ultimately deletes the just-saved notebook

In master, this has a symptom of the first checkpoint failing because the first save actually deleted the file, and you can't checkpoint a notebook that doesn't exist.

closes #3360
2013-05-28 11:47:05 -07:00
Matthias BUSSONNIER
ed22684ef2 Use different threshold for (auto)scroll in output
Allow, in particular to switch to scolling for longer input (or disable
it) by still keeping the possibility to manually toggle the output to
scroll.
2013-05-28 20:26:04 +02:00
Samuel Ainsworth
9bdeaee734 Reenable bracket matching 2013-05-28 10:48:27 -04:00
Matthias BUSSONNIER
fafb84e83c Inject requirejs in notebook and start using it. 2013-05-26 21:38:25 +02:00
MinRK
0cff42ffff move anchor-link off of heading text
avoids confusion about where to click, matching Sphinx-style output.

Moves the relevant style to textcell.less
2013-05-24 16:55:32 -07:00
MinRK
21a6e1f892 workaround spurious CodeMirror scrollbars
always draw scrollbar margin, so that inappropriate scrollbars never overlap the last line.
To compensate for the extra space, the margin between the scrollbar and the last line is shrunk significantly.
2013-05-24 16:54:56 -07:00
Fernando Perez
695d7af2a5 Merge pull request #3325 from ellisonbg/jsreorg
Organize the JS and less files by component, in the `static` directory of the notebook.

This PR does the client side re-org that parallels the server side work in #3321.  There are now subdirectories in `static/` for each part of the client; roughly speaking there is one subdir for each page, web service or component.
2013-05-24 15:19:34 -07:00