mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-24 12:05:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,585 Commits 20 Branches 1,036 Tags 78 MiB
63ae9e2fd7
Commit Graph

2912 Commits

Author SHA1 Message Date
Jonathan Frederic
2b27b4101b Remove todo in apply update 2014-01-21 15:21:44 -08:00
Jonathan Frederic
e823d386ab Fixed name conflict with _property_lock 2014-01-21 15:18:49 -08:00
Jonathan Frederic
077bd5c6ca Added new CallbackDispatcher class 2014-01-21 15:14:27 -08:00
Jonathan Frederic
611614b6eb Document in widget packing that vaues must be JSON-able. 2014-01-21 14:25:08 -08:00
Jonathan Frederic
cf05ef015a ict comprehension and list comprehension in pack/unpack widgets 2014-01-21 14:23:44 -08:00
Jonathan Frederic
cb6094281c s/custom_content/content 2014-01-21 14:17:57 -08:00
Jonathan Frederic
5fe860ed26 Added doc strings to properties in widget.py 2014-01-21 14:16:24 -08:00
Jonathan Frederic
1689eed2f6 Reorganized attrs in widget.py 2014-01-21 14:13:33 -08:00
Jonathan Frederic
097951a6b8 Remove residual tabs 2014-01-21 12:35:39 -08:00
MinRK
c2cb64c9a0 adjustments to notebook app logging 
Mainly add a log_request function (from nbviewer) for formatting tornado access logs.

Relevant effects:

- demote successful access logs to DEBUG
- demote kernel connect messages to DEBUG

which reduces the noise at INFO-level (default)
 2014-01-21 10:48:24 -08:00
Jonathan Frederic
b7cd129c37 Added a line that was accidently deleted during merge of 4e813c5 2014-01-21 11:05:32 +00:00
Jonathan Frederic
691cd56038 Change the callback logic so the order makes more sense: 
*Now*
View calls Model which calls Widget Manager
*instead of *
View calls Widget Manager, which then the Model modifies right
before sync
 2014-01-21 11:00:45 +00:00
Jason Grout
fe6edb26a6 Rewrite widget syncing 
Conflicts:
	IPython/html/static/notebook/js/widgetmanager.js
	IPython/html/static/notebook/js/widgets/widget.js
 2014-01-21 10:13:42 -08:00
