Skip to content
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.

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

Fix installation and security issues #235

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions app/javascripts/jquery-2.1.4.min.js

This file was deleted.

2 changes: 2 additions & 0 deletions app/javascripts/jquery-3.7.1.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions app/javascripts/jquery-migrate-3.4.1.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions app/javascripts/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,20 @@ $(function() {
};

// Drawer open buttons
$drawerLayout.find('[data-drawer-slide]').click(function(e) {
$drawerLayout.find('[data-drawer-slide]').on('click', function(e) {
var $this = $(this),
direction = $this.data('drawer-slide');
$drawerLayout.addClass('drawer-open');
$drawer.addClass('slide-' + direction);

var $overlay = $('<a href="#" class="drawer-overlay"></a>')
$drawer.append($overlay);
$overlay.click(closeDrawer);
$overlay.on('click', closeDrawer);

return false;
});

// Drawer close buttons
$drawerLayout.find('[data-drawer-close]').click(closeDrawer);
$drawerLayout.find('[data-drawer-close]').on('click', closeDrawer);
}
});
6 changes: 3 additions & 3 deletions app/javascripts/traverse.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@ Traverse.prototype._events = function() {
easing: _this.options.animationEasing
};

$(window).one('load', function(){
$(function(){
_this.calcPoints();
_this._updateActive();

$(this).resize(function(e) {
$(this).on('resize', function(e) {
_this.reflow();
}).scroll(function(e) {
}).on('scroll', function(e) {
_this._updateActive();
});
})
Expand Down
6 changes: 3 additions & 3 deletions app/lib/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ var common = {
return value;
}

var html = marked(value)
var html = marked.marked(value)
// We strip the surrounding <p>-tag, if
if (stripParagraph) {
var $ = cheerio.load("<root>" + html + "</root>")
Expand All @@ -48,7 +48,7 @@ var common = {

return '<pre><code'
+ (lang
? ' class="hljs ' + this.options.langPrefix + lang + '"'
? ' class="hljs language-' + lang + '"'
: ' class="hljs"')
+ '>'
+ highlighted //code //
Expand Down Expand Up @@ -183,7 +183,7 @@ var common = {
// Add an extra CRLR before the code so the postprocessor can determine
// the correct line indent for the <pre> tag.

var $ = cheerio.load(marked(toyaml ? "```yaml\r\n" + schemaString + "```" : "```json\r\n" + schemaString + "\n```"))
var $ = cheerio.load(marked.marked(toyaml ? "```yaml\r\n" + schemaString + "```" : "```json\r\n" + schemaString + "\n```"))
var definitions = $('span:not(:has(span)):contains("#/definitions/")')
definitions.each(function(index, item) {
var ref = $(item).html()
Expand Down
2 changes: 1 addition & 1 deletion app/vendor/foundation/LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2011-2017 ZURB, inc.
Copyright © 2011-2020 ZURB, Inc.

MIT License

Expand Down
Loading