Commit Graph

5300 Commits

Author SHA1 Message Date
Bussonnier Matthias
df418c6a62 fix restore checkpoint add an empty cell 2014-12-16 14:04:20 +01:00
Matthias Bussonnier
449384e85f Merge pull request #7224 from jasongrout/fix-toolbarjs
Fix javascript iteration through array
2014-12-16 11:51:26 +01:00
Matthias Bussonnier
7eb4d1b84d Merge pull request #7225 from Carreau/fix-actions
fix leading underscore
2014-12-16 11:37:57 +01:00
Matthias Bussonnier
efbe695523 Merge pull request #7226 from takluyver/win-sleep-session-tests
Add a brief sleep after shutting down sessions in test teardown
2014-12-16 10:33:53 +01:00
Matthias Bussonnier
420f2337de Merge pull request #7195 from Carreau/manager
generalise manager
2014-12-16 09:37:07 +01:00
Jonathan Frederic
ab1fca9fdb Prevent the page from jumping on tree tab change 2014-12-15 16:30:23 -08:00
Jonathan Frederic
a485fe42ea s/Notebooks/Files 2014-12-15 16:07:45 -08:00
Jonathan Frederic
d9346c002d invoke css 2014-12-15 13:39:28 -08:00
Jonathan Frederic
9e67a34891 Bubble event and implement logic in CodeCell 2014-12-15 13:30:59 -08:00
Matthias Bussonnier
5829ceacb9 s/Json/JSON/g **/*.py 2014-12-15 21:54:54 +01:00
Thomas Kluyver
0178e2add0 Add a brief sleep after shutting down sessions in test teardown
This fixes a test failure for me on my Windows VM. See the comment for
details.
2014-12-15 12:45:45 -08:00
Matthias Bussonnier
420fee5e4c Merge pull request #7163 from jdfreder/refresh-persist
Persist widgets across page refresh
2014-12-15 21:01:14 +01:00
Thomas Kluyver
b408a9bf74 Merge pull request #7167 from minrk/less-2
pin less to 2.x
2014-12-15 11:40:46 -08:00
Jonathan Frederic
2d40eb30d4 Make sure comm-dead is applied to the top widget view class
in all cases where the kernel disconnects.
2014-12-15 11:25:31 -08:00
Min RK
26136f44d2 Merge pull request #7088 from Carreau/kernel.js
Load the per kernel kernel.js and kernel.css
2014-12-15 10:33:35 -08:00
Min RK
420b98dfee Merge pull request #7177 from Carreau/valid-html
Valid html
2014-12-15 10:32:20 -08:00
Bussonnier Matthias
737064d9db fix leading underscore
mering object with itself is stupid otherwise
2014-12-15 18:50:44 +01:00
Jason Grout
efc1fee242 Fix javascript iteration through array
for(var k in config) was assigning k to the properties of Array, not just the numeric indices

the second argument of add_buttons_group, k[1], should be config[k][1]
2014-12-15 17:38:03 +00:00
Matthias Bussonnier
031252d44f Merge pull request #7207 from takluyver/rm-nb-user-config
WIP: Remove js user_config module
2014-12-15 17:17:04 +01:00
Matthias Bussonnier
3a16eed2aa Merge pull request #7204 from jasongrout/widget-warning2
Make the widget warning brief and easy to filter
2014-12-15 17:13:59 +01:00
Matthias Bussonnier
791676006d Merge pull request #7186 from minrk/moment
moment.js-related fixes
2014-12-15 17:11:41 +01:00
Thomas Kluyver
95e60a544c Update test to modify class config for default_cell_type 2014-12-14 15:21:38 -08:00
Kyle Kelley
4f4e14342b Merge pull request #7172 from Carreau/sort-dashboard
Sort dashbord list in frontend
2014-12-14 14:43:59 -06:00
Matthias Bussonnier
4bd9ac7882 Add json in the base config manager name 2014-12-14 13:21:33 +01:00
Bussonnier Matthias
6f38f7b014 generalise manager 2014-12-14 13:20:04 +01:00
Min RK
7c8f2fd0f5 fix widget-import-warning test
wasn't updated with warning changes
2014-12-13 16:03:03 -08:00
Brian E. Granger
bd57d219fc Merge pull request #7199 from takluyver/python-logo
Use Python logo for IPython kernel
2014-12-12 20:13:59 -08:00
Thomas Kluyver
7f221537d4 Fix default_cell_type option for notebook 2014-12-12 16:52:20 -08:00
Thomas Kluyver
938630b475 Remove user_config js module 2014-12-12 16:48:47 -08:00
Jason Grout
c73933fe90 Make the widget warning easier to catch by specifying the module. 2014-12-13 00:09:43 +00:00
Jason Grout
5c24d8dfb1 Change IPython widget warning to get rid of filenames and line numbers
We do this to not confuse the interactive user
2014-12-12 23:57:17 +00:00
Thomas Kluyver
e51f3ff8d5 Merge pull request #7187 from minrk/utils-js
various fixes in utils.js
2014-12-12 14:48:35 -08:00
Thomas Kluyver
27ad247f9d Enlarge Jupyter logo to 28px height 2014-12-12 14:31:48 -08:00
Nathan Heijermans
408e3fa557 Backing out all changes to the UI and notebook.js.
Updated kernel.js to trigger the ``received_unsolicited_message.Kernel`` event instead. Notebook extensions can handle the event in whatever way they deem appropriate.

A notebook extension that takes advantage of this is available at https://github.com/nheijermans/nbexts.git.
2014-12-12 17:09:44 -05:00
Brian E. Granger
27144e51ff Merge pull request #7162 from jdfreder/persist-fixes
Widget persistence fixes
2014-12-12 13:06:41 -08:00
Brian E. Granger
e090b609d1 Merge pull request #7169 from jdfreder/pager-style
Make the new pager look better
2014-12-12 12:47:09 -08:00
Jonathan Frederic
12366e8e8d Clean up comments 2014-12-12 12:43:57 -08:00
Jonathan Frederic
1e0acbeb31 Write a plugin to handle private function automatically. 2014-12-12 12:43:57 -08:00
Jonathan Frederic
c703b3f3f5 Some clean-up 2014-12-12 12:43:57 -08:00
Jonathan Frederic
beb5ea6deb Make sure every function appears in the Notebook class. 2014-12-12 12:43:57 -08:00
Jonathan Frederic
d756816e2b Some typo fixes 2014-12-12 12:43:57 -08:00
Jonathan Frederic
5802309151 Make notebook.js jsdoc compatible 2014-12-12 12:43:57 -08:00
Jonathan Frederic
1aa280d9c9 Start JSDoc integration 2014-12-12 12:43:56 -08:00
Min RK
6661a0a301 fix regular checkpoint updates in notebook
in master, this was updating every 10 hours,
regardless of the value, due to a variety of bugs,
including using relativeTimeThreshold getters
that do not exist in moment.js 2.7.
2014-12-12 12:40:56 -08:00
Min RK
b11fe93abb add utils.time
consolidate some time-related utils, used in save widgets
2014-12-12 12:40:56 -08:00
Min RK
982a742112 Merge pull request #6700 from Carreau/actions-2
Use notebook actions in toolbar
2014-12-12 12:39:46 -08:00
Brian E. Granger
e61188a4c8 Merge pull request #7201 from jasongrout/widget-warning
Make the widget error message shorter and more understandable.
2014-12-12 12:19:03 -08:00
Jason Grout
e489718d5c Make the widget error message shorter and more understandable. 2014-12-12 20:12:53 +00:00
Thomas Kluyver
7454b25dc0 Probably don't need text styles on an img tag 2014-12-12 12:02:16 -08:00
Brian E. Granger
8ea37a4b2b Merge pull request #7200 from jasongrout/widget-warning
Make the widget experimental error a real python warning
2014-12-12 11:24:53 -08:00
Min RK
42a92d4794 Merge pull request #6896 from minrk/save-hooks
Proposal: add pre/post-save hooks
2014-12-12 11:14:18 -08:00
Jason Grout
c8d70e0603 Make the widget experimental error a real python warning
This means it can easily be turned off too.
2014-12-12 19:10:37 +00:00
Min RK
cadd5a14fe Merge pull request #6747 from jdfreder/combofix
Make Selection widgets respect values order.
2014-12-12 10:59:01 -08:00
Jonathan Frederic
ab409d1966 Hide variables that shouldn't be exposed to the user 2014-12-12 07:51:03 -08:00
Jonathan Frederic
45eadcd06c invoke css 2014-12-12 07:43:00 -08:00
Bussonnier Matthias
9a6f282129 do not try to fix mathjax URl 2014-12-12 16:27:48 +01:00
Bussonnier Matthias
cd67e1aca7 return elements instead of append them directly
+ jshint fixes
2014-12-12 16:19:39 +01:00
Bussonnier Matthias
8fc6d2ff1f saving notebook does not run cell.
Thus running cell instead of saving notebook
2014-12-12 16:14:21 +01:00
Bussonnier Matthias
89edf7c099 fix ordering dirs > notebook> files 2014-12-12 15:56:26 +01:00
Bussonnier Matthias
59f5b9199d just indent everythin twice 2014-12-12 15:40:29 +01:00
Bussonnier Matthias
1b2305c475 emit valid html:
Not closed div, <a> don't have alt but title, chrome frame has been
closed for at least a year, IE shoudl use edge mode. div cannot embed
span.
2014-12-12 15:28:51 +01:00
Min RK
1512598b83 various fixes in utils.js
revealed by linters

- remove duplicate WrappedError definition
- regex_split doesn't actually allow string separator
- remove various unused variables
- fix some incorrect regex escaping
- add missing quotes in $('body')
- remove a `for(attr in object)` because javascript
2014-12-11 16:21:53 -08:00
Jonathan Frederic
c5de028039 invoke css 2014-12-11 13:55:36 -08:00
Jonathan Frederic
12ef806b58 Thinner handle, single handlebar 2014-12-11 13:55:11 -08:00
Thomas Kluyver
0f2f14556c Note that extension API is experimental 2014-12-11 11:52:24 -08:00
Thomas Kluyver
7e7d3d1f25 Rename extensions -> server_extensions 2014-12-11 11:50:36 -08:00
Thomas Kluyver
e86d80e84a Add support for notebook server extensions
As some people may be tiring of my pointing out, it seems strange that
we have extension points for the JS and the kernel, but none for the
notebook server.

For cite2c, I want to add a handler which can serve a directory of style
files for use by the nbextension part.
2014-12-11 11:50:36 -08:00
Bussonnier Matthias
09b4d91ad0 sort dashbord in frontend 2014-12-11 17:08:13 +01:00
Bussonnier Matthias
07c6dd8b5d move setting nb.kernelselector inside kernelselector itself 2014-12-11 10:11:21 +01:00
Bussonnier Matthias
7a3a61fe81 make pseudo action in their own dcit.
make test more reliable by adding data-attributes to buttons.
2014-12-11 09:58:04 +01:00
Bussonnier Matthias
08dbdb1640 note to self 2014-12-11 09:19:50 +01:00
Matthias Bussonnier
199483b82d fix rebase after kill of layout manager 2014-12-11 09:18:59 +01:00
Jonathan Frederic
c897b66031 invoke css 2014-12-10 16:51:29 -08:00
Jonathan Frederic
eb34a4c6c2 Add shadow to pager handle 2014-12-10 16:51:02 -08:00
Jonathan Frederic
d5a4739636 invoke css 2014-12-10 14:58:10 -08:00
Jonathan Frederic
9879a3c16c Make the pager look better 2014-12-10 14:57:51 -08:00
Thomas Kluyver
f2e1b6f65f Merge pull request #7145 from minrk/type____
ContentsManager type kwarg to match model key
2014-12-10 14:28:32 -08:00
Min RK
16d06a7f1d pin less to 2.x
1.7.x causes different results, and it's probable that 3.x will as well.

It might even be appropriate to pin to 2.1.x.
2014-12-10 13:19:21 -08:00
Jonathan Frederic
b1b88a7855 Merge pull request #7147 from jdfreder/print
Meta-p for print
2014-12-10 12:35:55 -08:00
Jonathan Frederic
3b11cc66a7 Make widgets persist across page refresh 2014-12-10 12:29:28 -08:00
Jonathan Frederic
272f281b03 Merge pull request #7161 from jdfreder/promise_fix
Another widget promise bug fix
2014-12-10 12:21:27 -08:00
Jonathan Frederic
3d9e43f0c4 Fix persistence API,
it expecited a view dictionary not a dictionary of view promises
2014-12-10 12:08:22 -08:00
Matthias Bussonnier
2d51cec3c8 adresses Min comments x2 2014-12-10 20:58:01 +01:00
Bussonnier Matthias
fc6f562317 complete unicode mac symbol 2014-12-10 20:51:02 +01:00
Bussonnier Matthias
e292a82dff Fix comments
move humanize-map out of function call to have only one instance
2014-12-10 20:51:01 +01:00
Bussonnier Matthias
5be62ba538 fix john coments 2014-12-10 20:51:01 +01:00
Matthias Bussonnier
f43d8585d1 Add notion of actions to celltoolbar
modify toolbar.js to be able to deal with actions.

modify maintoolbar to deal with the new action architecture

add a way to triger notification widget hiding
2014-12-10 20:51:01 +01:00
Matthias Bussonnier
f1a167ee19 add an humanize function that prettify shortcut on macos 2014-12-10 20:47:34 +01:00
Thomas Kluyver
4dd8efd043 Merge pull request #7160 from minrk/toolbar-layout
remove references to defunct layout_manager in ToolBar
2014-12-10 11:28:44 -08:00
Jonathan Frederic
88d8d85987 Another widget promise bug fix 2014-12-10 11:23:35 -08:00
Jonathan Frederic
51fc7241da Another widget promise bug fix 2014-12-10 11:14:10 -08:00
Jonathan Frederic
73637fb694 Merge pull request #7097 from jasongrout/widget-visibility
Expand the semantics of the widget visible attribute to allow for visibility: hidden
2014-12-10 10:54:15 -08:00
Jonathan Frederic
4842d48ace invoke css 2014-12-10 10:51:00 -08:00
Jonathan Frederic
bdb0e9dd7a Move header styles into base less 2014-12-10 10:50:41 -08:00
Jonathan Frederic
d58d3a65a3 invoke css 2014-12-10 10:44:23 -08:00
Jonathan Frederic
f497d06d0c Avoid using important 2014-12-10 10:43:51 -08:00
Min RK
73c33f402c remove references to defunct layout_manager in ToolBar 2014-12-10 10:42:17 -08:00
Thomas Kluyver
4c62fd4210 Merge pull request #7149 from minrk/thread-nb
run test notebook server in thread
2014-12-10 10:06:02 -08:00
Jonathan Frederic
095d8b2feb Merge pull request #7143 from jasongrout/viewlist-promises
Update viewlists to store a list of promises for views
2014-12-10 09:43:19 -08:00
Jason Grout
967d83104f Missing return
Thanks to @jdfreder for catching this in review!
2014-12-10 15:59:34 +00:00
Matthias Bussonnier
912c4bb683 adresses Min comments 2014-12-10 10:45:27 +01:00
Matthias Bussonnier
47822187c1 Fix typos, rephrase english. Thanks Kyle. 2014-12-10 10:45:27 +01:00
Matthias BUSSONNIER
4239dc03f3 load the per kernel kernel.js and kernel.css
As per discussion, each kernel can provide a file name kernel.js that
we try to load at kernel switching. If such a file exist we assume that
the kernel pathches the javasscript and that this javascript cannot be
unpatched, and further switching of the kernel cannot be undone without
reloading the page. (separate PR for UI)

if a kernel provide kernel.js, the it should consist into a AMD module
definition that uses require.js the module shoudl define a function name
`onload` that will be called at the appropriate moment before the kernel
starts.
2014-12-10 10:45:26 +01:00
Min RK
99bac366af Merge pull request #7140 from quantopian/validate-contents
DEV: Validate models returned from ContentsManager methods.
2014-12-09 20:16:07 -08:00
Jonathan Frederic
1c499334c7 Merge pull request #7146 from jdfreder/interact-fix
Fix Dropdown widget page scroll issue
2014-12-09 18:05:53 -08:00
Jonathan Frederic
3ea8929b82 Merge pull request #6454 from jasongrout/links
Javascript link
2014-12-09 16:39:11 -08:00
Scott Sanderson
2216b9522c DEV: Tweaks from PR feedback.
- Reformat expected keys for in `validate_model`.
- Require `'mimetype'` to be non-None only when the model being
  validated is a file.
- Add more information to the error when keys are unexpectedly non-None.
2014-12-09 18:08:49 -05:00
Min RK
e890122c3e Merge pull request #6537 from takluyver/kernelspec-logos
Initial support for supplying kernel logos in kernel spec
2014-12-09 15:08:07 -08:00
Min RK
7d465c7e96 Merge pull request #7139 from jdfreder/widget-space-fix
Fix padding of widgets.
2014-12-09 15:06:21 -08:00
Scott Sanderson
70eb9e219f DOC: Add docstring for validate_model. 2014-12-09 18:05:25 -05:00
Scott Sanderson
a45b8a0c67 DEV: Validate models returned from ContentsManager methods. 2014-12-09 18:05:25 -05:00
Jonathan Frederic
bf18e09521 invoke css 2014-12-09 14:59:19 -08:00
Jonathan Frederic
b29d81ee23 Add LESS that enables meta-p printing 2014-12-09 14:58:50 -08:00
Min RK
22e206de6f ContentsManager type kwarg to match model key
remove `_` suffix, making it consistent with models,
REST API, etc.
2014-12-09 14:53:08 -08:00
Jason Grout
8cf5972f57 Add the unlink method to javascript links to maintain compatibility with traitlet links 2014-12-09 22:50:05 +00:00
Jason Grout
4496bfc6bd Fix a bug in using promises with comms: this -> that 2014-12-09 22:48:21 +00:00
Jonathan Frederic
cecf05efb2 Fix bug where selection box modification would cause page to scroll to the top 2014-12-09 14:16:25 -08:00
Thomas Kluyver
3e2f6dba98 logo-64 -> logo-64x64 2014-12-09 14:05:55 -08:00
Thomas Kluyver
4cee2f5f3a Merge pull request #7128 from minrk/more-v-less-m
A little more V, a little less M in the text editor
2014-12-09 14:03:04 -08:00
Thomas Kluyver
7cc07251e4 Use double resolution logo to support hires displays 2014-12-09 12:11:02 -08:00
Jason Grout
49541066f1 Update viewlists to store a list of promises for views 2014-12-09 19:36:39 +00:00
Min RK
615ff9f138 Merge pull request #6789 from jdfreder/persistence2
Widget persistence API
2014-12-09 11:24:08 -08:00
Thomas Kluyver
cad0c32137 Hide kernel logo if it's missing 2014-12-09 10:54:38 -08:00
Thomas Kluyver
f123b0d2ad Initial support for supplying kernel logos in kernel spec 2014-12-09 10:53:53 -08:00
Jonathan Frederic
2cc041444a Explicit 2.5px 2014-12-09 10:35:02 -08:00
Jonathan Frederic
cf9b092013 Use once instead of on 2014-12-09 10:26:35 -08:00
Matthias Bussonnier
134488637c Merge pull request #6977 from minrk/finish-5384
Add authentication configuration
2014-12-09 09:12:50 +01:00
Thomas Kluyver
9f48e86477 Merge pull request #7136 from minrk/octet-stream
set default mimetype to octet-stream for binary files
2014-12-08 18:23:31 -08:00
Jonathan Frederic
cb12229480 Fix padding of widgets. 2014-12-08 17:32:43 -08:00
Jonathan Frederic
52c8f14223 Added changes discussed with @jasongrout 2014-12-08 17:18:10 -08:00
Jonathan Frederic
152982efcd Updated comments to new style. 2014-12-08 17:18:10 -08:00
Jonathan Frederic
0978065269 Remove view.show 2014-12-08 17:18:10 -08:00
Jonathan Frederic
a56a6f5657 Document set_state_callbacks and,
make load_state callback support promises.
2014-12-08 17:18:10 -08:00
Jonathan Frederic
0c737867fe Rebase fixes 2014-12-08 17:18:10 -08:00
Jonathan Frederic
16e3bad23f Address @jasongrout 's review comments, take 2 2014-12-08 17:18:10 -08:00
Jonathan Frederic
5d4b83ba4a Add an event that fires before the notebook saves 2014-12-08 17:18:10 -08:00
Jonathan Frederic
71d2d47036 Fix, only return views that are direct children of the cell 2014-12-08 17:18:10 -08:00
Jonathan Frederic
a53f4cc9dd Log save state callback failures 2014-12-08 17:18:09 -08:00
Jonathan Frederic
db62a210e7 Another that = this 2014-12-08 17:18:09 -08:00
Jonathan Frederic
f060947eb9 This, that, and the other thing 2014-12-08 17:18:09 -08:00
Jonathan Frederic
8a5770b811 Add convenience API 2014-12-08 17:18:09 -08:00
Jonathan Frederic
e02a5ec201 Promises... 2014-12-08 17:18:09 -08:00
Jonathan Frederic
d466601dbb Persistence API,
This is a combination of 10 commits.
Enable widget instanciation from front-end.

Address @minrk 's review comments.

Make API that allows users to persist widget state easily.

Added support for view persistence

Started adding support for model persistence.

Half way there!

Finished persistence API.

Move persistence code into the widget framework.

Fin.

Bug fixes
2014-12-08 17:18:09 -08:00
Scott Sanderson
ccc8cb9cbf Minor cleanups in the contents API.
Noticed while poking around with a linter enabled.
2014-12-08 19:22:03 -05:00
Min RK
f0181836b2 run test server in thread
instead of subprocess
2014-12-08 15:50:02 -08:00
MinRK
1ec9cfc25c use IOLoop.current in a few places
better allow notebook server to run in a thread
2014-12-08 15:47:56 -08:00
Min RK
407e63cb80 set default mimetype to octet-stream for binary files
mimetype only specified if content=True
2014-12-08 14:31:32 -08:00
Nathan Heijermans
4925ea3e44 Fixed inverted logic caused by renaming variables. 2014-12-08 16:48:35 -05:00
Nathan Heijermans
4440337711 Removed keyboard shortcut. 2014-12-08 16:45:14 -05:00
Min RK
6c4f8de34a wrap lines by default
because long lines are not handled well
2014-12-08 12:04:51 -08:00