Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit d527799

Browse filesBrowse files
committed
Merge remote-tracking branch 'upstream/v2.x'
2 parents 6c7e06a + d42e3e9 commit d527799
Copy full SHA for d527799

File tree

Expand file treeCollapse file tree

7 files changed

+2009
-9
lines changed
Filter options
Expand file treeCollapse file tree

7 files changed

+2009
-9
lines changed

‎lib/matplotlib/backends/web_backend/js/nbagg_mpl.js

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/web_backend/js/nbagg_mpl.js
+3-6Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,9 @@ define(['jupyter-js-widgets', '/nbextensions/matplotlib/mpl.js'], function(widge
151151
if (event.shiftKey && event.which == 13) {
152152
this.canvas_div.blur();
153153
event.shiftKey = false;
154-
// Send a "J" for go to next cell
155-
event.which = 74;
156-
event.keyCode = 74;
157-
manager.command_mode();
158-
manager.handle_keydown(event);
159-
}
154+
// select the cell after this one
155+
var index = IPython.notebook.find_cell_index(this.cell_info[0]);
156+
IPython.notebook.select(index + 1); }
160157
}
161158

162159
mpl.figure.prototype.handle_save = function(fig, msg) {

‎lib/matplotlib/lines.py

Copy file name to clipboardExpand all lines: lib/matplotlib/lines.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def _get_dash_pattern(style):
6767
def _scale_dashes(offset, dashes, lw):
6868
if rcParams['_internal.classic_mode']:
6969
return offset, dashes
70-
scale = max(1.0, lw)
70+
scale = max(2.0, lw)
7171
scaled_offset = scaled_dashes = None
7272
if offset is not None:
7373
scaled_offset = offset * scale

‎lib/matplotlib/rcsetup.py

Copy file name to clipboardExpand all lines: lib/matplotlib/rcsetup.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -916,7 +916,7 @@ def validate_animation_writer_path(p):
916916
'lines.solid_capstyle': ['projecting', validate_capstyle],
917917
'lines.dashed_pattern': [[2.8, 1.2], validate_nseq_float()],
918918
'lines.dashdot_pattern': [[4.8, 1.2, 0.8, 1.2], validate_nseq_float()],
919-
'lines.dotted_pattern': [[1.2, 0.6], validate_nseq_float()],
919+
'lines.dotted_pattern': [[1.1, 1.1], validate_nseq_float()],
920920

921921
# marker props
922922
'markers.fillstyle': ['full', validate_fillstyle],
Binary file not shown.
Loading

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.