Skip to content

fix some absolute URL paths #2430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 24, 2017
Merged

fix some absolute URL paths #2430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eaeb5cb
remove some outdated, incorrect $.getScript examples
minrk Apr 19, 2017
61439f8
fix some absolute URLs
minrk Apr 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions notebook/static/custom/custom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,6 @@
* });
* });
*
* __Example 3:__
*
* Use `jQuery.getScript(url [, success(script, textStatus, jqXHR)] );`
* to load custom script into the notebook.
*
* // to load the metadata ui extension example.
* $.getScript('/static/notebook/js/celltoolbarpresets/example.js');
* // or
* // to load the metadata ui extension to control slideshow mode / reveal js for nbconvert
* $.getScript('/static/notebook/js/celltoolbarpresets/slideshow.js');
*
*
* @module IPython
Expand Down
7 changes: 0 additions & 7 deletions notebook/static/notebook/js/celltoolbarpresets/example.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.

// Example Use for the CellToolbar library
// add the following to your custom.js to load
// Celltoolbar UI for slideshow

// ```
// $.getScript('/static/js/celltoolbarpresets/example.js');
// ```
define([
'notebook/js/celltoolbar',
], function(celltoolbar) {
Expand Down
2 changes: 1 addition & 1 deletion notebook/static/notebook/js/notificationarea.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ define([
link.id = 'favicon';
link.type = 'image/x-icon';
link.rel = 'shortcut icon';
link.href = src;
link.href = utils.url_path_join(utils.get_body_data('baseUrl'), src);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The paths passed into this function have a leading / - is this OK, or do they need to be changed as you've changed the other path below?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@minrk ping! If you decide this isn't a problem, feel free to push the green button.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

url_path_join strips intermediate /, so this is fine.

if (oldLink) document.head.removeChild(oldLink);
document.head.appendChild(link);
};
Expand Down
2 changes: 1 addition & 1 deletion notebook/static/notebook/js/pager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ define([
.append(
$('<link>')
.attr('rel',"stylesheet")
.attr('href',"/static/css/notebook.css")
.attr('href', utils.url_path_join(utils.get_body_data('baseUrl'), "static/style/style.min.css"))
.attr('type',"text/css")
)
.append(
Expand Down