Commit Graph

1126 Commits

Author SHA1 Message Date
Jonathan Frederic
bf65d5837f Finish implementing codemirror events 2014-03-21 13:15:30 -07:00
Jonathan Frederic
1f002cd456 Add displayed property.
and remove logs, commments, etc...
2014-03-21 12:05:02 -07:00
Jonathan Frederic
607b96b19a Actually remove the trigger keydown method 2014-03-20 18:45:06 -07:00
Jonathan Frederic
a2071db309 More progress... 2014-03-20 18:41:15 -07:00
Jonathan Frederic
b2ec594c76 Getting a lot closer... 2014-03-20 18:01:58 -07:00
Jonathan Frederic
23494f4ddd Set tabindex -1, use codemirror's events 2014-03-20 17:37:53 -07:00
Jonathan Frederic
f2c8de99ae Fix broken accordion widget,
Also clean-up the code some while visiting this file.
2014-03-20 16:52:56 -07:00
Jonathan Frederic
ae2b0800cf Partial fix of problems b/c keydown move 2014-03-20 16:11:01 -07:00
Jonathan Frederic
1b46a777fb Removed trigger keydown from keyboard.js,
also added a bunch of missing semicolons (jshint)
2014-03-20 16:11:01 -07:00
Jonathan Frederic
dc6355ffb7 Prevent tab key from bubbling when the completer is open 2014-03-20 15:57:26 -07:00
Min RK
0493027d7e Merge pull request #5403 from minrk/alt-shortcut-bad
remove alt-- shortcut
2014-03-20 15:00:41 -07:00
Brian E. Granger
e51030ea5f Merge pull request #5368 from jdfreder/specifity
Flexbox classes specificity fixes
2014-03-20 14:34:17 -07:00
MinRK
2041dc6563 widen modal dialogs on wide displays
needed for quick help layout with multiple meta keys
2014-03-20 14:12:09 -07:00
MinRK
840364ff71 use box-flex to layout quickhelp 2014-03-20 14:11:05 -07:00
MinRK
19c64f4b59 remove alt-- shortcut
replace with ctrl-shift--

alt is not safe for defaults
2014-03-20 14:10:44 -07:00
Brian E. Granger
9f1b26d860 Merge pull request #5331 from minrk/raw-input-css
fix raw_input CSS
2014-03-20 13:47:14 -07:00
Min RK
0ae0216b12 Merge pull request #5049 from ivanov/quickhelp-update
update quickhelp on adding and removing shortcuts
2014-03-20 12:39:42 -07:00
Paul Ivanov
35c861f583 fix MacOS specific shortcuts, thanks @minrk 2014-03-20 12:38:25 -07:00
Brian E. Granger
bfdbdd456c Merge pull request #5391 from jdfreder/netscape-keyboard
Fix Gecko (Netscape) keyboard handling
2014-03-20 12:35:52 -07:00
Paul Ivanov
c28096f0c5 prevent saving of partially loaded notebooks
closes #5363
2014-03-20 02:21:38 -07:00
Paul Ivanov
54d9eb4358 really fix the '-' key shortcuts now 2014-03-19 22:29:31 -07:00
Paul Ivanov
77bf4a72dd better handling of minus 2014-03-19 19:24:05 -07:00
Jonathan Frederic
a08fbff5d9 Fix Gecko (Netscape) keyboard handling 2014-03-19 16:36:11 -07:00
Paul Ivanov
21ebaf2e32 handle keyboard shortcuts ending with '-' 2014-03-19 16:24:53 -07:00
Paul Ivanov
4cf1717980 use - for shortcut separators 2014-03-19 15:58:59 -07:00
Paul Ivanov
083f631cde wider style for keyboard shortcuts 2014-03-19 12:44:12 -07:00
Min RK
d88b2ccc4a Merge pull request #5310 from ivanov/fix-5238
remove raw cell placeholder on focus, closes #5238
2014-03-19 12:21:03 -07:00
Min RK
5c5139b65d Merge pull request #5332 from ivanov/semantic-icons
semantic names for indicator icons
2014-03-19 12:20:07 -07:00
Paul Ivanov
c54ced12e5 Merge pull request #5360 from minrk/monospace
remove some redundant font-family: monospace
2014-03-19 11:25:12 -07:00
Paul Ivanov
2e4036fd4f raw cell placeholder text as one line 2014-03-19 10:42:11 -07:00
Paul Ivanov
37852baa6d render on focus out, always pad raw cells 2014-03-19 10:37:59 -07:00
Paul Ivanov
8a623dbcc4 fab css 2014-03-18 12:06:06 -07:00
Paul Ivanov
955d239d07 rename css class names to be consistent with current style 2014-03-18 12:03:43 -07:00
Paul Ivanov
a0a17fa04a capitalize keyboard shortcuts in the tour 2014-03-18 11:19:44 -07:00
Paul Ivanov
00603a11f6 remove stale modal dialog from the DOM 2014-03-18 11:16:56 -07:00
Fernando Perez
5f086fded2 Merge pull request #5372 from minrk/no-close-strings
Don't autoclose strings, because CodeMirror's behavior makes it confusing and awkward to type triple-quoted strings (and these are very common in Python).

