Skip to content

Commit

Permalink
fix #1118: update jQuery to v3.x (#693)
Browse files Browse the repository at this point in the history
also close #882

Co-authored-by: mterente <[email protected]>
Co-authored-by: Yihui Xie <[email protected]>
  • Loading branch information
3 people authored Jul 29, 2021
1 parent b4aa7bb commit bb62d08
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 306 deletions.
3 changes: 1 addition & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ Authors@R: c(
person(family = "RStudio, PBC", role = "cph"),
person("Bartek", "Szopka", role = "ctb", comment = "The jQuery Highlight plugin"),
person("Zeno", "Rocha", role = "cph", comment = "clipboard.js library"),
person(family = "jQuery Foundation", role = "cph", comment = "jQuery library"),
person(family = "jQuery contributors", role = c("ctb", "cph"), comment = "jQuery library; authors listed in inst/resources/AUTHORS"),
person(family = "MathQuill contributors", role = "ctb", comment = "The MathQuill library; authors listed in inst/resources/AUTHORS"),
person(family = "FriendCode Inc", role = c("cph", "ctb"), comment = "The gitbook style, with modifications")
)
Expand All @@ -64,6 +62,7 @@ Imports:
htmltools (>= 0.3.6),
knitr (>= 1.31),
rmarkdown (>= 2.9),
jquerylib,
xfun (>= 0.22),
tinytex (>= 0.12),
yaml (>= 2.1.19)
Expand Down
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@

