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

Commit f42abaf

Browse files
committed
incorporate Barb's changes to audio tours
1 parent 1da54e2 commit f42abaf

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

runestone/activecode/js/activecode.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ function AudioTour (divid, code, bnum, audio_text) {
690690
this.elem.pause();
691691
}
692692
//log change to db
693-
logBookEvent({'event': 'Audio', 'change': 'closeWindow', 'div_id': divid});
693+
logBookEvent({'event': 'Audio', 'act': 'closeWindow', 'div_id': divid});
694694
$('.modal-profile').fadeOut("slow");
695695
$('.modal-lightsout').fadeOut("slow");
696696
});
@@ -774,7 +774,7 @@ AudioTour.prototype.tour = function (divid, audio_type, bcount) {
774774
$('#status').html("Starting the " + name);
775775

776776
//log tour type to db
777-
logBookEvent({'event': 'Audio', 'tour type': name, 'div_id': divid});
777+
logBookEvent({'event': 'Audio', 'act': name, 'div_id': divid});
778778

779779
var max = atype.length;
780780
var str = "";
@@ -832,7 +832,7 @@ AudioTour.prototype.firstAudio = function () {
832832
this.handlePlaying();
833833

834834
//log change to db
835-
this.logBookEvent({'event': 'Audio', 'change': 'first', 'div_id': this.theDivid});
835+
this.logBookEvent({'event': 'Audio', 'act': 'first', 'div_id': this.theDivid});
836836

837837

838838
// move to the first audio
@@ -852,7 +852,7 @@ AudioTour.prototype.prevAudio = function () {
852852
this.handlePlaying();
853853

854854
//log change to db
855-
this.logBookEvent({'event': 'Audio', 'change': 'prev', 'div_id': this.theDivid});
855+
this.logBookEvent({'event': 'Audio', 'act': 'prev', 'div_id': this.theDivid});
856856

857857

858858
// move to previous to the current (but the current index has moved to the next)
@@ -870,7 +870,7 @@ AudioTour.prototype.nextAudio = function () {
870870
this.handlePlaying();
871871

872872
//log change to db
873-
this.logBookEvent({'event': 'Audio', 'change': 'next', 'div_id': this.theDivid});
873+
this.logBookEvent({'event': 'Audio', 'act': 'next', 'div_id': this.theDivid});
874874

875875
// if not at the end
876876
if (this.currIndex < (this.len - 1)) {
@@ -889,7 +889,7 @@ AudioTour.prototype.lastAudio = function () {
889889
this.handlePlaying();
890890

891891
//log change to db
892-
this.logBookEvent({'event': 'Audio', 'change': 'last', 'div_id': this.theDivid});
892+
this.logBookEvent({'event': 'Audio', 'act': 'last', 'div_id': this.theDivid});
893893

894894
// move to the last audio
895895
this.currIndex = this.len - 1;
@@ -987,7 +987,7 @@ AudioTour.prototype.playaudio = function (i, aname, divid, ahash) {
987987
//console.log("in playaudio " + elem.duration);
988988
if (isNaN(this.elem.duration) || this.elem.duration == 0) {
989989
// set the status
990-
$('#status').html("Loading audio. Please wait.");
990+
$('#status').html("Loading audio. Please wait. If it doesn't start soon close this window (click on the red X) and try again");
991991
$('#' + this.afile).bind('canplaythrough', function () {
992992
playWhenReady(this.afile, divid, ahash);
993993
});
@@ -1010,7 +1010,7 @@ AudioTour.prototype.pauseAndPlayAudio = function () {
10101010
document.getElementById("pause_audio").src = "../_static/pause.png";
10111011
document.getElementById("pause_audio").title = "Pause current audio";
10121012
//log change to db
1013-
logBookEvent({'event': 'Audio', 'change': 'play', 'div_id': this.theDivid});
1013+
logBookEvent({'event': 'Audio', 'act': 'play', 'div_id': this.theDivid});
10141014
}
10151015

10161016
// if audio was this.playing pause it
@@ -1019,7 +1019,7 @@ AudioTour.prototype.pauseAndPlayAudio = function () {
10191019
document.getElementById("pause_audio").src = "../_static/play.png";
10201020
document.getElementById("pause_audio").title = "Play paused audio";
10211021
//log change to db
1022-
logBookEvent({'event': 'Audio', 'change': 'pause', 'div_id': this.theDivid});
1022+
logBookEvent({'event': 'Audio', 'act': 'pause', 'div_id': this.theDivid});
10231023
}
10241024

10251025
};

0 commit comments

Comments
 (0)