An issue about this was filed in CodeMirror itself: https://github.com/marijnh/CodeMirror/issues/2385
2014-03-18 11:14:24 -07:00
MinRK
3c1fe84f52 Don't autoclose strings
CodeMirror doesn't do the right thing with triple-quoted strings,
so don't let it try.
2014-03-18 11:11:28 -07:00
Paul Ivanov
597a5cb741 don't color code in crimson
do alliterate, aforementioned color alternative alias is amaranth
2014-03-18 11:03:09 -07:00
Paul Ivanov
b9ef37ac26 semicolon fixes buttress half of my js commits 2014-03-18 10:31:51 -07:00
Min RK
e64c2cb5d8 Merge pull request #5296 from ivanov/more-shortcuts
unify keyboard shortcut and codemirror interaction
2014-03-18 09:46:07 -07:00
Paul Ivanov
0c366861c5 brief key event desription 2014-03-17 21:09:51 -07:00
Paul Ivanov
6d6e0fb007 fix up and down arrows in the top and bottom cells 2014-03-17 20:11:33 -07:00
Paul Ivanov
09866e0ee1 go to the beginning of the line when entering cell 2014-03-17 17:41:44 -07:00
Paul Ivanov
96848748de restore master behavior
up arrow at the top line first goes to char 0, and only goes to the cell
above if already on char 0. Same with down arrow on the bottom line:
transition cursor to the end of the line, and only go down a cell if
already at the end of the last line.

this makes for an unhappy experience in code-mirror's vim mode  for j
and k keys, but we'll fix that in the next commit
2014-03-17 16:21:23 -07:00
Paul Ivanov
8f17444c27 go to appropriate line when coming from another cell
Sets the cursor on the last line of the cell when moved up from the top
of the cell below, and sets the cursors to the first line when moving
down from the bottom of a last line.

