Commit Graph

803 Commits

Author SHA1 Message Date
Brian E. Granger
9538fb7d8f Converting loops in *_all_output to $.map(). 2014-01-28 19:11:31 -08:00
Brian E. Granger
f4bfcadf32 Adding back Kernel menu and Cell Type submenu. 2014-01-28 19:11:31 -08:00
Brian E. Granger
afb114e6d3 Removing unneeded select prev/next from Edit menu. 2014-01-28 19:11:31 -08:00
Brian E. Granger
54666e2e98 Cleaning up output management in code and menus. 2014-01-28 19:11:31 -08:00
Brian E. Granger
5786602300 Add kernel restart button to toolbar. 2014-01-28 19:11:31 -08:00
Brian E. Granger
953da90a98 Removing Kernel menu. 2014-01-28 19:11:31 -08:00
MinRK
f14f856edb sign notebooks 2014-01-28 18:44:48 -08:00
Brian E. Granger
bc7b51d1b0 Merge pull request #4374 from jdfreder/widget-msg
IPEP 23: Backbone.js Widgets
2014-01-28 14:58:00 -08:00
Jonathan Frederic
75b148d40b Renamed widgets...
TextWidget, TextareaWidget, CheckboxWidget, and SelectWidget
2014-01-28 12:51:24 -08:00
Jonathan Frederic
5ed3a0ebc5 Simplify get_msg_cell function of notebook.js 2014-01-28 11:43:53 -08:00
Jonathan Frederic
13694d04c3 Removed blame comment 2014-01-28 11:43:53 -08:00
Brian E. Granger
5137961bf2 Protect against navigator undefined in platform. 2014-01-28 10:19:44 -08:00
Brian E. Granger
fd07bb54b6 Fixing shortcut counts to work for n>2. 2014-01-28 10:17:34 -08:00
Brian E. Granger
0af185787a Added platform dep. logic. 2014-01-27 16:27:25 -08:00
Brian E. Granger
1af4bfb3ce Misc work on shortcuts:
* shift+v for paste above.
* ii for interrupt
* 00 for restart
* All shortcuts can have a count field for multiple press.
2014-01-27 15:00:19 -08:00
MinRK
0d1536c390 use jQuery attr instead of setAttribute
when appending images.