Matthias BUSSONNIER
149867e74c some $.html( -> $.text( 
Thoses that are obvious and easy to fix.

we shoudl have I think a travis test that grep for .html( and return
less than 20 lines :-)
 2014-01-17 22:25:33 -08:00
Jonathan Frederic
e17200a533 Widget require.js fix 
The WidgetManager namespace is passed around instead of a
widget_manager instance...
 2014-01-17 17:03:29 +00:00
Jonathan Frederic
c39050e642 Fixed widget_manager instance test. 2014-01-17 16:32:58 +00:00
Jonathan Frederic
469c865603 Added support for multiple kernels. 2014-01-17 16:22:57 +00:00
Jonathan Frederic
6871c8f9e0 Cherry pick of @jasongrout 's 2bc2f96. 
Only merged changes to notebook and kernel...  (see original comment below).

Separate the widget registry from the widget managers;
attach widget managers to kernels.

Yet to do: take care of clean-up when a kernel is deleted
Conflicts:
	IPython/html/static/notebook/js/widgetmanager.js
	IPython/html/static/notebook/js/widgets/widget.js
 2014-01-17 15:36:49 +00:00
Jason Grout
140d1872f7 Delete unnecessary save 2014-01-17 15:21:30 +00:00
Jason Grout
ce19a34d93 Pass the whole message into the widget manager display_view call 
We do this so implementations can see metadata and any other things in the message, if they want.
Conflicts:
	IPython/html/static/notebook/js/widgetmanager.js
 2014-01-17 15:21:06 +00:00
Jason Grout
092e40df32 make the saving to python a method of the model, called with callbacks 
Conflicts:
	IPython/html/static/notebook/js/widgets/widget.js
 2014-01-17 15:10:17 +00:00
Jason Grout
24ec0da125 Fix the cell reference in views 
This solution is kludgy, but it does fix what broke when we tried to take the cell references out of views.
Conflicts:
	IPython/html/static/notebook/js/widgets/widget.js
 2014-01-17 15:04:27 +00:00
Jonathan Frederic
7cc6692fc4 Make dropdown view DOM swap elements on update. 2014-01-17 10:37:08 +00:00
Matthias Bussonnier
0ec0534ce9 Merge pull request #4796 from minrk/update-components 
update components

closes #4765
 2014-01-16 09:53:07 -08:00
Jonathan Frederic
82bf9c6826 Fix bug in all children containing views 2014-01-16 17:19:35 +00:00
Jonathan Frederic
d317532a38 Halign dict colons 2014-01-16 17:17:00 +00:00
Jonathan Frederic
bd3ba3328c Added PEP8 style comments to all of the JS code. 2014-01-16 16:48:14 +00:00
Jonathan Frederic
7387f886c6 containers and selectioncontainers now only allow one of any single child 2014-01-16 14:48:56 +00:00
Jonathan Frederic
bfdebf9632 More PEP8 changes 2014-01-16 14:20:04 +00:00
Jonathan Frederic
bad85fb879 Remove O(N) cell by msg-id lookup 2014-01-16 11:53:22 +00:00
Jonathan Frederic
ff39989b8b s/Int/CInt s/Float/CFloat 2014-01-16 11:42:38 +00:00
Jonathan Frederic
2aeac3a424 Make widget views work with new keyboard manager. 2014-01-16 10:57:19 +00:00
Jonathan Frederic
f86fe40c97 Fix rebase issues 2014-01-16 10:57:19 +00:00
Jonathan Frederic
6286f8b1ea Fab CSS 2014-01-16 10:57:19 +00:00
Jonathan Frederic
74185a68e7 Got containers and mutlicontainers working! Yay 2014-01-16 10:57:19 +00:00
Jonathan Frederic
16d9fa92e8 Fix test for selection widgets 2014-01-16 10:57:19 +00:00
Jonathan Frederic
4017c7b27a Fixed *almost* all of the test-detected bugs 2014-01-16 10:57:19 +00:00
Jonathan Frederic
c085593e2a More fixes 2014-01-16 10:57:18 +00:00
Jonathan Frederic
d694666e66 A lot of bug fixes... 
Related to 1-to-1 changes
 2014-01-16 10:57:18 +00:00
Jonathan Frederic
047a90538f 1-to-1 widget / view mapping 2014-01-16 10:57:18 +00:00
Jonathan Frederic
c1c7bb7563 Everyone uses one model 2014-01-16 10:57:18 +00:00
Jonathan Frederic
b16171ac76 Added sync=True to all view name attrs 2014-01-16 10:57:18 +00:00
Jonathan Frederic
cfe8a07337 Added sync= attr to DOMWidget 2014-01-16 10:57:18 +00:00
Jonathan Frederic
b4a83b6044 sync=True isntead of a keys list 2014-01-16 10:57:18 +00:00
Jonathan Frederic
00650fd64a Dev meeting Jan 2014, widget review day 2 2014-01-16 10:57:18 +00:00
Jonathan Frederic
d3ffd25107 Dev meeting widget review day 1 2014-01-16 10:57:18 +00:00
Paul Ivanov
897d51a567 fix typos 2014-01-16 10:57:17 +00:00
Paul Ivanov
95e99c0c61 remove unused imports 2014-01-16 10:57:17 +00:00
Jonathan Frederic
d103c682c5 Many checks off the todo list, test fixes 2014-01-16 10:57:17 +00:00
Jonathan Frederic
f6de685d9f Use .apply for calling base with not proto-type. 
See codecell for example.
 2014-01-16 10:57:17 +00:00
Jonathan Frederic
0f715170b3 Add a comment that explains the notion of the default element 
to be styled in set_css's' doc string.
 2014-01-16 10:57:17 +00:00
Jonathan Frederic
1e37a46a55 Add a helper method that acts on the changes made to a list. 2014-01-16 10:57:17 +00:00
Jonathan Frederic
be268dcf98 Implement a context manager as a property locking mechanism in Widget. 2014-01-16 10:57:17 +00:00
Jonathan Frederic
70c6a295d0 Finished renaming Multicontainer to SelectionContainer 2014-01-16 10:57:17 +00:00
Jonathan Frederic
a528610e07 renamed: ../static/notebook/js/widgets/widget_multicontainer.js -> ../static/notebook/js/widgets/widget_selectioncontainer.js 
renamed:    widget_multicontainer.py -> widget_selectioncontainer.py
 2014-01-16 10:57:17 +00:00
Jonathan Frederic
643516f6f9 remove .html(''); 2014-01-16 10:57:17 +00:00
Jonathan Frederic
c62b496b0e s/image_format/format 2014-01-16 10:57:17 +00:00
Jonathan Frederic
b5f97c1227 add comment views are in *_range 2014-01-16 10:57:16 +00:00
Jonathan Frederic
5e9a090423 toggle button, set $el to button (removing extra div) 2014-01-16 10:57:16 +00:00
Jonathan Frederic
5b5325507f add locks to update everywhere by using options to pass this 
(and check for this)
 2014-01-16 10:57:16 +00:00
Jonathan Frederic
c4edfdc828 comment model.set, so we know that it triggers update on other views 2014-01-16 10:57:16 +00:00
Jonathan Frederic
ccbfcbc159 make JS update comment more descriptive (english) 2014-01-16 10:57:16 +00:00
Jonathan Frederic
0740980d5c remove length test add_class and remove_class 2014-01-16 10:57:16 +00:00
Jonathan Frederic
ec68f38ed7 Removed get_kernel method. 2014-01-16 10:57:16 +00:00
Jonathan Frederic
8dc5535638 un-nest options.options 2014-01-16 10:57:16 +00:00
Jonathan Frederic
a6fac70e03 s/BaseWidgetView/WidgetView and s/WidgetView/DOMWidgetView 2014-01-16 10:57:16 +00:00
Jonathan Frederic
44cf406ac0 this.updating should be a key specific lock 2014-01-16 10:57:16 +00:00
Jason Grout
d658f362ac Update option-passing for creating child views. 2014-01-16 10:57:16 +00:00
Jonathan Frederic
3a271585d7 Add constructor comment for widget model. 2014-01-16 10:57:16 +00:00
Jonathan Frederic
d7835eb14e Added missing comma 2014-01-16 10:57:16 +00:00
Jonathan Frederic
d3b33828c5 handle_msg a display_model method. 2014-01-16 10:57:15 +00:00
Jonathan Frederic
261e92de74 re-order handle custom msg and handle recieve state 2014-01-16 10:57:15 +00:00
Jonathan Frederic
3254f338bb Added note in widget manager why Backbone.sync is there rather 
than the base.js (widget.js)
 2014-01-16 10:57:15 +00:00
Jonathan Frederic
3f3a7edd6a remove on_create_widget and handle_create_widget callback 2014-01-16 10:57:15 +00:00
Jonathan Frederic
17da002a6a remove msg.content.data.view_name and corrosponding create_view param 2014-01-16 10:57:15 +00:00
Jonathan Frederic
99d83a2ad1 move backbone sync outside the widget manager class 2014-01-16 10:57:15 +00:00
Jonathan Frederic
5dbffa5287 _model_types, _view_types, _models - and document what keys and values are 2014-01-16 10:57:15 +00:00
Jonathan Frederic
15dabce113 send_state only once for dict signature of set_css 2014-01-16 10:57:15 +00:00
Jonathan Frederic
6c11760a89 Fixed comments for optional kwargs so they are redundant. 2014-01-16 10:57:15 +00:00
Jonathan Frederic
670f4881ec remove 3rd callback type from on_displayed 2014-01-16 10:57:15 +00:00
Jonathan Frederic
7e6c8e4f1d Remove view_name from display 2014-01-16 10:57:15 +00:00
Jonathan Frederic
463bcf85ee Fixed _send so it can open a comm if needed. 
It no longer returns anything.
 2014-01-16 10:57:14 +00:00
Jonathan Frederic
85b5adff58 Remove first three lines of repr widgets 2014-01-16 10:57:14 +00:00
Jonathan Frederic
e383594d04 renamed: basic_widgets.js -> init.js 
renamed:    init.js -> widget.js
 2014-01-16 10:57:14 +00:00
Jonathan Frederic
5a3665d9ed s/widget.js/init.js 2014-01-16 10:57:14 +00:00
Jonathan Frederic
5b388df615 Added callbacks method to view 2014-01-16 10:57:14 +00:00
Jonathan Frederic
5ced2816e7 Removed sync_method parameter from backbone msg spec 2014-01-16 10:57:14 +00:00
Jonathan Frederic
4e19dd7933 s/_handle_widget_constructed/_call_widget_constructed 2014-01-16 10:57:14 +00:00
Jonathan Frederic
39aaf7bf88 s/default_view_name/view_name 2014-01-16 10:57:14 +00:00
Jonathan Frederic
21a14e11a4 s/Widget/DOMWidget s/BaseWidget/Widget 2014-01-16 10:57:14 +00:00
Jonathan Frederic
696a6e4c28 add/remove_class now can accept a list of classes 2014-01-16 10:57:14 +00:00
Jonathan Frederic
2600913067 Removed ViewWidget 2014-01-16 10:57:14 +00:00
Jonathan Frederic
441a3e3ca6 Updated require.js references 2014-01-16 10:57:14 +00:00
Jonathan Frederic
ee522adc18 Renamed widget js files 2014-01-16 10:57:14 +00:00
Jonathan Frederic
691db01e5e Missing view argument when recursively calling widgetmanager.callbacks(view) 2014-01-16 10:57:14 +00:00
Jonathan Frederic
babd5c44ba Completely remove cell from model and view. 2014-01-16 10:57:13 +00:00
Jonathan Frederic
9e43807579 Updated comm id comments in view to model id 2014-01-16 10:57:13 +00:00
Jonathan Frederic
3329f875f3 s/comm_id/model_id (left over from before) 2014-01-16 10:57:13 +00:00
Jason Grout
a0b2cc40b8 Make widget keys have more explicit inheritance 2014-01-16 10:57:13 +00:00
Jason Grout
ce98452180 Get rid of keys magic; make the keys very explicit 2014-01-16 10:57:13 +00:00
Jason Grout
f0a4b9ea30 Make the widget keys property traverse the superclasses and accumulate the _keys attributes. 
This caches the result, overwriting the property.
 2014-01-16 10:57:13 +00:00
Jason Grout
7cbda99b0d Add widget view options in creating child views 2014-01-16 10:57:13 +00:00
Jonathan Frederic
7c3b21d239 Fixed typo in model_id property 2014-01-16 10:57:13 +00:00
Jonathan Frederic
0c8b6029a6 Remove debug print statements in container tests 2014-01-16 10:57:13 +00:00
Jonathan Frederic
d2afb9895b Output one more for debugging 2014-01-16 10:57:13 +00:00
Jonathan Frederic
7f430db3c8 Print cell output 2014-01-16 10:57:13 +00:00
Jonathan Frederic
12760ddbe5 deleted: wigets_container.js 2014-01-16 10:57:13 +00:00
Jonathan Frederic
07b3a7639d Revert "Enabled IPython Server output for Travis debugging" 
This reverts commit eb7ee3f61335a7147fcfc1b1907d41f163bb0b41.
 2014-01-16 10:57:13 +00:00
Jonathan Frederic
74fccf47b3 Revert "Added line to dump page html casperjs" 
This reverts commit 7091ce87f7a280dde7724d92fd542b834f764e61.
 2014-01-16 10:57:13 +00:00
Jonathan Frederic
8891750535 Fixed static_url call which is no longer optionally 1 param 2014-01-16 10:57:12 +00:00
Jonathan Frederic
3a05f7e145 Enabled IPython Server output for Travis debugging 2014-01-16 10:57:12 +00:00
Jonathan Frederic
c7362cb524 Added line to dump page html casperjs 2014-01-16 10:57:12 +00:00
Jonathan Frederic
926c93eb84 Fixed indentation in widgetmanager.js 2014-01-16 10:57:12 +00:00
Jonathan Frederic
57f3057ca5 Moved view widget into widget.py 2014-01-16 10:57:12 +00:00
Jonathan Frederic
46e88dc205 Fixed indent of line 450 
... caused Travis to get mad
 2014-01-16 10:57:12 +00:00
Jonathan Frederic
a2235efbea Further indentation cleanup 2014-01-16 10:57:12 +00:00
Jonathan Frederic
2e4abaa13d Removed console.log, unused 2014-01-16 10:57:12 +00:00
Jonathan Frederic
35a536f3b8 Re-decoupled comm_id from widget models 2014-01-16 10:57:12 +00:00
Jonathan Frederic
1b4e2ad6fe Added ViewWidget 2014-01-16 10:57:12 +00:00
Jonathan Frederic
399f11e2b2 renamed: wigets_container.js -> widgets_container.js 2014-01-16 10:57:12 +00:00
Jonathan Frederic
c3189c1c93 Fixed JS tests to reflect Jason's changes 2014-01-16 10:57:12 +00:00
Jonathan Frederic
8732761524 Added update_children pattern to remaining parent widgets 2014-01-16 10:57:12 +00:00
Jonathan Frederic
2211abd28d Converted tabs to spaces 2014-01-16 10:57:11 +00:00
Jason Grout
b41f77e635 Fix the python side of the add/remove class functions to send custom messages 2014-01-16 10:57:11 +00:00
Jason Grout
44e2043afe Live updates for children automatically change container views. 
Since traitlets does not trigger events when list elements are changed, these changes are triggered only when the entire children element is reassigned.
 2014-01-16 10:57:11 +00:00
Jason Grout
b52043b4f7 Get the add/remove css classes working 2014-01-16 10:57:11 +00:00
Jason Grout
a8c8c2a5fd General cleanup of base.js, including indentation fixes and adding view callbacks to the save options dictionary. 2014-01-16 10:57:11 +00:00
Jason Grout
747b219771 Move some Widget class references to BaseWidget 2014-01-16 10:57:11 +00:00
Jason Grout
00472333ec log the error stack for a kernel javascript error message 2014-01-16 10:57:11 +00:00
Jason Grout
07ffef8392 Make sure containers transmit the children; take care of case where children is possibly empty. 2014-01-16 10:57:11 +00:00
Jason Grout
7810c78aea Fix visible attribute for the very first render 2014-01-16 10:57:11 +00:00
Jason Grout
9b1a0d70a2 fix a handle_status handler 2014-01-16 10:57:11 +00:00
Jason Grout
1bf8da0734 Note todos for widgets 2014-01-16 10:57:10 +00:00
Jason Grout
38f0135522 Delete the snapshot message handler 2014-01-16 10:57:10 +00:00
Jason Grout
9a4c5957c3 Store views in the models and store child views in the views 2014-01-16 10:57:10 +00:00
Jason Grout
7431fa37dd Make updates more granular for widgets 2014-01-16 10:57:10 +00:00
Jason Grout
641a5af70f Move all references to cells to the view objects. 2014-01-16 10:57:10 +00:00
Jason Grout
45206783c2 Delete unnecessary check for comm object 2014-01-16 10:57:10 +00:00
Jason Grout
41170f7471 Change accordion to use a children attribute 2014-01-16 10:57:10 +00:00
Jason Grout
18beaff887 Remove unused code and debugging statements 2014-01-16 10:57:10 +00:00
Jason Grout
72f7d2fe09 Remove the automatic _children_attr and _children_lists_attr. 
When serializing, any Widget object is encoded as its comm_id.  The view should know how to deal with the attribute, and should know that the attribute is a comm_id.
 2014-01-16 10:57:10 +00:00
Jason Grout
ad1e23bfc2 Intermediate changes to javascript side of backbone widgets 2014-01-16 10:57:10 +00:00
Jason Grout
518cb4c647 Separate the display from the models on the python side, creating a BaseWidget class. 
Conflicts:
	IPython/html/widgets/widget.py
 2014-01-16 10:57:10 +00:00
Jonathan Frederic
2df05bc5b8 Display handler now supports full kwargs 2014-01-16 10:57:10 +00:00
Jonathan Frederic
3361826b5a Added require.js shims for underscore and backbone 
This is necessary since underscore and backbone are no longer AMD
modules.
 2014-01-16 10:57:10 +00:00
Jonathan Frederic
b588a56f76 Moved touch logic out of model into view. 
View now updates using backbone events.
 2014-01-16 10:57:10 +00:00
Jonathan Frederic
a2c951d9b0 s/display/created for display_view stuff 2014-01-16 10:57:09 +00:00
Jonathan Frederic
996d133710 Remove redundent _handle_close method 2014-01-16 10:57:09 +00:00
Jonathan Frederic
857ae831fb Decoupled Python Widget from Comm 
Fixed conflicts:
	IPython/html/widgets/widget.py
 2014-01-16 10:57:09 +00:00
Jonathan Frederic
f2fefe20ff Added event for widget construction 2014-01-16 10:57:09 +00:00