Matthias Bussonnier
a063c9a094
Merge pull request #3358 from minrk/cm-scroll
...
workaround spurious CodeMirror scrollbars
13 years ago
Matthias Bussonnier
3d57f9b0a0
Merge pull request #3371 from minrk/dirty-event
...
make setting the notebook dirty flag an event
13 years ago
MinRK
711edfaed9
use dirty event to set autosaved/unsaved changes
...
instead of last-saved timestamp
13 years ago
Matthias Bussonnier
665a7b9acc
Merge pull request #3357 from minrk/heading-links
...
move anchor-link off of heading text
13 years ago
MinRK
d48409cdf6
use .text() instead of .html()
13 years ago
MinRK
7fb4e218dc
toggle heading-link visibility with CSS alone
13 years ago
Matthias Bussonnier
17e4486de2
set autoscroll default back to 100
13 years ago
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.
13 years ago
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.
13 years ago
Matthias BUSSONNIER
0c6c87b446
document undefined behavior for 0 parameter
13 years ago
MinRK
f2138c0167
disable CodeMirror drag/drop on Safari
...
workaround for marijnh/CodeMirror#332
closes #3375
13 years ago
MinRK
f3a2d5fa27
remove unused is_typing js util
13 years ago
MinRK
4d8bbeb356
trigger dirty on CM change
13 years ago
MinRK
b0d0ed0505
make cookie_secret configurable
...
allows config to specify logins that survive across server instances (default behavior unchanged).
Depends on PR #3372
13 years ago
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.
13 years ago
Matthias BUSSONNIER
0c2dd44f8d
rename scroll_threshold, add minimum_ prefix
13 years ago
MinRK
04726d2563
setting the notebook dirty flag is now an event
...
set_dirty.Notebook
13 years ago
MinRK
91c82dcfae
add is_typing utility
...
simple, liberal check for whether a keypress is probably typing or not.
13 years ago
Matthias BUSSONNIER
84d9694a59
improve js documentation
13 years ago
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
13 years ago
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.
13 years ago
Samuel Ainsworth
9bdeaee734
Reenable bracket matching
13 years ago
Matthias BUSSONNIER
fafb84e83c
Inject requirejs in notebook and start using it.
13 years ago
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
13 years ago
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.
13 years ago
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.
13 years ago
MinRK
bb4228d4e5
remove outline from heading-anchor links
13 years ago
MinRK
bf97e27c22
don't hardcode output_area pre background
...
set it to transparent, thus inheriting from the parent div.
13 years ago
MinRK
87b6761601
only round CM-gutter corners on outer (left) edge
13 years ago
MinRK
70a43227f3
fix login page override css
...
just centers form, rather than allowing it to wrap weirdly
13 years ago
Brian E. Granger
a216b0a2bd
Fixing path to custom.css in comment.
13 years ago
Brian E. Granger
8097590f35
Fixing code/pre styles in rendered HTML/
13 years ago
Brian E. Granger
5db6f60336
Removing one level uf subdirs in static/custom.
13 years ago
Brian E. Granger
747dd7ab2b
Creating services directory under static for kernels and friends.
13 years ago
Brian E. Granger
5c0a8bb381
Fixing CM3 line numbers for cells.
13 years ago
Brian E. Granger
36335a3d78
Splitting notebook.less into separate files.
13 years ago
Brian E. Granger
7227074946
Fixing monospace style vars.
13 years ago
Brian E. Granger
4036f7d24f
Turing style of tooltip.
13 years ago
Brian E. Granger
ea1a7accd8
Fixing global less vars to use bootstrap.
13 years ago
Brian E. Granger
47fb1b7c25
Fixing pager style.çy
13 years ago
Brian E. Granger
380f37ce34
Updating notebook.less to use baseLineHeight from variables.
13 years ago
Brian E. Granger
9d3187bb6d
Fixing styles by overriding bootstrap.
13 years ago
Brian E. Granger
7e0bd8f960
Creating override.css for each page.
...
This css file should only have temporary hack until we fix
out global styles. Don't add anything new to these files.
13 years ago
Brian E. Granger
6b8c543fae
Renaming notebooks->notebook in less and templates.
13 years ago
Brian E. Granger
f079104b8a
Renaming notebooks->notebook on client side.
13 years ago
Brian E. Granger
9136300198
Playing with the order of less imports.
13 years ago
Brian E. Granger
1a74c2c0a6
Moving static/user to static/custom to prevent future conflicts.
13 years ago
Brian E. Granger
ba974a28f7
Adding style.less to each subdir - but still use global style.less
13 years ago
Brian E. Granger
50b8059093
Finishing conversion of templates to use single style.*.
13 years ago
Brian E. Granger
baef1892b0
Updating fabfile and templates for global style.min.css.
13 years ago
Brian E. Granger
4da176975f
Fixing less variable names to use_the_right_convention.
13 years ago
Brian E. Granger
121ecb1913
Going back to a single style.less and style.min.css.
13 years ago
Brian E. Granger
ee89627da3
Adding files that I mised in the last commit.
13 years ago
Brian E. Granger
7140e3045e
Renaming main JS files.
13 years ago
Brian E. Granger
81d5049705
Putting custom.css/custom.js in static/user.
13 years ago
Brian E. Granger
222f8b1848
Adding link to new location of favicon.ico.
13 years ago
Brian E. Granger
57196dabdb
Wrok on static/tree
13 years ago
Brian E. Granger
a1751a5539
Cleaning up less/css.
13 years ago
Brian E. Granger
6d39d633b6
More work on the less setup.
13 years ago
Brian E. Granger
926e60c5ea
Moving js/less/css dirs up one level. Too much nesting.
13 years ago
Brian E. Granger
267be96a2e
Changes to templates.
13 years ago
Brian E. Granger
a35b7a7e81
More movign around of things in notebook and js/less.
13 years ago
Brian E. Granger
08fba69314
Moving js files into subdirs.
13 years ago
Brian E. Granger
32c9cf4aad
Moving files inside js folder.
13 years ago
Brian E. Granger
e8d285af3c
Working on cleaning up our less files.
13 years ago
Brian E. Granger
92542f1c1f
More renaming of less files.
13 years ago
Brian E. Granger
27e8947e79
Reorg of the js/less/css files.
13 years ago
MinRK
6b58918a63
fix default cluster count
13 years ago
Matthias Bussonnier
60b35be373
Merge pull request #3333 from t-8ch/patch-1
...
notebookapp: add missing whitespace to warnings
13 years ago
Brian E. Granger
5f9e6f02f1
Updating more imports.
13 years ago
Brian E. Granger
c9d167e78c
Updating imports.
13 years ago
Brian E. Granger
d2100bdc06
Fixing imports for frontend tests.
13 years ago
Brian E. Granger
abeed98476
Moving web services into a subdir.
13 years ago
Brian E. Granger
105553e7b1
Fixing minor import error.
13 years ago
Brian E. Granger
8d8c2f6e5b
Updating tests for refactor.
13 years ago
Brian E. Granger
55243f1c1b
Refactor notebookapp __init__ method.
13 years ago
Brian E. Granger
d3a3adf668
Removing dup import.
13 years ago
Brian E. Granger
a1d2d864a0
Moving base ZMQ handlers to base/zmqhandlers.py.
13 years ago
Brian E. Granger
e1c3f81349
Renaming templates to match other names.
13 years ago
Brian E. Granger
428b727b1a
Renaming api handlers and moving FileFindHandler into base handlr.
13 years ago
Brian E. Granger
f17c77eba0
Updating import statements after moving notebook files around.
13 years ago
Brian E. Granger
6b7fd467ee
Reorganizaing the server side of the notebook.
13 years ago
Brian E. Granger
5359f7c99b
More work on the handlers
13 years ago
Brian E. Granger
f0fb443fd4
Removing debug message.
13 years ago
Brian E. Granger
a809db93b1
Fixing url join problems.
13 years ago
Brian E. Granger
0b28fde1b8
Adding __init__.py
13 years ago
Brian E. Granger
6f891eeb6e
Splitting handlers into different files.
...
I have also created a top-level utils.py for notebook related stuff
13 years ago
Brian E. Granger
3155653f6d
Adding new files.
13 years ago
Brian E. Granger
d9e629d87a
Moving handlers to subdir
13 years ago
Matthias Bussonnier
2112c51b7f
Merge pull request #3294 from Carreau/jsfix
...
fix callbacks as optional in js kernel.execute
13 years ago
Matthias Bussonnier
d9d300de39
Typo : optionnal -> optional
13 years ago
Brian E. Granger
fa872236a2
Merge pull request #3275 from minrk/submodule-hooks
...
improve submodule messages / git hooks
13 years ago
Brian E. Granger
a861725303
Merge pull request #3239 from eteq/easy-close-pager
...
Allow "x" icon and esc key to close pager in notebook
13 years ago
Matthias BUSSONNIER
40b760d836
fix callbacks as optional in js kernel.execute
...
plus some doc fixes.
Mainly to fix some backward compatibility with examples here and there.
13 years ago
Erik Tollerud
c2e199abb8
use alternate method to collapse pager from notebook.js as suggested by @Carreau
13 years ago
Thomas Weißschuh
44f5fd3d87
notebookapp: add missing whitespace to warnings
13 years ago
MinRK
9b22138a9b
use highlevel in notebook log format
...
datefmt no longer necessary
13 years ago
MinRK
19c6442a7d
check submodules when starting the notebook server
...
shows a warning (not an error) if components are out of date.
13 years ago
MinRK
4b5ba71307
protect highlight.js against unknown languages
...
falls back on autodetect if specified language fails (e.g. unrecognized language).
closes #3268
13 years ago
MinRK
7782dfcb4e
add missing return
...
closes #3260 (again)
13 years ago
Brian E. Granger
d3da03069d
Merge pull request #3101 from minrk/marked
...
use marked / highlight.js instead of pagedown and prettify
13 years ago
MinRK
8df01f22aa
finish removing prettify
13 years ago
MinRK
796fb5d0a8
unify highlight.js / codemirror style
13 years ago
MinRK
6ac2bdf086
use highlight.js to highlight markdown code blocks
13 years ago
MinRK
b6c390db06
use marked for markdown
13 years ago
MinRK
70dd6e1612
fix set_last_checkpoint when no checkpoint
...
closes #3260
13 years ago
MinRK
e1f4d0a85f
fix a few URLs from previous PR
...
some of the URLs in the submodules PR were not updated
13 years ago
Brian E. Granger
4a654d1c29
Merge pull request #3240 from minrk/submodules
...
remove js components from the repo
13 years ago
MinRK
2cf93510f8
use less from components
13 years ago
MinRK
317debce06
remove unused components
...
remove command from fabfile
components live in a submodule
13 years ago
MinRK
8b5e5a5e09
restore checkpoints in a sub-list
...
minor styling update to the restore dialog as well
13 years ago
MinRK
c1b19755fd
rename shouldn't create a checkpoint
13 years ago
MinRK
46093157d7
deleting a notebook deletes its checkpoints
...
also cleanup a few log messages
13 years ago
MinRK
a3c99d94bb
add checkpoint status to notebook header
...
autosave is also there, but once the dirty flag is an event,
this should stop having the date, and just become 'autosaved / unsaved changes'
13 years ago
MinRK
030c547e58
fix Location headers
13 years ago
MinRK
1f82c03dd2
Save and Checkpoint
13 years ago
MinRK
53ac962d1a
sync with previous handler changes
...
use IPythonHandler, avoid self.application
13 years ago
MinRK
a99a07f10b
only save on close if autosaving
13 years ago
MinRK
01bba482a9
*all* user-initiated saves create a checkpoint
13 years ago
MinRK
8ca57a1779
s/autosave_notebook/set_autosave_interval/
13 years ago
MinRK
80bba145d5
set default autosave interval to two minutes
13 years ago
MinRK
2fe8a9b2cd
only autosave when dirty
13 years ago
MinRK
dd77790a00
add autosave timer
...
autosave interval is tuned based on the duration of saves.
Autosave will never happen more frequently than every 30 seconds,
and if saves take more than 3 seconds, autosave will fire every 10x the duration of the save (i.e. if save takes 6 seconds, it will be every 60 seconds, etc.)
13 years ago
MinRK
6da01bf362
trigger autosave on tab/window close
...
instead of "please don't leave!"
13 years ago
MinRK
e119a6469b
add Revert to the menu bar
13 years ago
MinRK
5bc55ba984
add some checkpoint messages to the notification area
13 years ago
MinRK
db413fadbf
expose notebook checkpoints in html/js
...
- cmd-S does a plain save
- ^M-s does checkpoint
- add save checkpoint to File menu
- save button in bar does checkpoint
13 years ago
MinRK
985289e113
checkpoint info is a dict
...
two keys: checkpoint_id and last_modified
13 years ago
MinRK
dd234bbc93
add ModifyCheckpoints handler
...
separates requests that change specified checkpoint IDs from those that do not.
13 years ago
MinRK
62d61cbbc0
add notebook checkpoint handler
13 years ago
MinRK
c4ac8eee36
add checkpoint API to FileNBManager
13 years ago
Min RK
6be220da56
Merge pull request #3235 from ellisonbg/removeprint
...
Remove the unused print notebook view
13 years ago
Brian E. Granger
56e4759813
Merge pull request #3238 from ellisonbg/tabstyle
...
Improve the design of the tab completion UI
13 years ago
Brian E. Granger
5cc0897dd6
Fixing styling of context type completions.
13 years ago
Erik Tollerud
180f465f16
Collapse -> Close in button description as suggested by @fperez
13 years ago
MinRK
1390270968
use components from external submodule
13 years ago
Erik Tollerud
13b2cadd8b
changed ESC to trigger collapsing of the pager in notebook
13 years ago
Erik Tollerud
aafec25d34
Added clickable icon to collapse pager
...
Closes #3196
13 years ago
MinRK
09adbd4e32
remove components
13 years ago
Brian E. Granger
d9668cdb78
Merge pull request #3190 from minrk/image_size
...
allow formatters to specify metadata
13 years ago
Brian E. Granger
e149319692
Removing print notebook from style.less.
13 years ago
Brian E. Granger
1494b484b6
Removing print handler and URL regepx.
13 years ago
Brian E. Granger
a2c8215947
Removing print handler.
13 years ago
Brian E. Granger
51a897d87c
Removing stale call to print view in JS.
13 years ago
Brian E. Granger
abaafd2363
Removing old autogrow JS code.
13 years ago
Brian E. Granger
93f5f67d37
Updating box-shadows to proper bootstrap less function.
13 years ago
Brian E. Granger
49faf2c939
Improving the tab completion UI/design
13 years ago
MinRK
034331c3fa
support display_pub metadata in js frontend
13 years ago
Brian E. Granger
e77e2fe409
Fixing indentation in fabfile.py.
13 years ago
Brian E. Granger
3e08874316
Adding README.md about notebook development.
13 years ago
Brian E. Granger
bdf1cefac5
Put back the components fab function as we can still use it.
13 years ago
Brian E. Granger
8dbc143512
Fix CM related sizing issues for completer and tooltip.
13 years ago
Brian E. Granger
9d2da9e28f
Removing old codemirror assets - we now use the 1 in components.
13 years ago
Brian E. Granger
c83c0449d5
Fixing CM3 style related issues.
...
CM3 introduced a number of changes to how various paddings are set.
Because of how we change the line-height we had to set these back
to the CM2 values. What a pain!
13 years ago
Brian E. Granger
40617eb340
Give the .CodeMirror class no background so ours shows through.
13 years ago
Brian E. Granger
68dd1370ac
Fixing broken URLs to CM assets.
13 years ago
Brian E. Granger
29a1296ef6
Changing mode name from python -> ipython.
13 years ago
Brian E. Granger
137a40ac96
Fixing typo in ntoebook.html.
13 years ago
Brian E. Granger
222a4f61df
Updating ipython CM mode.
13 years ago
Brian E. Granger
ea4eb9b351
Copying CodeMirror's python mode into place for our ipython mode.
13 years ago
Brian E. Granger
d2460ee0c5
Add components to static URLs.
13 years ago
Brian E. Granger
72d7b6ff39
Updating tooltip.less for CM3 behavior.
13 years ago
Brian E. Granger
6e08dc37fa
In CM3, the class that needs autogrow has changed.
13 years ago
Brian E. Granger
c666acbe5e
Updating tooltip.js to work with CM3.
13 years ago
Brian E. Granger
ed8d859d66
Updating path to codemirror.
13 years ago
Brian E. Granger
85908b1765
Moving cmtemp -> codemirror.
13 years ago
Brian E. Granger
154df41ac3
Moving CodeMirror -> cmtemp
13 years ago
Brian E. Granger
a36d867882
Removing tests from fabfile that are no longer needed.
13 years ago
Brian E. Granger
836f68e4ad
Adding our current components directory.
...
This commit adds the right versions of:
* Bootstrap
* Jquery
* less.js
* CodeMirror
We should always use bower to manage these packages in the
future. BUT, we are not yet using this version of jquery as
we still rely on an older crazy-branch version of jquery.ui.
13 years ago
Brian E. Granger
b5ad7db080
The HTML output type accidentally got removed from the OutputArea.
...
This commit adds it back at the approp. point in the
OutputArea.display_order.
13 years ago
Fernando Perez
7da43f8ebb
Merge pull request #3226 from ellisonbg/renamedialog
...
Text in rename dialog was way too big - making it <p>.
13 years ago
Brian E. Granger
3a515880ae
Text in rename dialog was way too big - making it <p>.
13 years ago
Brian E. Granger
e416cb8658
Removing old restuctured text handler and web service.
13 years ago
MinRK
82f0f359ac
add missing mathjax_url to new settings dict
13 years ago
Brian E. Granger
41ffe3d027
Merge pull request #3089 from minrk/stdin
...
add stdin to the notebook
13 years ago
MinRK
43eb765793
js comment about session id in first message
13 years ago
MinRK
f51425ed28
clarify first ws message names / messages
13 years ago
MinRK
938a5b5dbc
tweak raw_input style
...
more crowded, less jumpy
13 years ago
David Wyde
11b72681e2
Remove references to HTMLCell (dead code).
13 years ago
MinRK
ba79b60c35
fix color in raw_input
13 years ago
MinRK
3fbb99e61a
add no-op on_message for iopub
13 years ago
MinRK
31c8fb1fb6
tweak raw-input styling
...
should fix alignment of raw_input and prompt
13 years ago
MinRK
f09eaf7b5e
cleanup stdin event submission
...
follow example in rename notebook: remove form, bind keydown for enter,
avoiding shift-enter submitting the cell again.
13 years ago
MinRK
5b434b705f
use inline raw_input instead of a dialog
13 years ago
MinRK
f38f2b7ac4
add stdin to notebook
...
dumb / gross / ugly jQuery modal dialog for now,
but it works!
13 years ago
MinRK
74f8972505
specify socket identity from kernel.js
...
required for stdin routing
13 years ago
MinRK
510897f0aa
add stdin channel to NotebookApp
13 years ago
MinRK
f4b937767e
share code between zmq channel handlers
13 years ago
Brian E. Granger
0d6676f340
Merge pull request #3088 from minrk/nbsettings
...
cleanup IPython handler settings
13 years ago
MinRK
217e38f102
hook up proper loggers
...
use IPython logger as first choice, fall back on tornado logger
(for use in non-IPython apps).
13 years ago
Brian E. Granger
646dcf77a4
Merge pull request #3201 from minrk/fastcolor
...
use much faster regexp for ansi coloring
13 years ago
MinRK
8c5a44813c
hook up tornado 3's loggers to our handlers
13 years ago
MinRK
f0f0843cf2
define clear_cookie on websocket handler
...
as a no-op
13 years ago
MinRK
f887f050aa
cleanup IPython handler settings
...
move settings to the tornado settings dict,
rather than a mixture of tornado settings and application references,
and application.ipython_app references.
removes any reference to application / ipython_app attributes in the handlers,
in favor of the tornado settings dict.
These were a massive pain for anyone who might want to re-use our handlers.
13 years ago
Brian E. Granger
13032d01ba
Merge pull request #3011 from minrk/kernelclient
...
IPEP 12: add KernelClient
13 years ago
Min RK
2e5e595359
Merge pull request #3174 from Carreau/simple-class
...
Simple less classes
Simplify class handeling in js/css
Instead of setting several class (e.g: `cell vbox`) per dom element, use less to embed the definition of `vbox` into `cell`.
This should allow :
- more easy theming.
- responsive css on nbviewer
There are many other places where this can be done.
13 years ago
Min RK
6ce1901e83
Merge pull request #2979 from Carreau/cm-configurable
...
CM configurable Take 2
Change the way configurability works.
Config dict should be passed down to the parent class where it will be
merged with the default value and propagate to this only in the base
class.
This allow to both alter the configuration on a per instance basis, or
globaly by tempering with the class instance.
This also get rid of IPython global in some cases.
--
Still not **perfect** but I think this is the limit of my js knowledge, there is a minimal amount of code of 4 line to propagate the configuration :
```
var options = {foo:bar}; // default options can be class parameter
var overwrite_options ={boo:baz}; // came from args, or not
options = this.mergeopt(CodeCell, options, overwrite options);
IPython.Cell.apply(this,[options]);
```
13 years ago
Min RK
33e4fdb600
Merge pull request #3181 from minrk/ifsince
...
backport If-Modified-Since fix from tornado
See facebook/tornado#713
closes #3177
13 years ago
MinRK
08cbf96075
don't restart channels on kernel restart
...
it wasn't actually necessary (proper fix in previous commit)
13 years ago
MinRK
e854617caf
restart channels on kernel restart
...
generally not necessary, but sometimes the kernel connection can be dirty.
We have only seen this by starting a qtconsole via %qtconsole,
then killing the kernel, at which point the original notebook's connection
(at the zmq level) is never restored to the new kernel at the same endpoint.
It's weird, and probably a zmq bug, but a simple reconnect seems to solve it.
13 years ago