Skip to content

Commit a284021

Browse files
pgbovinepgbovine
committed
mior updates
1 parent c6875af commit a284021

File tree

9 files changed

+13
-48
lines changed

9 files changed

+13
-48
lines changed

‎v3/composingprograms.html‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,24 +46,13 @@
4646
<script type="text/javascript" src="js/jquery-ui-1.8.24.custom.min.js"></script> <!-- for sliders and other UI elements -->
4747
<link type="text/css" href="css/ui-lightness/jquery-ui-1.8.24.custom.css" rel="stylesheet" />
4848

49-
<!-- for annotation bubbles -->
50-
<!--
51-
<script type="text/javascript" src="js/jquery.qtip.min.js"></script>
52-
<link type="text/css" href="css/jquery.qtip.css" rel="stylesheet" />
53-
-->
54-
5549
<script type="text/javascript" src="js/pytutor.js"></script>
5650
<link rel="stylesheet" href="css/pytutor.css"/>
5751
<link rel="stylesheet" href="css/composingprograms.css"/> <!-- include AFTER pytutor.css -->
5852

5953

6054
<!-- requirements for opt-frontend.js -->
6155

62-
<!-- codemirror.net online code editor -->
63-
<script type="text/javascript" src="js/codemirror/codemirror.js"></script>
64-
<link type="text/css" href="css/codemirror.css" rel="stylesheet" />
65-
<script type="text/javascript" src="js/codemirror/python.js"></script>
66-
6756
<!-- Ace online code editor -->
6857
<script type="text/javascript" src="js/ace/src-min-noconflict/ace.js" charset="utf-8"></script>
6958

‎v3/csc108h.html‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,12 @@
4646
<script type="text/javascript" src="js/jquery-ui-1.8.24.custom.min.js"></script> <!-- for sliders and other UI elements -->
4747
<link type="text/css" href="css/ui-lightness/jquery-ui-1.8.24.custom.css" rel="stylesheet" />
4848

49-
<!-- for annotation bubbles -->
50-
<!--
51-
<script type="text/javascript" src="js/jquery.qtip.min.js"></script>
52-
<link type="text/css" href="css/jquery.qtip.css" rel="stylesheet" />
53-
-->
54-
5549
<script type="text/javascript" src="js/pytutor.js"></script>
5650
<link rel="stylesheet" href="css/pytutor.css"/>
5751

5852

5953
<!-- requirements for opt-frontend.js -->
6054

61-
<!-- codemirror.net online code editor -->
62-
<script type="text/javascript" src="js/codemirror/codemirror.js"></script>
63-
<link type="text/css" href="css/codemirror.css" rel="stylesheet" />
64-
<script type="text/javascript" src="js/codemirror/python.js"></script>
65-
6655
<!-- Ace online code editor -->
6756
<script type="text/javascript" src="js/ace/src-min-noconflict/ace.js" charset="utf-8"></script>
6857

‎v3/csc108h_shared.html‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,12 @@
4646
<script type="text/javascript" src="js/jquery-ui-1.8.24.custom.min.js"></script> <!-- for sliders and other UI elements -->
4747
<link type="text/css" href="css/ui-lightness/jquery-ui-1.8.24.custom.css" rel="stylesheet" />
4848

49-
<!-- for annotation bubbles -->
50-
<!--
51-
<script type="text/javascript" src="js/jquery.qtip.min.js"></script>
52-
<link type="text/css" href="css/jquery.qtip.css" rel="stylesheet" />
53-
-->
54-
5549
<script type="text/javascript" src="js/pytutor.js"></script>
5650
<link rel="stylesheet" href="css/pytutor.css"/>
5751

5852

5953
<!-- requirements for opt-frontend.js -->
6054

61-
<!-- codemirror.net online code editor -->
62-
<script type="text/javascript" src="js/codemirror/codemirror.js"></script>
63-
<link type="text/css" href="css/codemirror.css" rel="stylesheet" />
64-
<script type="text/javascript" src="js/codemirror/python.js"></script>
65-
6655
<!-- Ace online code editor -->
6756
<script type="text/javascript" src="js/ace/src-min-noconflict/ace.js" charset="utf-8"></script>
6857

