Commit Graph

4967 Commits

Author SHA1 Message Date
Jason Grout
3fc4442053 Move shim to the standard location 2014-07-23 21:13:42 +00:00
Brian E. Granger
372507e3f1 Merge pull request #6128 from jasongrout/widget-trait-serialization
Widget trait serialization
2014-07-23 14:13:24 -07:00
Sylvain Corlay
cd7942eb06 renaming once_displayed into after_displayed 2014-07-23 20:26:44 +00:00
Jason Grout
8fb0ae4d36 Change serialize/deserialize to to_json/from_json 2014-07-23 20:22:50 +00:00
Sylvain Corlay
cfc4a62a85 one more bit 2014-07-23 20:15:37 +00:00
MinRK
957fb42680 use global events in js tests 2014-07-23 11:06:03 -07:00
MinRK
9ff7d264ab note loaded, unused dependencies in require 2014-07-23 11:06:01 -07:00
MinRK
c72cd05cf3 fix docstring in events.js
example shows registering a handler, not triggering an event.
2014-07-23 11:05:36 -07:00
MinRK
e9da9fd776 don’t load custom.js in page template
we are loading it in require, and don’t want to load it twice
2014-07-23 11:05:36 -07:00
MinRK
4097da724b preserve backward-compatible $([IPython.events]) 2014-07-23 11:05:36 -07:00
Jason Grout
abf86d5324 Trigger app_initialized event *after* the 'global' IPython object is initialized 2014-07-23 11:05:34 -07:00
MinRK
374518c583 don’t use events !== undefined to signal page ready
it will always be defined
2014-07-23 11:05:06 -07:00
MinRK
b1291df14a return global events from require(['base/js/events']).
In master, it is impossible to load code on IPython events without setting timeouts.
2014-07-23 11:05:06 -07:00
Min RK
2fe0687097 Merge pull request #6149 from jasongrout/less-upgrade
Less upgrade
2014-07-23 10:06:42 -07:00
Matthias Bussonnier
cb810bad86 Merge pull request #6190 from minrk/bootstrap-shim
add bootstrap shim for require
2014-07-23 16:59:59 +02:00
MinRK
d345546d15 add bootstrap shim for require
it was possible for bootstrap js to load before jquery,
causing failures in the dashboard.
2014-07-22 15:53:16 -07:00
Thomas Kluyver
e0dbb7f187 Merge pull request #6069 from minrk/coalesce_streams
coalesce stream output in the notebook
2014-07-22 15:51:43 -07:00
MinRK
137f98014a pass ws_url to kernel constructor
via session constructor via notebook constructor…
2014-07-22 15:24:20 -07:00
MinRK
a643de41d8 test coalesced output in js 2014-07-22 15:21:15 -07:00
MinRK
e17c636e18 coalesce stream output in the notebook
This merges consecutive outputs on one stream into a single output.

Essentially, it applies the same merging that we do visually to the content stored in the notebook document.

This results in a massive performance improvement in load-time and storage size
for notebooks that have many calls to `sys.stdout.flush()`.
2014-07-22 15:21:14 -07:00
MinRK
579f5101f0 restore websocket_url configurable
allows ws to be handled via separate proxies,
as appears to be the case on OpenShift and some other hosting services.
2014-07-22 14:43:40 -07:00
Jason Grout
ab9e4b600e Add a requirejs shim for highlight.js
Before this, highlighting code in markdown cells was broken since hljs wasn't available.

