Skip to content
This repository was archived by the owner on Jun 7, 2023. It is now read-only.

Commit b2861eb

Browse files
bnmnetpbnmnetp
authored
Merge pull request #1221 from ascholerChemeketa/template_cleanup2
Template cleanup
2 parents d9400f8 + 1685da6 commit b2861eb

16 files changed

Lines changed: 48 additions & 60 deletions

File tree

‎public/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
crossorigin="anonymous"
4444
/>
4545

46-
<script type="text/javascript">
46+
<script>
4747
eBookConfig = {};
4848

4949
eBookConfig.useRunestoneServices = false;

‎runestone/animation/animation.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def setup(app):
4040
<button onclick="%(divid)s_anim.backward()">Step Backward</button>
4141
<button onclick="%(divid)s_anim.end()">End</button>
4242
43-
<script type="text/javascript">
43+
<script>
4444
%(divid)s_init = function(divid)
4545
{
4646
var a = new Animator(new %(model)s(), new %(viewer)s(), divid)
@@ -52,7 +52,7 @@ def setup(app):
5252
</div>
5353
"""
5454

55-
SCRIPTTAG = """<script type="text/javascript" src="../_static/%s"></script>\n"""
55+
SCRIPTTAG = """<script src="../_static/%s"></script>\n"""
5656

5757

5858
class Animation(RunestoneIdDirective):

‎runestone/animation/animationrefactor.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22

33
<head>
4-
<script type "text/javascript" src="animationrefactor.js"></script>
4+
<script src="animationrefactor.js"></script>
55

66
<html>
77
<body onload="">
@@ -17,7 +17,7 @@
1717
<button onclick="ancan_anim.backward()">Step Backward</button>
1818
<button onclick="ancan_anim.end()">End</button>
1919
</div>
20-
<script type="text/javascript">
20+
<script>
2121
init1 = function(divid)
2222
{
2323
var a = new Animator(new SortModel(), new BarViewer(), divid)

‎runestone/animation/chart.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<html>
22
<head>
33
<title>charts</title>
4-
<!-- <script type="text/javascript" src="https://www.google.com/jsapi"></script> -->
5-
<!-- <script type="text/javascript" src="chart.js"></script> -->
4+
<!-- <script src="https://www.google.com/jsapi"></script> -->
5+
<!-- <script src="chart.js"></script> -->
66

7-
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
8-
<script type="text/javascript" src="jqchart/jquery.gchart.js"></script>
9-
<script type="text/javascript" src="jqchart/jquery.gchart.graphviz.js"></script>
7+
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
8+
<script src="jqchart/jquery.gchart.js"></script>
9+
<script src="jqchart/jquery.gchart.graphviz.js"></script>
1010
<style>
1111
#visualization { width: 800px; height: 400px; }
1212
</style>
1313

1414
</head>
1515
<body>
1616
<div id="visualization"></div>
17-
<script type="text/javascript">
17+
<script>
1818
// $("#visualization").gchart({type: 'graphviz', series: [$.gchart.series([20, 50, 30])]});
1919
// label: '<f0> left | <f1> middle | <f2> right'
2020

‎runestone/animation/jqchart/gChartBasic.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<style type="text/css">
77
#basicGChart { width: 450px; height: 300px }
88
</style>
9-
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
10-
<script type="text/javascript" src="jquery.gchart.js"></script>
9+
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
10+
<script src="jquery.gchart.js"></script>
1111
<script>
1212
document.addEventListener('load', (event) => {
1313
$(function () {

‎runestone/animation/simpletree.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<html>
33

44
<head>
5-
<script type="text/javascript" src="animationrefactor.js"></script>
6-
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
7-
<script type="text/javascript" src="jqchart/jquery.gchart.js"></script>
8-
<script type="text/javascript" src="jqchart/jquery.gchart.graphviz.js"></script>
9-
<script type="text/javascript" src="animationrefactor.js"></script>
10-
<script type="text/javascript" src="simpletree.js"></script>
5+
<script src="animationrefactor.js"></script>
6+
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
7+
<script src="jqchart/jquery.gchart.js"></script>
8+
<script src="jqchart/jquery.gchart.graphviz.js"></script>
9+
<script src="animationrefactor.js"></script>
10+
<script src="simpletree.js"></script>
1111
</head>
1212

1313

@@ -29,7 +29,7 @@
2929
<button onclick="ancan_anim.backward()">Step Backward</button>
3030
<button onclick="ancan_anim.end()">End</button>
3131
</div>
32-
<script type="text/javascript">
32+
<script>
3333
init1 = function(divid)
3434
{
3535
var a = new Animator(new SimpleTreeModel(), new TreeViewer(), divid)

‎runestone/animation/sortingbase.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<!DOCTYPE html>
22

33
<head>
4-
<script type="text/javascript" src="sortmodels.js"></script>
5-
<script type="text/javascript" src="sortviewers.js"></script>
6-
<script type="text/javascript" src="animationbase.js"></script>
4+
<script src="sortmodels.js"></script>
5+
<script src="sortviewers.js"></script>
6+
<script src="animationbase.js"></script>
77

88

99
<html>

‎runestone/animation/sortingdemo.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22

33
<head>
4-
<script type "text/javascript" src="sortingdemo.js"></script>
4+
<script src="sortingdemo.js"></script>
55

66
<html>
77
<body onload="">

‎runestone/animation/sortingpackage.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22

33
<head>
4-
<script type "text/javascript" src="sortingpackage.js"></script>
4+
<script src="sortingpackage.js"></script>
55

66
<html>
77
<body onload="">

‎runestone/blockly/blockly.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ def __init__(self, content, **kwargs):
5555
START = """
5656
<html>
5757
<head>
58-
<script src='blockly_compressed.js' type="text/javascript"> </script>
59-
<script src='blocks_compressed.js' type="text/javascript"> </script>
60-
<script src='javascript_compressed.js' type="text/javascript"> </script>
61-
<script src='python_compressed.js' type="text/javascript"> </script>
62-
<script src='msg/js/en.js' type="text/javascript"> </script>
58+
<script src='blockly_compressed.js'> </script>
59+
<script src='blocks_compressed.js'> </script>
60+
<script src='javascript_compressed.js'> </script>
61+
<script src='python_compressed.js'> </script>
62+
<script src='msg/js/en.js'> </script>
6363
<link rel="stylesheet" href="bootstrap-3.4.1/css/bootstrap.min.css" type="text/css" />
6464
<link rel="stylesheet" href="video.css" type="text/css" />
65-
<script type="text/javascript">
65+
<script>
6666
// Get the objects we need to do logging from the parent frame.
6767
// This seems better than reloading all of jQuery and bookfuncs into the frame. But
6868
// Makes this a bit more dependent on the Runestone Environment.

0 commit comments

Comments
 (0)