Here, we retain the character that the cursor was on, so that users
wishing to have up-down functionality like one document can still use
this shortcut handler and simple adjust the at_top and at_bottom methods
2014-03-17 15:48:36 -07:00
Jonathan Frederic
2dd8757da7 Fab CSS 2014-03-17 10:44:29 -07:00
Jonathan Frederic
77904a044c Re-added already existing base for less backwards compatability. 2014-03-17 10:43:53 -07:00
Jonathan Frederic
0020b9f896 Fix specifity of flex modifier classes 2014-03-17 10:40:28 -07:00
MinRK
8e5937e993 remove some redundant font-family: monospace
`pre`, `code` tags already set the font-family in these contexts.
Setting it again in the surrounding context is redundant,
and causes inconsistency when embedding notebooks in HTML
(e.g. nbviewer).
2014-03-14 11:43:11 -07:00
Jonathan Frederic
d37ffe91b7 Fix status ind. icon bug 2014-03-14 11:40:54 -07:00
MinRK
89faa5f340 simplify raw_input css
for once, vertical-align: baseline is the right choice
2014-03-13 20:47:34 -07:00
MinRK
065a6eaa34 fix ambiguous raw_input classes 2014-03-13 20:45:54 -07:00
Paul Ivanov
61b47695e4 renamed 'use_shortcut' method to 'handles' 2014-03-13 16:44:19 -07:00
Paul Ivanov
d8287466d0 another doc fix 2014-03-13 16:40:37 -07:00
Paul Ivanov
f68dcc3e57 it's only half true that I'm anal about semicolons 2014-03-13 16:30:58 -07:00
Paul Ivanov
67fd905421 minor fixes to docs to address PR feedback 2014-03-13 16:29:28 -07:00
Paul Ivanov
469c70fd10 more semicolons 2014-03-13 16:23:27 -07:00
Jonathan Frederic
443083c1fd Added some comments 2014-03-13 14:34:17 -07:00
Paul Ivanov
1dc113a9cb closes #5336 2014-03-13 14:30:32 -07:00
Paul Ivanov
4142911ac7 better fix for starting with Command Mode icon 2014-03-11 18:58:46 -07:00
Paul Ivanov
12139b4d6e ensure ipython-command-mode icon displayed on load 2014-03-11 18:48:21 -07:00
Paul Ivanov
f0ae836f5f semantic names for kernel status indicator 2014-03-11 18:37:35 -07:00
Paul Ivanov
f5a02a02dd semantic names for indicator icons
For all of the discussion that we had about what kind of icons should
and should not be used to indicate what mode the notebook is in, we
never went through to make it possible to override it.

With this change, it is now possible to override what icons are
displayed for Command and Edit Modes.

For example, @minrk liked the fighter-jet icon for Command Mode, so he
can put this in his custom.css

.ipython-command-mode:before {
     content: "\f0fb";
}
2014-03-11 18:22:03 -07:00
MinRK
084aba793f fix raw_input CSS
I had to express padding in px, not em for consistent appearance.
I'm not sure why.
2014-03-11 14:45:37 -07:00
Paul Ivanov
4dd009f198 DRY: style in one place, removed code duplication 2014-03-11 00:53:15 -07:00
Jonathan Frederic
7762cb0ab3 Fixed a small bug/typo 2014-03-10 15:29:10 -07:00
Jonathan Frederic
e61b6aef47 Add logic to close tt when cell is unselected 2014-03-10 15:26:04 -07:00
Brian E. Granger
3eb654bd86 Merge pull request #5295 from minrk/no-append-prototype
OutputArea.append_type functions are not prototype methods
2014-03-10 14:13:14 -07:00
Paul Ivanov
b08665563d fix capitalization of mode-switching keys 2014-03-10 11:48:13 -07:00
MinRK
a24595d16b call append_text from append_map 2014-03-10 11:44:00 -07:00
Paul Ivanov
01c9be84d0 prettify combo keyboard shortcuts 2014-03-10 11:30:50 -07:00
Paul Ivanov
1c213bc615 first pass at capitalizing keyboard shortcuts 2014-03-10 11:13:18 -07:00
Jonathan Frederic
95492b0f42 Add illusion that cell is in edit mode when complete is up,
even though it is not in focus so it is not in edit mode.
2014-03-10 10:10:06 -07:00
Jonathan Frederic
65732920eb Remove all should cancel blur logic. 2014-03-10 09:46:59 -07:00
Jonathan Frederic
989ae4e1b3 Workaround for Tooltip & completer click focus bug. 2014-03-10 09:28:19 -07:00
MinRK
abe2dce926 back to dev 2014-03-09 21:58:09 -07:00
Paul Ivanov
1c23dee141 remove recreation of QuickHelp 2014-03-09 14:21:14 -07:00
Paul Ivanov
8bf4ffa2ca rebuild.QuickHelp event sets the dirty bit
QuickHelp is rebuilt on show if the dirty bit was set.
2014-03-09 14:15:47 -07:00
Paul Ivanov
cdb7967cc2 removing keyboard shortcuts should also update help 2014-03-09 12:26:34 -07:00
Paul Ivanov
4a287569fc update notebook quickhelp on new shortcuts 2014-03-09 12:24:32 -07:00
Paul Ivanov
cd38181438 remove raw cell placeholder on focus, closes #5238 2014-03-09 11:41:25 -07:00
MinRK
4d1f9b21c4 append functions are not prototype methods 2014-03-07 17:57:37 -08:00
Paul Ivanov
54409a196d dem semicolons 2014-03-07 17:48:34 -08:00
Paul Ivanov
19c7189b15 no need to special-case Escape anymore 2014-03-07 17:48:34 -08:00
Paul Ivanov
6a2c4121f9 up and down keys no longer need special casing 2014-03-07 17:48:34 -08:00
Paul Ivanov
2c9ff376a2 added new use_shortcut method to shortcuts
this way, you can ask if a particular event will be handled by the
shortcuts system. This takes away the need to special-case many
different possible keys which should be ignored by codemirror by
ignoring them en masse.
2014-03-07 17:48:34 -08:00
Paul Ivanov
b9e448b160 DRY: refactor common keyboard handling to Cell
Our edit mode keyboard shortcuts don't distinguish between being in a
code cell or in a text cell, so it makes sense to handle both in one
place. This is a first step in that direction.
2014-03-07 17:48:34 -08:00
Paul Ivanov
15f4345ba3 typo, use keycodes object instead of magic numbers 2014-03-07 17:48:34 -08:00
Paul Ivanov
bf3ecdb35f DRY: factor out common handle_keyevent method
This method was identical in both CodeCell and TextCell
2014-03-07 17:48:34 -08:00
Paul Ivanov
71d4c427c9 refactor to improve cell switching in edit mode
This code was repeated in both CodeCell and TextCell, both of which are
extensions of Cell, so this just unifies the logic in Cell.