This was an optimization with no apparent performance benefit.
2014-01-27 14:46:35 -08:00
Min RK
0b70f26f0e Merge pull request #4655 from minrk/marked-nbconvert
prefer marked to pandoc for markdown2html
2014-01-26 15:58:11 -08:00
MinRK
dd2f4a25aa quick review pass on javascript 2014-01-26 15:02:29 -08:00
MinRK
001e06103b review pass on widgetmanager.js 2014-01-26 14:38:02 -08:00
MinRK
e6f84111cd treat all falsy values the same in tooltip
undefined, null, and empty string are all treated the same.
2014-01-25 17:32:50 -08:00
MinRK
a7bd321648 don't show tooltip if object is not found
closes #4875
2014-01-25 17:24:14 -08:00
Jonathan Frederic
134413c89c Fixed bug that prevented popup widget from displaying 2014-01-24 16:36:23 -08:00
Jonathan Frederic
c807dd29e4 Prevent TextBox from blurring unless explicity by user. 2014-01-24 13:35:58 -08:00
Jonathan Frederic
3026ddb52b Fixed bug in throttling code. 2014-01-24 12:32:19 -08:00
Min RK
64421304c0 Merge pull request #4826 from Carreau/no-html
some $.html( -> $.text(
2014-01-24 12:25:34 -08:00
Min RK
b5a85af6e5 Merge pull request #4847 from Carreau/js-kernel-info
add js kernel_info request
2014-01-24 12:20:12 -08:00
Jonathan Frederic
7c32616556 Moved keyboard_manager logic into a sep. function. 2014-01-24 10:39:06 -08:00
MinRK
f02b5bef21 fix setting image height/width from metadata 2014-01-23 15:38:13 -08:00
MinRK
848010e911 fix tooltip token regex for single-character names
closes #4808
2014-01-23 09:51:46 -08:00
Matthias BUSSONNIER
f5fa732bd3 avoid injection in input prompt 2014-01-23 14:17:14 +01:00
Jonathan Frederic
91e82218a8 Changed selection widget API to use labels list
for mapping custom str reprs to items in the selection list
2014-01-22 17:15:10 -08:00
Jonathan Frederic
7f12f35fea Added code that removes the views when a model/widget is closed. 2014-01-22 16:28:17 -08:00
Jonathan Frederic
288b8a0ced s/view_name/_view_name 2014-01-22 16:21:00 -08:00
Jonathan Frederic
9e643f5692 Support multiple types in selection widget. 2014-01-22 15:53:58 -08:00
Jonathan Frederic
c9973a7114 Float widget views now inherit from int counterparts 2014-01-22 15:00:36 -08:00
Jonathan Frederic
2bb9ba9a9c Adjusted throttling 2014-01-22 12:53:59 -08:00
Jonathan Frederic
1b8b6b3a88 Fixed bug where views child to other views would not have cell information 2014-01-22 12:04:53 -08:00
Jonathan Frederic
f06a0a7d5e Fixed a couple more context typos 2014-01-22 11:31:01 -08:00
Jonathan Frederic
629d65da89 Fixed context errors and a couple of typos to get the tests working again 2014-01-22 11:16:50 -08:00
Matthias BUSSONNIER
98101f9c6c add js kernel_info request 2014-01-22 09:01:13 +01:00
Jonathan Frederic
99f3f5155e Fixed some typos related to _.each loops 2014-01-21 17:23:12 -08:00
Jonathan Frederic
046280b51a s/ModalView/PopupView 2014-01-21 17:09:49 -08:00
Jonathan Frederic
10bd54bd30 Move js *RangeWidget code into *Widget 2014-01-21 16:49:35 -08:00
Jonathan Frederic
c5e48c0b75 Added some small comments to widget code 2014-01-21 16:32:18 -08:00
Jonathan Frederic
80c3339791 - remove second line in create_child_view
- add undefined check in delete_child_view
2014-01-21 16:29:59 -08:00
Jonathan Frederic
58f56a5dd7 Explicitly return null if there aren't any results 2014-01-21 16:28:26 -08:00
Jonathan Frederic
08e40697de Removed for () loops where necessary. Replaced with _.each 2014-01-21 16:26:03 -08:00
Jonathan Frederic
35a02a0436 Replace .html with .text everywhere possible 2014-01-21 15:38:37 -08:00
Jonathan Frederic
af4809bec4 Prefer JQuery to Underscore 2014-01-21 15:24:47 -08:00
Jonathan Frederic
d9a703d305 'create' should be handled in sync 2014-01-21 15:22:26 -08:00
Jonathan Frederic
2b27b4101b Remove todo in apply update 2014-01-21 15:21:44 -08:00
Jonathan Frederic
cb6094281c s/custom_content/content 2014-01-21 14:17:57 -08:00
Jonathan Frederic
097951a6b8 Remove residual tabs 2014-01-21 12:35:39 -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
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
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
bad85fb879 Remove O(N) cell by msg-id lookup 2014-01-16 11:53:22 +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
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
c1c7bb7563 Everyone uses one model 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
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
1e37a46a55 Add a helper method that acts on the changes made to a list. 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
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
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
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
7cbda99b0d Add widget view options in creating child views 2014-01-16 10:57:13 +00:00
Jonathan Frederic
926c93eb84 Fixed indentation in widgetmanager.js 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
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
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
00472333ec log the error stack for a kernel javascript error message 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
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
d4b6823a49 Removed unused that from widget manager 2014-01-16 10:57:09 +00:00
Jonathan Frederic
73380ca442 Fixed nonregistered model bug in wiget manager 2014-01-16 10:57:09 +00:00
Jonathan Frederic
3c866ea412 Made widget model state update function public 2014-01-16 10:57:09 +00:00
Jonathan Frederic
8ceb29796a Made display_view a public method. 2014-01-16 10:57:09 +00:00
Jonathan Frederic
19e9cee437 Fix, require.js needs return of widget manager for other widgets 2014-01-16 10:57:09 +00:00
Jonathan Frederic
d7c0498b13 renamed: widget.js -> widgetmanager.js 2014-01-16 10:57:09 +00:00
Jonathan Frederic
3d7557b740 Moved base widget model and view into widgets/base.js 2014-01-16 10:57:09 +00:00
Jonathan Frederic
3a936676dc Removed comm dependency of widget model and view 2014-01-16 10:57:09 +00:00
Jonathan Frederic
8120778e5a Fixed some spacing in widget.js 2014-01-16 10:57:09 +00:00
Jonathan Frederic
5678617d8f Fixed context of onclick callbacks selection widget views 2014-01-16 10:57:09 +00:00
Jonathan Frederic
4e3b2b3e94 jslint /widgets 2014-01-16 10:57:08 +00:00
Jonathan Frederic
3bc9d12eb8 jshint widget.js 2014-01-16 10:57:08 +00:00