Skip to content

Commit ec07302

Browse files
authored
Merge pull request #4449 from dkorpel/upgrade-jquery
Upgrade jquery 1.7.2 -> 3.7.1
2 parents 2f0fd37 + 0134791 commit ec07302

6 files changed

Lines changed: 9 additions & 17 deletions

File tree

book/dlang.org.ddoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ COMMON_HEADERS_DLANG=
3030
<link rel="stylesheet" href="$(STATIC css/codemirror.css)">
3131
_=
3232
COMMON_SCRIPTS =
33-
$(SCRIPTLOAD https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js)
34-
$(SCRIPT window.jQuery || document.write('\x3Cscript src="$(STATIC js/jquery-1.7.2.min.js)">\x3C/script>');$(EXTRA_JS))
33+
$(SCRIPTLOAD https://ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js)
34+
$(SCRIPT window.jQuery || document.write('\x3Cscript src="$(STATIC js/jquery-3.7.1.min.js)">\x3C/script>');$(EXTRA_JS))
3535
$(SCRIPTLOAD $(STATIC js/dlang.js))
3636
$(COMMON_SCRIPTS_DLANG)
3737
_=

dlang.org.ddoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ COMMON_HEADERS_DLANG=
3131
<link rel="stylesheet" href="$(STATIC css/codemirror.css)">
3232
_=
3333
COMMON_SCRIPTS =
34-
$(SCRIPTLOAD https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js)
35-
$(SCRIPT window.jQuery || document.write('\x3Cscript src="$(STATIC js/jquery-1.7.2.min.js)">\x3C/script>');$(EXTRA_JS))
34+
$(SCRIPTLOAD https://ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js)
35+
$(SCRIPT window.jQuery || document.write('\x3Cscript src="$(STATIC js/jquery-3.7.1.min.js)">\x3C/script>');$(EXTRA_JS))
3636
$(SCRIPTLOAD $(STATIC js/dlang.js))
3737
$(COMMON_SCRIPTS_DLANG)
3838
_=

js/jquery-1.7.2.min.js

Lines changed: 0 additions & 4 deletions
This file was deleted.

js/jquery-3.7.1.min.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/run.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,7 @@ function parseOutput(res, o, oTitle)
150150
if (res.cstatus != 0)
151151
{
152152
oTitle.text("Compilation output ("+res.cstatus+": "+res.cerr+")");
153-
if ($.browser.msie)
154-
o.html(nl2br(res.cout));
155-
else
156-
o.text(res.cout);
153+
o.text(res.cout);
157154

158155
return;
159156
}
@@ -172,10 +169,7 @@ function parseOutput(res, o, oTitle)
172169
oTitle.text("Application output ("+res.rstatus+": "+res.rerr+")");
173170
}
174171

175-
if ($.browser.msie)
176-
o.html(nl2br(res.cout));
177-
else
178-
o.text(output);
172+
o.text(output);
179173
}
180174

181175
// wraps a unittest into a runnable script

posix.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ IMAGES=favicon.ico images/d002.ico $(filter-out $(wildcard images/*_hq.*) images
303303

304304
JAVASCRIPT=$(addsuffix .js, $(addprefix js/, \
305305
codemirror-compressed dlang ddox listanchors platform-downloads run \
306-
run_examples show_contributors jquery-1.7.2.min))
306+
run_examples show_contributors jquery-3.7.1.min))
307307

308308
STYLES=$(addsuffix .css, $(addprefix css/, \
309309
style print codemirror ddox))

0 commit comments

Comments
 (0)