This change comes with several small improvements in `custom-enviromnent.lua` for `latex` and `beamer` format, including a new option `bookdown.theorem.preamble` to opt-out **bookdown** addition of theorems and proofs definitions in LaTeX preamble. Set it to `FALSE` if you have conflict with some specific format for example (like #1001).

- Updated the jQuery library to v3.x, which was imported from the R package **jquerylib** (thanks, @mterente #693, @cooknl #882).

- When the `site` field is quoted in `index.Rmd`'s YAML data (i.e., `site: "bookdown::bookdown_site"`), **bookdown** fails to identify the root directory of the book (thanks, @dchiu911, #1160).
# CHANGES IN bookdown VERSION 0.22
Expand Down
5 changes: 1 addition & 4 deletions R/addins.R
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
jquery_dependency = function() {
htmltools::htmlDependency(
'jquery', '2.2.3', bookdown_file('resources', 'jquery'),
script = 'jquery.min.js'
)
jquerylib::jquery_core()
}

mathquill = function() {
Expand Down
285 changes: 0 additions & 285 deletions inst/resources/AUTHORS
Original file line number Diff line number Diff line change
@@ -1,288 +1,3 @@
jQuery Authors
--------------------------------------------------------------------------------

Authors ordered by first contribution.

John Resig <[email protected]>
Gilles van den Hoven <[email protected]>
Michael Geary <[email protected]>
Stefan Petre <[email protected]>
Yehuda Katz <[email protected]>
Corey Jewett <[email protected]>
Klaus Hartl <[email protected]>
Franck Marcia <[email protected]>
Jörn Zaefferer <[email protected]>
Paul Bakaus <[email protected]>
Brandon Aaron <[email protected]>
Mike Alsup <[email protected]>
Dave Methvin <[email protected]>
Ed Engelhardt <[email protected]>
Sean Catchpole <[email protected]>
Paul Mclanahan <[email protected]>
David Serduke <[email protected]>
Richard D. Worth <[email protected]>
Scott González <[email protected]>
Ariel Flesler <[email protected]>
Jon Evans <[email protected]>
TJ Holowaychuk <[email protected]>
Michael Bensoussan <[email protected]>
Robert Katić <[email protected]>
Louis-Rémi Babé <[email protected]>
Earle Castledine <[email protected]>
Damian Janowski <[email protected]>
Rich Dougherty <[email protected]>
Kim Dalsgaard <[email protected]>
Andrea Giammarchi <[email protected]>
Mark Gibson <[email protected]>
Karl Swedberg <[email protected]>
Justin Meyer <[email protected]>
Ben Alman <[email protected]>
James Padolsey <[email protected]>
David Petersen <[email protected]>
Batiste Bieler <[email protected]>
Alexander Farkas <[email protected]>
Rick Waldron <[email protected]>
Filipe Fortes <[email protected]>
Neeraj Singh <[email protected]>
Paul Irish <[email protected]>
Iraê Carvalho <[email protected]>
Matt Curry <[email protected]>
Michael Monteleone <[email protected]>
Noah Sloan <[email protected]>
Tom Viner <[email protected]>
Douglas Neiner <[email protected]>
Adam J. Sontag <[email protected]>
Dave Reed <[email protected]>
Ralph Whitbeck <[email protected]>
Carl Fürstenberg <[email protected]>
Jacob Wright <[email protected]>
J. Ryan Stinnett <[email protected]>
unknown <[email protected]>
temp01 <[email protected]>
Heungsub Lee <[email protected]>
Colin Snover <[email protected]>
Ryan W Tenney <[email protected]>
Pinhook <[email protected]>
Ron Otten <[email protected]>
Jephte Clain <[email protected]>
Anton Matzneller <[email protected]>
Alex Sexton <[email protected]>
Dan Heberden <[email protected]>
Henri Wiechers <[email protected]>
Russell Holbrook <[email protected]>
Julian Aubourg <[email protected]>
Gianni Alessandro Chiappetta <[email protected]>
Scott Jehl <[email protected]>
James Burke <[email protected]>
Jonas Pfenniger <[email protected]>
Xavi Ramirez <[email protected]>
Jared Grippe <[email protected]>
Sylvester Keil <[email protected]>
Brandon Sterne <[email protected]>
Mathias Bynens <[email protected]>
Timmy Willison <[email protected]>
Corey Frang <[email protected]>
Digitalxero <digitalxero>
Anton Kovalyov <[email protected]>
David Murdoch <[email protected]>
Josh Varner <[email protected]>
Charles McNulty <[email protected]>
Jordan Boesch <[email protected]>
Jess Thrysoee <[email protected]>
Michael Murray <[email protected]>
Lee Carpenter <[email protected]>
Alexis Abril <[email protected]>
Rob Morgan <[email protected]>
John Firebaugh <[email protected]>
Sam Bisbee <[email protected]>
Gilmore Davidson <[email protected]>
Brian Brennan <[email protected]>
Xavier Montillet <[email protected]>
Daniel Pihlstrom <[email protected]>
Sahab Yazdani <[email protected]>
avaly <[email protected]>
Scott Hughes <[email protected]>
Mike Sherov <[email protected]>
Greg Hazel <[email protected]>
Schalk Neethling <[email protected]>
Denis Knauf <[email protected]>
Timo Tijhof <[email protected]>
Steen Nielsen <[email protected]>
Anton Ryzhov <[email protected]>
Shi Chuan <[email protected]>
Berker Peksag <[email protected]>
Toby Brain <[email protected]>
Matt Mueller <[email protected]>
Justin <[email protected]>
Daniel Herman <[email protected]>
Oleg Gaidarenko <[email protected]>
Richard Gibson <[email protected]>
Rafaël Blais Masson <[email protected]>
cmc3cn <[email protected]>
Joe Presbrey <[email protected]>
Sindre Sorhus <[email protected]>
Arne de Bree <[email protected]>
Vladislav Zarakovsky <[email protected]>
Andrew E Monat <[email protected]>
Oskari <[email protected]>
Joao Henrique de Andrade Bruni <[email protected]>
tsinha <[email protected]>
Matt Farmer <[email protected]>
Trey Hunner <[email protected]>
Jason Moon <[email protected]>
Jeffery To <[email protected]>
Kris Borchers <[email protected]>
Vladimir Zhuravlev <[email protected]>
Jacob Thornton <[email protected]>
Chad Killingsworth <[email protected]>
Nowres Rafid <[email protected]>
David Benjamin <[email protected]>
Uri Gilad <[email protected]>
Chris Faulkner <[email protected]>
Elijah Manor <[email protected]>
Daniel Chatfield <[email protected]>
Nikita Govorov <[email protected]>
Wesley Walser <[email protected]>
Mike Pennisi <[email protected]>
Markus Staab <[email protected]>
Dave Riddle <[email protected]>
Callum Macrae <[email protected]>
Benjamin Truyman <[email protected]>
James Huston <[email protected]>
Erick Ruiz de Chávez <[email protected]>
David Bonner <[email protected]>
Akintayo Akinwunmi <[email protected]>
MORGAN <[email protected]>
Ismail Khair <[email protected]>
Carl Danley <[email protected]>
Mike Petrovich <[email protected]>
Greg Lavallee <[email protected]>
Daniel Gálvez <[email protected]>
Sai Lung Wong <[email protected]>
Tom H Fuertes <[email protected]>
Roland Eckl <[email protected]>
Jay Merrifield <[email protected]>
Allen J Schmidt Jr <[email protected]>
Jonathan Sampson <[email protected]>
Marcel Greter <[email protected]>
Matthias Jäggli <[email protected]>
David Fox <[email protected]>
Yiming He <[email protected]>
Devin Cooper <[email protected]>
Paul Ramos <[email protected]>
Rod Vagg <[email protected]>
Bennett Sorbo <[email protected]>
Sebastian Burkhard <[email protected]>
Zachary Adam Kaplan <[email protected]>
nanto_vi <[email protected]>
nanto <[email protected]>
Danil Somsikov <[email protected]>
Ryunosuke SATO <[email protected]>
Jean Boussier <[email protected]>
Adam Coulombe <[email protected]>
Andrew Plummer <[email protected]>
Mark Raddatz <[email protected]>
Isaac Z. Schlueter <[email protected]>
Karl Sieburg <[email protected]>
Pascal Borreli <[email protected]>
Nguyen Phuc Lam <[email protected]>
Dmitry Gusev <[email protected]>
Michał Gołębiowski <[email protected]>
Li Xudong <[email protected]>
Steven Benner <[email protected]>
Tom H Fuertes <[email protected]>
Renato Oliveira dos Santos <[email protected]>
ros3cin <[email protected]>
Jason Bedard <[email protected]>
Kyle Robinson Young <[email protected]>
Chris Talkington <[email protected]>
Eddie Monge <[email protected]>
Terry Jones <[email protected]>
Jason Merino <[email protected]>
Jeremy Dunck <[email protected]>
Chris Price <[email protected]>
Guy Bedford <[email protected]>
Amey Sakhadeo <[email protected]>
Mike Sidorov <[email protected]>
Anthony Ryan <[email protected]>
Dominik D. Geyer <[email protected]>
George Kats <[email protected]>
Lihan Li <[email protected]>
Ronny Springer <[email protected]>
Chris Antaki <[email protected]>
Marian Sollmann <[email protected]>
njhamann <[email protected]>
Ilya Kantor <[email protected]>
David Hong <[email protected]>
John Paul <[email protected]>
Jakob Stoeck <[email protected]>
Christopher Jones <[email protected]>
Forbes Lindesay <[email protected]>
S. Andrew Sheppard <[email protected]>
Leonardo Balter <[email protected]>
Roman Reiß <[email protected]>
Benjy Cui <[email protected]>
Rodrigo Rosenfeld Rosas <[email protected]>
John Hoven <[email protected]>
Philip Jägenstedt <[email protected]>
Christian Kosmowski <[email protected]>
Liang Peng <[email protected]>
TJ VanToll <[email protected]>
Senya Pugach <[email protected]>
Aurelio De Rosa <[email protected]>
Nazar Mokrynskyi <[email protected]>
Amit Merchant <[email protected]>
Jason Bedard <[email protected]>
Arthur Verschaeve <[email protected]>
Dan Hart <[email protected]>
Bin Xin <[email protected]>
David Corbacho <[email protected]>
Veaceslav Grimalschi <[email protected]>
Daniel Husar <[email protected]>
Frederic Hemberger <[email protected]>
Ben Toews <[email protected]>
Aditya Raghavan <[email protected]>
Victor Homyakov <[email protected]>
Shivaji Varma <[email protected]>
Nicolas HENRY <[email protected]>
Anne-Gaelle Colom <[email protected]>
George Mauer <[email protected]>
Leonardo Braga <[email protected]>
Stephen Edgar <[email protected]>
Thomas Tortorini <[email protected]>
Winston Howes <[email protected]>
Jon Hester <[email protected]>
Alexander O'Mara <[email protected]>
Bastian Buchholz <[email protected]>
Arthur Stolyar <[email protected]>
Calvin Metcalf <[email protected]>
Mu Haibao <[email protected]>
Richard McDaniel <[email protected]>
Chris Rebert <[email protected]>
Gabriel Schulhof <[email protected]>
Gilad Peleg <[email protected]>
Martin Naumann <[email protected]>
Marek Lewandowski <[email protected]>
Bruno Pérel <[email protected]>
Reed Loden <[email protected]>
Daniel Nill <[email protected]>
Yongwoo Jeon <[email protected]>
Sean Henderson <[email protected]>
Richard Kraaijenhagen <[email protected]>
Connor Atherton <[email protected]>
Gary Ye <[email protected]>
Christian Grete <[email protected]>
Liza Ramo <[email protected]>
Julian Alexander Murillo <[email protected]>
Joelle Fleurantin <[email protected]>
Jae Sung Park <[email protected]>
Jun Sun <[email protected]>
Josh Soref <[email protected]>
Henry Wong <[email protected]>
Jon Dufresne <[email protected]>
Martijn W. van der Lee <[email protected]>


MathQuill Authors
--------------------------------------------------------------------------------

Expand Down
12 changes: 1 addition & 11 deletions inst/resources/gitbook/js/app.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
/*!
* jQuery JavaScript Library v2.1.4
* http://jquery.com/
*
* Includes Sizzle.js
* http://sizzlejs.com/
*
* Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors
* Released under the MIT license
* http://jquery.org/license
*
* Date: 2015-04-28T16:01Z
* use the external version of the jQuery Library
*/
if ( typeof module === "object" && typeof module.exports === "object" ) {
module.exports = jQuery;
Expand Down
4 changes: 0 additions & 4 deletions inst/resources/jquery/jquery.min.js

This file was deleted.

0 comments on commit bb62d08

Please sign in to comment.