‎v3/js/opt-frontend-common.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,7 @@ function genericOptFrontendReady() {
677677
// otherwise just do an incremental update
678678
else {
679679
var newMode = $.bbq.getState('mode');
680-
console.log('hashchange:', newMode, window.location.hash);
680+
//console.log('hashchange:', newMode, window.location.hash);
681681
updateAppDisplay(newMode);
682682
}
683683

‎v3/js/opt-frontend.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,8 @@ function executeCode(forceStartingInstr, forceRawInputLst) {
165165
$(document).ready(function() {
166166
setSurveyHTML();
167167

168-
// for OPT live chat tutoring interface
168+
// for OPT live chat tutoring interface -- DEPRECATED FOR NOW
169+
/*
169170
try {
170171
var source = new EventSource(TogetherJSConfig_hubBase + 'learner-SSE');
171172
source.onmessage = function(e) {
@@ -191,6 +192,7 @@ $(document).ready(function() {
191192
}
192193
193194
$("#getTutorBtn").click(requestTutor);
195+
*/
194196

195197

196198
// canned examples

‎v3/matrix.html‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,24 +44,13 @@
4444
<script type="text/javascript" src="js/jquery-ui-1.8.24.custom.min.js"></script> <!-- for sliders and other UI elements -->
4545
<link type="text/css" href="css/ui-lightness/jquery-ui-1.8.24.custom.css" rel="stylesheet" />
4646

47-
<!-- for annotation bubbles -->
48-
<!--
49-
<script type="text/javascript" src="js/jquery.qtip.min.js"></script>
50-
<link type="text/css" href="css/jquery.qtip.css" rel="stylesheet" />
51-
-->
52-
5347
<script type="text/javascript" src="js/pytutor.js"></script>
5448
<link rel="stylesheet" href="css/pytutor.css"/>
5549
<link rel="stylesheet" href="css/matrixtutor.css"/> <!-- include AFTER pytutor.css -->
5650

5751

5852
<!-- requirements for opt-frontend.js -->
5953

60-
<!-- codemirror.net online code editor -->
61-
<script type="text/javascript" src="js/codemirror/codemirror.js"></script>
62-
<link type="text/css" href="css/codemirror.css" rel="stylesheet" />
63-
<script type="text/javascript" src="js/codemirror/python.js"></script>
64-
6554
<!-- Ace online code editor -->
6655
<script type="text/javascript" src="js/ace/src-min-noconflict/ace.js" charset="utf-8"></script>
6756

‎v3/visualize.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,11 @@
6161
<!-- requirements for opt-frontend.js -->
6262

6363
<!-- codemirror.net online code editor -->
64+
<!--
6465
<script type="text/javascript" src="js/codemirror/codemirror.js"></script>
6566
<link type="text/css" href="css/codemirror.css" rel="stylesheet" />
6667
<script type="text/javascript" src="js/codemirror/python.js"></script>
68+
-->
6769

6870
<!-- Ace online code editor -->
6971
<script type="text/javascript" src="js/ace/src-min-noconflict/ace.js" charset="utf-8"></script>

‎v4-cokapi/Makefile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@ all:
22
jshint cokapi.js && node cokapi.js
33

44
deps:
5-
npm install jshint express
5+
npm install \
6+
jshint \
7+
express \
8+
serve-static

‎v4-cokapi/cokapi.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2929
// This is a nodejs server based on express that serves the v4-cokapi/ app
3030
// To test locally, run 'make' and load http://localhost:3000/
3131

32-
3332
var express = require('express');
33+
var serveStatic = require('serve-static');
3434
var app = express();
3535

36+
app.use(serveStatic('static/')); // put all static files in here
37+
3638
app.get('/', function(req, res) {
3739
res.send('Hello World!');
3840
});

0 commit comments

Comments
 (0)