Skip to content

Commit f983047

Browse files
authored
Merge pull request #119 from bgilbert/js
demo: update jQuery and OpenSeadragon
2 parents e2582f1 + 6584e87 commit f983047

1 file changed

Lines changed: 7 additions & 9 deletions

File tree

demo/index.html

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<html>
2222
<head>
2323
<title>OpenSlide Demo</title>
24-
<link rel="stylesheet" type="text/css" media="all" href="demo.css">
24+
<link rel="stylesheet" media="all" href="demo.css">
2525
<meta name="viewport" content="user-scalable=no">
2626
</head>
2727

@@ -59,12 +59,12 @@
5959
<div id="details" class="scroll-parent"></div>
6060
</div>
6161

62-
<script type="text/javascript" src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
63-
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/openseadragon@5.0.1/build/openseadragon/openseadragon.min.js"></script>
64-
<script type="text/javascript" src="openseadragon-scalebar.js"></script>
65-
<script type="text/javascript">
62+
<script src="https://code.jquery.com/jquery-4.0.0.min.js" integrity="sha256-OaVG6prZf4v69dPg6PhVattBXkcOWQB62pdZ3ORyrao=" crossorigin="anonymous"></script>
63+
<script src="https://cdn.jsdelivr.net/npm/openseadragon@6.0/build/openseadragon/openseadragon.min.js" integrity="sha256-v9eBY4fslDaGqbMjKILsvEHHvHAApDJnzvMtd1AHl98=" crossorigin="anonymous"></script>
64+
<script src="openseadragon-scalebar.js"></script>
65+
<script>
6666
$(function() {
67-
var openseadragon_images = "https://cdn.jsdelivr.net/npm/openseadragon@5.0.1/build/openseadragon/images/"
67+
var openseadragon_images = "https://cdn.jsdelivr.net/npm/openseadragon@6.0/build/openseadragon/images/"
6868
var storage = "https://openslide-demo-site.s3.dualstack.us-east-2.amazonaws.com/"
6969

7070
var stamp;
@@ -86,7 +86,6 @@
8686
status_skipped = false;
8787
$.ajax({
8888
'dataType': 'json',
89-
'jsonp': false, // use CORS
9089
'success': function(data, status, xhr) {
9190
if (data.stamp && data.stamp !== stamp) {
9291
// retiled existing slides, so reload page
@@ -217,7 +216,6 @@
217216
$("#details").html('').addClass('loading');
218217
$.ajax({
219218
'dataType': 'json',
220-
'jsonp': false, // use CORS
221219
'success': function(data, status, xhr) {
222220
populate_details(slide, data);
223221
},
@@ -242,6 +240,7 @@
242240
viewer = new OpenSeadragon({
243241
id: "view",
244242
prefixUrl: openseadragon_images,
243+
crossOriginPolicy: "anonymous",
245244
animationTime: 0.5,
246245
blendTime: 0.1,
247246
constrainDuringPan: true,
@@ -281,7 +280,6 @@
281280

282281
$.ajax({
283282
'dataType': 'json',
284-
'jsonp': false, // use CORS
285283
'success': populate_images,
286284
'error': function() {
287285
$('#images').removeClass('loading').

0 commit comments

Comments
 (0)