mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-24 12:05:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3282 from parente/fix-3276-click-modifiers

Browse Source 
Fix clicking with modifiers, page title updates
This commit is contained in:
Thomas Kluyver 2018-02-02 11:42:34 +00:00 committed by GitHub
commit 6d7fd5c36d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
notebook/static/tree/js/notebooklist.js
View File

@ -365,6 +365,10 @@ define([
breadcrumb.empty(); breadcrumb.empty();
var list_item = $('<li/>'); var list_item = $('<li/>');
var root = $('<li/>').append('<a href="/tree"><i class="fa fa-folder"></i></a>').click(function(e) { var root = $('<li/>').append('<a href="/tree"><i class="fa fa-folder"></i></a>').click(function(e) {
// Allow the default browser action when the user holds a modifier (e.g., Ctrl-Click)
if(e.altKey || e.metaKey || e.shiftKey) {
return true;
}
var path = ''; var path = '';
window.history.pushState({ window.history.pushState({
path: path path: path
@ -383,6 +387,10 @@ define([
utils.encode_uri_components(path) utils.encode_uri_components(path)
); );
var crumb = $('<li/>').append('<a href="' + url + '">' + path_part + '</a>').click(function(e) { var crumb = $('<li/>').append('<a href="' + url + '">' + path_part + '</a>').click(function(e) {
// Allow the default browser action when the user holds a modifier (e.g., Ctrl-Click)
if(e.altKey || e.metaKey || e.shiftKey) {
return true;
}
window.history.pushState({ window.history.pushState({
path: path path: path
}, path, url); }, path, url);
@ -404,6 +412,10 @@ define([
$('body').attr('data-notebook-path', path); $('body').attr('data-notebook-path', path);
// Update the file tree list without reloading the page // Update the file tree list without reloading the page
this.load_list(); this.load_list();
// Update the page title so the browser tab reflects it
// Match how the title appears with a trailing slash or
// "Home" if the page loads from the server.
$('title').text(path ? path+'/' : i18n.msg._("Home"));
}; };
/** /**
@ -810,8 +822,12 @@ define([
link.attr('target', IPython._target); link.attr('target', IPython._target);
} else { } else {
// Replace with a click handler that will use the History API to // Replace with a click handler that will use the History API to
// push a new route without reloading the page // push a new route without reloading the page if the click is
// not modified (e.g., Ctrl-Click)
link.click(function (e) { link.click(function (e) {
if(e.altKey || e.metaKey || e.shiftKey) {
return true;
}
window.history.pushState({ window.history.pushState({
path: model.path path: model.path
}, model.path, utils.url_path_join( }, model.path, utils.url_path_join(