Skip to content

Commit 1bf6305

Browse files
runestonetestrunestonetest
committed
More linting
1 parent ea6f9e2 commit 1bf6305

File tree

9 files changed

+625
-587
lines changed

9 files changed

+625
-587
lines changed

‎.jshintrc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
],
1010
"esversion": 6,
1111
"quotmark": true,
12-
"strict": false,
12+
"strict": "implied",
1313
"sub": true,
1414
"browser": true,
1515
"maxerr": 200,
16-
"globalstrict": true
16+
"globalstrict": true,
17+
"devel": true
1718

1819
}

‎runestone/activecode/js/acfactory.js‎

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -104,30 +104,24 @@ export default class ACFactory {
104104
? eBookConfig.acDefaultLanguage
105105
: "python";
106106
// generate the HTML
107-
var html =
108-
'<div id="ac_modal_' +
109-
divid +
110-
'" class="modal fade">' +
111-
' <div class="modal-dialog scratch-ac-modal">' +
112-
' <div class="modal-content">' +
113-
' <div class="modal-header">' +
114-
' <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>' +
115-
' <h4 class="modal-title">Scratch ActiveCode</h4>' +
116-
" </div> " +
117-
' <div class="modal-body">' +
118-
' <textarea data-component="activecode" data-codelens="true" id="' +
119-
divid +
120-
'" data-lang="' +
121-
lang +
122-
'">' +
123-
"\n" +
124-
"\n" +
125-
"\n" +
126-
" </textarea>" +
127-
" </div>" +
128-
" </div>" +
129-
" </div>" +
130-
"</div>";
107+
var html = `<div id="ac_modal_${divid} class="modal fade">
108+
<div class="modal-dialog scratch-ac-modal">
109+
<div class="modal-content">
110+
<div class="modal-header">
111+
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
112+
<h4 class="modal-title">Scratch ActiveCode</h4>
113+
</div>
114+
<div class="modal-body">
115+
<textarea data-component="activecode" data-codelens="true" id="${divid} data-lang="${lang}">
116+
117+
118+
119+
120+
</textarea>
121+
</div>
122+
</div>
123+
</div>
124+
</div>`;
131125
var el = $(html);
132126
$("body").append(el);
133127
el.on("shown.bs.modal show.bs.modal", function() {
@@ -136,10 +130,6 @@ export default class ACFactory {
136130
e.CodeMirror.focus();
137131
});
138132
});
139-
//$(document).bind('keypress', '\\', function(evt) {
140-
// ACFactory.toggleScratchActivecode();
141-
// return false;
142-
//});
143133
}
144134
static toggleScratchActivecode() {
145135
var divid = "ac_modal_" + eBookConfig.scratchDiv;

‎runestone/activecode/js/activecode.js‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"use strict";
66

77
import RunestoneBase from "../../common/js/runestonebase.js";
8+
import AudioTour from "./audiotour";
89
import "./activecode-i18n.en";
910
import CodeMirror from "codemirror";
1011
import "codemirror/mode/python/python.js";
@@ -77,7 +78,7 @@ export class ActiveCode extends RunestoneBase {
7778
socket = new WebSocket("wss://" + chatcodesServer);
7879
}
7980
if (!connection) {
80-
connection = new sharedb.Connection(socket);
81+
connection = new window.sharedb.Connection(socket);
8182
}
8283
if (!doc) {
8384
doc = connection.get("chatcodes", "channels");
@@ -209,18 +210,19 @@ export class ActiveCode extends RunestoneBase {
209210
}
210211
createControls() {
211212
var ctrlDiv = document.createElement("div");
213+
var butt;
212214
$(ctrlDiv).addClass("ac_actions");
213215
$(ctrlDiv).addClass("col-md-12");
214216
// Run
215-
var butt = document.createElement("button");
217+
butt = document.createElement("button");
216218
$(butt).text($.i18n("msg_activecode_run_code"));
217219
$(butt).addClass("btn btn-success run-button");
218220
ctrlDiv.appendChild(butt);
219221
this.runButton = butt;
220222
$(butt).click(this.runProg.bind(this));
221223
$(butt).attr("type", "button");
222224
if (this.enabledownload || eBookConfig.downloadsEnabled) {
223-
var butt = document.createElement("button");
225+
butt = document.createElement("button");
224226
$(butt).text("Download");
225227
$(butt).addClass("btn save-button");
226228
ctrlDiv.appendChild(butt);
@@ -229,7 +231,7 @@ export class ActiveCode extends RunestoneBase {
229231
$(butt).attr("type", "button");
230232
}
231233
if (!this.hidecode && !this.hidehistory) {
232-
var butt = document.createElement("button");
234+
butt = document.createElement("button");
233235
$(butt).text($.i18n("msg_activecode_load_history"));
234236
$(butt).addClass("btn btn-default");
235237
$(butt).attr("type", "button");
@@ -625,7 +627,7 @@ export class ActiveCode extends RunestoneBase {
625627
$(coachDiv).css("display", "none");
626628
this.codecoach = coachDiv;
627629
this.outerDiv.appendChild(coachDiv);
628-
var clearDiv = document.createElement("div");
630+
clearDiv = document.createElement("div");
629631
$(clearDiv).css("clear", "both"); // needed to make parent div resize properly
630632
this.outerDiv.appendChild(clearDiv);
631633
}
@@ -728,11 +730,12 @@ export class ActiveCode extends RunestoneBase {
728730
// display grades in modal window
729731
var showGradeSummary = function(data, status, whatever) {
730732
var report = eval(data)[0];
733+
var body;
731734
// check for report['message']
732735
if (report) {
733736
if (report["version"] == 2) {
734737
// new version; would be better to embed this in HTML for the activecode
735-
var body =
738+
body =
736739
"<h4>Grade Report</h4>" +
737740
"<p>This question: " +
738741
report["grade"] +
@@ -743,7 +746,7 @@ export class ActiveCode extends RunestoneBase {
743746
report["comment"] +
744747
"</p>";
745748
} else {
746-
var body =
749+
body =
747750
"<h4>Grade Report</h4>" +
748751
"<p>This assignment: " +
749752
report["grade"] +
@@ -762,20 +765,19 @@ export class ActiveCode extends RunestoneBase {
762765
body =
763766
"<h4>The server did not return any grade information</h4>";
764767
}
765-
var html =
766-
'<div class="modal fade">' +
767-
' <div class="modal-dialog compare-modal">' +
768-
' <div class="modal-content">' +
769-
' <div class="modal-header">' +
770-
' <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>' +
771-
' <h4 class="modal-title">Assignment Feedback</h4>' +
772-
" </div>" +
773-
' <div class="modal-body">' +
774-
body +
775-
" </div>" +
776-
" </div>" +
777-
" </div>" +
778-
"</div>";
768+
var html = `<div class="modal fade">
769+
<div class="modal-dialog compare-modal">
770+
<div class="modal-content">
771+
<div class="modal-header">
772+
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
773+
<h4 class="modal-title">Assignment Feedback</h4>
774+
</div>
775+
<div class="modal-body">
776+
${body}
777+
</div>
778+
</div>
779+
</div>
780+
</div>`;
779781
var el = $(html);
780782
el.modal();
781783
};
@@ -885,7 +887,7 @@ export class ActiveCode extends RunestoneBase {
885887
var ifm = document.createElement("iframe");
886888
$(ifm).addClass("tie-frame");
887889
ifm.src = `https://tech-interview-exercises.appspot.com/client/question.html?qid=${this.tie}`;
888-
setIframeDimensions = function() {
890+
var setIframeDimensions = function() {
889891
$(".tie-container").css(
890892
"width",
891893
$(".tie-container")

‎runestone/activecode/js/activecode_html.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export default class HTMLActiveCode extends ActiveCode {
1414
runProg() {
1515
var prog = this.buildProg(true);
1616
var scrubber_dfd, history_dfd, saveCode;
17-
var saveCode = "True";
17+
saveCode = "True";
1818
var __ret = this.manage_scrubber(scrubber_dfd, history_dfd, saveCode);
1919
history_dfd = __ret.history_dfd;
2020
saveCode = __ret.saveCode;

0 commit comments

Comments
 (0)