TextCell had logic here to check if the cell was rendered or not, but I
don't believe it is possible to end up triggering such a code path.
(Should that be required, I can always just add back these methods to
TextCell, performing the .rendered==True check, and calling the Cell

prior to this, code mirror at_top would only return true on if the
cursor was at the first character of the top line. Now, pressing up
arrow on any character on the top line will take you to the cell above.

The same applies for the bottom line. Pressing down arrow would only go
to the next cell if the cursor was at a location *after* the last
character (something that is only possible to achieve in vim mode if the
last line is empty, for example). Now, down arrow on any character of
the last line will go to the next cell.
2014-03-07 17:48:34 -08:00
Paul Ivanov
8889a7581c start better keyboard handling 2014-03-07 17:48:34 -08:00
MinRK
3face719e8 setup jsversion 2014-03-07 15:54:55 -08:00
Brian E. Granger
30c500bfa9 Merge pull request #5292 from jdfreder/shift-enter-scroll
focus next cell on shift+enter
2014-03-07 14:55:48 -08:00
Jonathan Frederic
da334e782e focus next cell on shift+enter 2014-03-07 14:48:09 -08:00
Min RK
0a37d7bfc5 Merge pull request #5232 from jdfreder/nbc_incono
Make nbconvert html full output like notebook's html.
2014-03-07 14:14:43 -08:00
Brian E. Granger
05e6fbade4 Merge pull request #5288 from minrk/start-idle
Correct initial state of kernel status indicator
2014-03-07 14:07:42 -08:00
Thomas Kluyver
80af3b4cfb Merge pull request #4802 from ivanov/ui-docs
Tour of the notebook UI (was UI elements inline with highlighting)
2014-03-07 12:09:32 -08:00
MinRK
e901c9be33 Correct initial state of kernel status indicator
- start as busy, since we don't know
- send a kernel_info request once connections are established
- set idle on reply to the to the kernel_info request
2014-03-07 11:51:54 -08:00
Brian E. Granger
f62ce75a62 Lots of CSS tweaks to get nbconvert output looking right. 2014-03-06 16:36:39 -08:00
Jonathan Frederic
9c5bca99e2 addClass instead of adding extra_class arg everywhere 2014-03-06 14:22:36 -08:00