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.

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

js: Update jQuery to 2.2.4 and add jQuery Migrate plugin #3762

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

js: Update jQuery to 2.2.4 and add jQuery Migrate plugin #3762

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
43b0624
js: Update jQuery to 2.2.4 and add jQuery Migrate plugin
ibuclaw Jan 28, 2024
f91bb60
js: Migrate code to not use deprecated 2.x features
ibuclaw Jan 28, 2024
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
5 changes: 3 additions & 2 deletions book/dlang.org.ddoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ COMMON_HEADERS_DLANG=
<link rel="stylesheet" href="$(STATIC css/codemirror.css)">
_=
COMMON_SCRIPTS =
$(SCRIPTLOAD https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js)
$(SCRIPT window.jQuery || document.write('\x3Cscript src="$(STATIC js/jquery-1.7.2.min.js)">\x3C/script>');$(EXTRA_JS))
$(SCRIPTLOAD https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js)
$(SCRIPT window.jQuery || document.write('\x3Cscript src="$(STATIC js/jquery-2.2.4.min.js)">\x3C/script>');$(EXTRA_JS))
$(SCRIPTLOAD $(STATIC js/jquery-migrate-1.4.1.js))
$(SCRIPTLOAD $(STATIC js/dlang.js))
$(COMMON_SCRIPTS_DLANG)
_=
Expand Down
5 changes: 3 additions & 2 deletions dlang.org.ddoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ COMMON_HEADERS_DLANG=
<link rel="stylesheet" href="$(STATIC css/codemirror.css)">
_=
COMMON_SCRIPTS =
$(SCRIPTLOAD https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js)
$(SCRIPT window.jQuery || document.write('\x3Cscript src="$(STATIC js/jquery-1.7.2.min.js)">\x3C/script>');$(EXTRA_JS))
$(SCRIPTLOAD https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js)
$(SCRIPT window.jQuery || document.write('\x3Cscript src="$(STATIC js/jquery-2.2.4.min.js)">\x3C/script>');$(EXTRA_JS))
$(SCRIPTLOAD $(STATIC js/jquery-migrate-1.4.1.js))
$(SCRIPTLOAD $(STATIC js/dlang.js))
$(COMMON_SCRIPTS_DLANG)
_=
Expand Down
11 changes: 7 additions & 4 deletions dpl-docs/views/layout.dt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ html(lang='en-US')
link(rel='stylesheet', href='#{root_dir}css/ddox.css')
link(rel='stylesheet', href='https://maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css')
link(rel='shortcut icon', href='#{root_dir}favicon.ico')
script(src='https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js', type='text/javascript')
script(src='https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js', type='text/javascript')
script(type='text/javascript', src='#{root_dir}js/jquery-migrate-1.4.1.js')
meta(name='viewport', content='width=device-width, initial-scale=1.0, minimum-scale=0.1, maximum-scale=10.0')

body.std(id='#{info.node.moduleName}')
Expand Down Expand Up @@ -228,10 +229,12 @@ html(lang='en-US')
#copyright.smallprint
| Copyright &copy; 1999-#{year} by the <a href="#{root_dir}foundation_overview.html">D Language Foundation</a> | Page generated by <a href="https://github.com/rejectedsoftware/ddox">ddox</a>.

script(type='text/javascript', src='https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js')
script(type='text/javascript', src='https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js')
|
script(type='text/javascript').
window.jQuery || document.write('\x3Cscript src="#{root_dir}js/jquery-1.7.2.min.js">\x3C/script>')
window.jQuery || document.write('\x3Cscript src="#{root_dir}js/jquery-2.2.4.min.js">\x3C/script>')
|
script(type='text/javascript', src='#{root_dir}js/jquery-migrate-1.4.1.js')
|
script(type='text/javascript', src='#{root_dir}js/codemirror-compressed.js')
|
Expand All @@ -241,5 +244,5 @@ html(lang='en-US')
script(type='text/javascript', src='#{root_dir}js/listanchors.js')
script(type="text/javascript", src="#{root_dir}js/ddox.js")
script(type='text/javascript').
jQuery(document).ready(listanchors);
jQuery(listanchors);
setupDdox();
4 changes: 0 additions & 4 deletions js/jquery-1.7.2.min.js
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions js/jquery-2.2.4.min.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading