Commit Graph

4846 Commits

Author SHA1 Message Date
Thomas Kluyver
76477386ae Don't refer to global kernelselector object in Session 2014-07-24 16:55:18 -07:00
Thomas Kluyver
2785e87b4b Fix JS iteration
Well, work around it.
2014-07-24 16:55:18 -07:00
Matthias BUSSONNIER
849ff3bb05 Simplify and uniformise styling of kernel selector
Make the theme coherent with the logout button
2014-07-24 16:55:18 -07:00
Thomas Kluyver
0e3d27c841 Deterministic order for kernels in notebook UI 2014-07-24 16:55:00 -07:00
Thomas Kluyver
c432af1af5 Use JS events for switching kernelspecs 2014-07-24 16:55:00 -07:00
Thomas Kluyver
01d43290af Remove unused style() function 2014-07-24 16:55:00 -07:00
Thomas Kluyver
e51f26275a Set codemirror mode from kernelspecs 2014-07-24 16:55:00 -07:00
Thomas Kluyver
ba69cd972e Add method to change codemirror mode of all code cells 2014-07-24 16:54:59 -07:00
Thomas Kluyver
54c6cb62c0 Start kernel according to loaded notebook metadata 2014-07-24 16:54:59 -07:00
Thomas Kluyver
b644ddbe36 Store kernelspec in notebook metadata on change 2014-07-24 16:54:59 -07:00
Thomas Kluyver
7400dd1c18 Line dropdown up on RHS of kernel name 2014-07-24 16:54:59 -07:00
Thomas Kluyver
6f8c4b8dc4 Style kernel name 2014-07-24 16:54:08 -07:00
Thomas Kluyver
9581bd7dc3 Change displayed kernel name when our session is started 2014-07-24 16:31:55 -07:00
Thomas Kluyver
41626420e2 Allow switching kernel from the notebook UI 2014-07-24 16:31:55 -07:00
Paul Ivanov
8becf64d7e Merge pull request #6206 from minrk/git-hooks
minor tweak to git hooks
2014-07-24 15:09:37 -07:00
MinRK
7372aa8110 minor tweak to git hooks
- fix PREVIOUS_HEAD when run as git-merge
- catch fab css failure
2014-07-24 14:45:12 -07:00
Paul Ivanov
b67aac5aef Merge pull request #6119 from minrk/global-events
return global events from require(['base/js/events']).
2014-07-24 12:23:14 -07:00
Min RK
43e25ab4d9 Merge pull request #6196 from minrk/git-friendlyish-less-css
Make less/sourcemaps a bit friendlier to git
2014-07-24 12:09:54 -07:00
MinRK
6a1cdc6825 post-merge is just a symlink to post-checkout 2014-07-24 11:44:02 -07:00
Matthias Bussonnier
16d21d3267 Merge pull request #6188 from jasongrout/highlightjs-require-shim
Add a requirejs shim for highlight.js
2014-07-24 13:53:28 +02:00
Matthias Bussonnier
b290f48815 Merge pull request #6036 from minrk/restore-ws-host
restore websocket_url configurable
2014-07-24 13:41:18 +02:00
MinRK
ff98a86f2d check_call with list, instead of shell=True 2014-07-23 17:03:14 -07:00
MinRK
168d619726 fab css checks whether it needs to do anything
makefile-style

adds `force` arg to override, minify implies force.
2014-07-23 16:59:44 -07:00
MinRK
b1882ca9e5 add strict arg to css_js setup decorator
and attempt to build css on build_by (install)
2014-07-23 16:59:43 -07:00
Thomas Kluyver
d9850e1ab4 Merge pull request #6144 from minrk/show-js-errors
add some debugging output to js tests
2014-07-23 16:20:01 -07:00
MinRK
41e482d47a fix interrupt test revealed by new output
the shortcut test wasn’t running at all,
due to a ReferenceError.

There was no indication of this fact
because javascript is awesome like that.
2014-07-23 15:51:03 -07:00
MinRK
1f0646f893 add some debugging output to js tests
- display errors in evaluate / browser code
- capture and display console.log if a test fails (like nose)
2014-07-23 15:51:03 -07:00
MinRK
01e1d1d40f regen css (non-minified)
via `setup.py css`
2014-07-23 14:57:17 -07:00
MinRK
0c1074223b attempt to regen source maps in git-hooks
if css changes
2014-07-23 14:55:58 -07:00
MinRK
6ea0bd4e94 remove css sourcemaps from repo 2014-07-23 14:53:32 -07:00
MinRK
0eae787b58 don’t store minified css in development
- setup css defaults to non-minified css
- build minified css and jsversion on sdist/wheel
2014-07-23 14:19:27 -07:00
Brian E. Granger
29d67ed8a3 Merge pull request #6168 from SylvainCorlay/once-displayed
once-displayed
2014-07-23 14:17:38 -07:00
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
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