Min RK
c88bd5025a
distinguish capture_output from buffer_output
...
allow capturing output without silencing it,
which is useful for slimerjs,
which requires looking at output to determine failure.
2014-11-04 15:59:27 -08:00
Thomas Kluyver
e6939f9aa5
Merge pull request #6846 from minrk/deprecate-heading-ui
...
deprecate heading cells in UI
2014-11-04 10:06:47 -08:00
v923z
a2081d042e
replaced nbmodel.orig_nbformat by orig_nbformat
2014-11-04 15:10:55 +01:00
v923z
9c122dcd15
fixed notebook checking code
2014-11-04 14:57:44 +01:00
Min RK
ef49e32ef0
Merge pull request #6783 from takluyver/contentsmanager-js
...
contents.js wrapper for contents service
2014-11-03 17:09:49 -08:00
Thomas Kluyver
b7a558d5b9
Use synchronous request for creating new notebooks
...
To get round popup blockers
2014-11-03 15:29:09 -08:00
Min RK
04bcfa626d
deprecate heading cells in UI
...
- removed from Kernel Menu
- Main toolbar warns via shouty dialog
- keyboard shortcuts still work to make headings in markdown cells, with no warning
2014-11-03 15:05:54 -08:00
Thomas Kluyver
2a497c16eb
load_file -> load
2014-11-03 14:46:49 -08:00
Thomas Kluyver
1f2e4cc6c3
Fix passing empty list to draw_notebook_list()
2014-11-03 14:41:50 -08:00
Thomas Kluyver
a4f869aa8b
Rename methods to remove _file suffix
2014-11-03 14:40:09 -08:00
Thomas Kluyver
5279418acf
Make Contents.new more generic
2014-11-03 14:29:39 -08:00
Thomas Kluyver
4452754a6b
Set notebook nbformat in toJSON
2014-11-03 14:20:12 -08:00
Min RK
6b67a69c22
don't assume converted notebooks are old
...
in notebook.js dialogs, which can now be triggered
by nbformat 4 from the future.
2014-11-03 11:50:11 -08:00
Thomas Kluyver
963921c4ff
Merge pull request #6832 from minrk/request-only-once
...
actually send only one kernel_info request
2014-11-03 10:37:17 -08:00
Thomas Kluyver
684516c79f
Fix copy-paste mistakes
2014-11-03 10:21:38 -08:00
Thomas Kluyver
658eb39c56
Remove one more unnecessary cache parameter
2014-11-03 10:19:51 -08:00
Thomas Kluyver
2962a3ce17
Remove some unnecessary cache: false parameters
...
According to the jQuery docs, this is only needed for GET and HEAD
requests.
2014-11-03 10:19:51 -08:00
Thomas Kluyver
a2f3e23fd8
Add copy_file to contents JS API
2014-11-03 10:19:51 -08:00
Thomas Kluyver
1ae6be218d
Fix require config
2014-11-03 10:19:51 -08:00
Thomas Kluyver
b8f9dc07e2
Fix error callback when deleting file
2014-11-03 10:19:51 -08:00
Kester Tong
9797a6b7c0
typo fix
2014-11-03 10:19:51 -08:00
Kester Tong
89df330129
Modifies Contents API to return Error objects
...
Modfies the Contents class to return JavaScript Error objects instead of passing on the return values from $.ajax(). This has two advantages. First, it allows the content manager to parse errors and give more informative messages than the ajax response. Second, it makes the Contents interface more general, since other kinds of backends might generate client-side errors.
2014-11-03 10:19:50 -08:00
Thomas Kluyver
e1cbaf3d3c
Fix spelling
2014-11-03 10:18:28 -08:00
Thomas Kluyver
f8ec8d4abe
Various minor fixes from review
2014-11-03 10:18:28 -08:00
Thomas Kluyver
ea314a2a86
Rename callback parameters to success/error
2014-11-03 10:18:28 -08:00
Thomas Kluyver
060dd1305c
Miscellaneous JS fixes
2014-11-03 10:18:28 -08:00
Thomas Kluyver
c1c591336e
Some more event cleanup
2014-11-03 10:18:28 -08:00
Thomas Kluyver
cf828ccf4e
Cut out some superfluous events
2014-11-03 10:18:28 -08:00
Thomas Kluyver
c9bd254735
Make contents JS API consistent
2014-11-03 10:18:28 -08:00
Thomas Kluyver
29d88a91a6
Standardise JS checkpointing API, use it for notebooks
2014-11-03 10:18:27 -08:00
Thomas Kluyver
14106cbd66
Move contents API module into services
2014-11-03 10:18:27 -08:00
Thomas Kluyver
a10dea4cd5
Add Contents.api_url convenience function
2014-11-03 10:18:27 -08:00
Thomas Kluyver
9538726b16
Don't do UI stuff in contents API module
2014-11-03 10:18:27 -08:00
Thomas Kluyver
478648bde5
Page URL is /notebooks/..., not contents
2014-11-03 10:18:27 -08:00
Thomas Kluyver
c661c85abd
Add missing semicolon
2014-11-03 10:18:27 -08:00
Jeff Hemmelgarn
47a88f0e1d
Remove version
2014-11-03 10:18:27 -08:00
Jeff Hemmelgarn
dab99c599f
Remove unnecessary backwards compatibility code
2014-11-03 10:18:27 -08:00
Jeff Hemmelgarn
53463898eb
Move contentmanager to contents
2014-11-03 10:18:27 -08:00
jhemmelg
5109be2d28
ContentManager function signatures updated
2014-11-03 10:18:04 -08:00
jhemmelg
496fa1901f
Initial interface for javascript contentmanagers
...
contentmanager.js is going to be a js proxy for the current
filenbmanager.py. This will allow a contentmanager for Google Drive to
be created.
2014-11-03 10:18:04 -08:00
Jeff Hemmelgarn
09e0ff93d8
Fix a few problems with cherry-picked commits
...
api/notebooks => api/contents
add type to JSON model
fix a few things in notebooklist.js
2014-11-03 10:18:04 -08:00
KesterTong
3994d4d56a
Adds configuration options to use Google Drive content manager
...
Adds the key contentmanager_js_source to webapp_settings that allows for specifying the content manager JavaScript source file. Also adds a NotebookManager subclass, ClientSideNotebookManager, which does minimal logic. This class is used when the JavaScript content manager doesn't use the Python notebook manager, but rather implements that logic client side, as is the case for the Google Drive based content manager.
A sample command line that uses the Google Drive content manager, and the ClientSideNotebookManager, is
ipython notebook --NotebookApp.webapp_settings="{'contentmanager_js_source': 'base/js/drive_contentmanager'}" --NotebookApp.notebook_manager_class="IPython.html.services.notebooks.clientsidenbmanager.ClientSideNotebookManager"
2014-11-03 10:18:04 -08:00
KesterTong
952ac7d0d8
Moves load_notebook to ContentManager and adds new_notebook to Google Drive version
2014-11-03 10:17:12 -08:00
KesterTong
e3ef5d3b70
Moves list_notebooks to ContentManager
2014-11-03 10:17:12 -08:00
KesterTong
dfcf14f26c
Uses events for ContentManager.save_notebook
...
Modifies ContentManager.save_notebook() to use events, so that the Notebook instance can listen for success or failure events. Also moves some logic out of save_notebook()
2014-11-03 10:17:12 -08:00
KesterTong
04fc61285f
Use events for rename_notebook
...
Triggers events on ContentManager.rename_notebook success and failure. Also moves some logic out of this method.
2014-11-03 10:17:12 -08:00
KesterTong
75d7e69fc8
Use $.proxy instead of that
2014-11-03 10:17:12 -08:00
KesterTong
9881d17bb1
Remove unused event
...
This event never seems to get used.
2014-11-03 10:17:12 -08:00
KesterTong
61a911fc0c
Fix constructor comments
...
Add content_manager as a dictionary key to the options param passed in to the NotebookList and Notebook constructors.
2014-11-03 10:17:12 -08:00
KesterTong
0aada3ac5d
Remove deleted notebook from notebook list
...
Uses events to notify the NotebookList when the content manager deletes a notebook, and remove the deleted notebook in response to such an event.
2014-11-03 10:17:12 -08:00