A better solution might be to build the highlight.js amd module (i.e., build the highlight.js module with `--target=amd`) so that we don't need the shim.
2014-07-22 20:49:52 +00:00
Jason Grout
97141c6bca Simplify the code for picking json serialization functions to expose the logic better 2014-07-22 15:21:28 +00:00
Jason Grout
4c5f4e750a Compile less files 2014-07-22 14:50:11 +00:00
Jason Grout
33f256a195 abstract hard-coded style values to be variables for different theming 2014-07-22 14:46:59 +00:00
MinRK
112c4083e9 add comments for style blocks in less
separates each component into individual line in compiled css,
reducing some churn in minified css files.
2014-07-22 14:46:59 +00:00
Jason Grout
02a8ab2cf5 Upgrade less and generate sourcemap files 2014-07-22 14:46:59 +00:00
Sylvain Corlay
b4d5094645 correction in widget.js 2014-07-22 14:36:22 +00:00
Matthias Bussonnier
f3e599e0c4 Merge pull request #6160 from parleur/patch-2
Span in CellToolBar instead of div
2014-07-22 14:44:19 +02:00
Matthias Bussonnier
e4e50628c0 Merge pull request #6127 from minrk/fix-edit-md
cell toolbar and modal dialog fixes
2014-07-22 13:12:54 +02:00
Jonathan Frederic
c1c03a1c83 Merge pull request #6153 from jasongrout/container-children-arg
Make Container widgets take children as the first positional argument
2014-07-21 13:18:49 -07:00
MinRK
98ac874131 cell toolbar and modal dialog fixes
- name conflict in modal
- cell.cell_type in cell toolbar

prevented edit metadata from working properly.
2014-07-21 11:11:53 -07:00
Min RK
3e66b9f52c Merge pull request #6174 from Carreau/pagemain
remove pagemain.js
2014-07-20 13:28:30 -07:00
Min RK
70bc0704c2 Merge pull request #6099 from takluyver/check-nbservers-pid
Check process existence when listing nbserver processes
2014-07-20 13:20:48 -07:00
Min RK
12c49383ff Merge pull request #6169 from tarzzz/fix-requirejs
Added jquery in define
2014-07-20 13:18:35 -07:00
Matthias BUSSONNIER
17afb5a71f remove pagemain.js
It does not seem to be usefull anymore.

The different main.js of /tree /notebook /etc do create an instance of
`page` themselves, error pages do have hardcoded styles that show header
and sites.
2014-07-20 21:40:14 +02:00
Tarun Gaba
fb540c52f5 Added jquery in define 2014-07-19 09:10:12 +05:30
Sylvain Corlay
a2e9d90bd0 incorrect comment 2014-07-18 22:28:08 +00:00
Sylvain Corlay
8bc4ea37a1 unnecessary context variable specify 2014-07-18 22:26:21 +00:00
Sylvain Corlay
1eb2a30efb once-displayed 2014-07-18 22:08:17 +00:00
Jason Grout
3235f42d12 Container assumes the children attribute is not None
Thanks to @SylvainCorlay for pointing this out.
2014-07-18 16:59:41 +00:00
Pierre Gerold
ac6808b884 Update celltoolbar.js
I want to write an extension with multiple select bar. They are supposed to be displayed inline, not in block mode. The better way is to use span instead of div.
2014-07-18 12:44:23 +02:00
Jason Grout
06084e996c Change serialization terminology to serialize/deserialize 2014-07-17 20:57:10 +00:00
Jason Grout
eed0715a09 Prepend a sentinel value to model ids to distinguish them from normal UUIDs (from Sylvain Corlay). 2014-07-17 20:55:27 +00:00
Jason Grout
14f3897b56 Make Container widgets take children as the first positional argument
This makes creating containers less cumbersome: Container([list, of, children]), rather than Container(children=[list, of, children])
2014-07-17 20:07:37 +00:00
Paul Ivanov
cfe9fa4314 Merge pull request #6028 from takluyver/markdown-mistune
Add 'mistune' markdown parser as an option for markdown2html
2014-07-17 11:43:07 -07:00
Thomas Kluyver
5904b9094d Version dependency on mistune 2014-07-17 10:04:44 -07:00
Thomas Kluyver
890f9cd88c Add deps for nbconvert to HTML for 'notebook' target
Also, nbconvert no longer requires Sphinx.
2014-07-17 10:04:44 -07:00
Thomas Kluyver
44ab946b2d Make mistune a requirement for nbconvert 2014-07-17 10:04:12 -07:00
Min RK
28884d4462 Merge pull request #6134 from minrk/mathjax-cdn
remove rackcdn https workaround for mathjax cdn
2014-07-15 11:31:55 -07:00