Skip to content

Commit

Permalink
Removed overlay stuff from medialesson. Removed TrackBar from mediale…
Browse files Browse the repository at this point in the history 
…sson. Minor bugfixes in plugins, so they too function with the medialesson
  • Loading branch information
@NSavenije
NSavenije committed May 25, 2021
1 parent 029f874 commit 87bd538
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 542 deletions.
27 changes: 15 additions & 12 deletions modules/xerte/parent_templates/Nottingham/common_html5/js/popcorn/plugins/popcorn.mcq.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ childNodes (synchMCQOption):
required: text correct
optional: feedback page synch play enable
*dealt with in interactiveVideo.html
*dealt with in interactiveVideo.html and in the medialesson.html
*/

Expand All @@ -38,7 +38,7 @@ optional: feedback page synch play enable
Popcorn.plugin("mcq", function(options) {

// define plugin wide variables / functions here
var $target, $optHolder, $checkBtn, $feedbackDiv, $continueBtn, media, selected, judge, autoEnable, $showHs, $showLbl, $showHsActive;
var $target, $optHolder, $checkBtn, $feedbackDiv, $continueBtn, media, selected, judge, autoEnable, $showHs, $showLbl, $showHsActive, $learningObjectParent;

// Score tracking Manager
var finishTracking = function(options) {
Expand Down Expand Up @@ -75,12 +75,12 @@ optional: feedback page synch play enable
l_answers.push(x_GetTrackingTextFromHTML(options.childNodes[v].getAttribute("text"), (v+1) + ""));
l_feedback.push("");
});
interactiveVideo.questions[ia_nr] = true;
$learningObjectParent.questions[ia_nr] = true;
var scormScore = 0;
var score = 0;
for (var i=0; i<numOfQuestions; i++)
{
if (interactiveVideo.questions[i])
if ($learningObjectParent.questions[i])
{
score++;
}
Expand All @@ -94,7 +94,7 @@ optional: feedback page synch play enable
//Push results
XTSetPageScore(x_currentPage, scormScore, x_currentPageXML.getAttribute("trackinglabel"));
XTExitInteraction(x_currentPage, ia_nr, result, l_options, l_answers, l_feedback, x_currentPageXML.getAttribute("trackinglabel"));
interactiveVideo.enableControls(media.media, true);
$learningObjectParent.enableControls(media.media, true);
}

// Feedback Manager
Expand Down Expand Up @@ -162,12 +162,12 @@ optional: feedback page synch play enable

if (options.childNodes[index].getAttribute("enable") == "true" || (enable == true && ((options.childNodes[index].getAttribute("page") == undefined || options.childNodes[index].getAttribute("page") == "") && (options.childNodes[index].getAttribute("synch") == undefined || options.childNodes[index].getAttribute("synch") == "")))) {
// controls will be enabled if correct answer selected unless there is a 'go to page' or 'go to synch point' action associated with it
interactiveVideo.enableControls(media.media, true);
$learningObjectParent.enableControls(media.media, true);
}

// automatically enable if the question has been set up so there's no answer that will enable them
if (autoEnable == true) {
interactiveVideo.enableControls(media.media, true);
$learningObjectParent.enableControls(media.media, true);
}

// show feedback if there is some, with button to do action afterwards (change page, media current time, play media)
Expand Down Expand Up @@ -220,7 +220,7 @@ optional: feedback page synch play enable
media.play();
}
}
interactiveVideo.enableControls(media.media, true);
$learningObjectParent.enableControls(media.media, true);
}

return {
Expand All @@ -229,6 +229,7 @@ optional: feedback page synch play enable
judge = false;
autoEnable = true;
var tempEnable = false;
$learningObjectParent = (mediaLesson == null || mediaLesson == undefined) ? interactiveVideo : mediaLesson;
$target = $("#" + options.target);
var $optionText = options.name !== "" ? '<h4>' + options.name + '</h4>' + x_addLineBreaks(options.text) : x_addLineBreaks(options.text);
$target.hide();
Expand Down Expand Up @@ -464,7 +465,7 @@ optional: feedback page synch play enable
$target.parent().css({"padding": 5, "width": options._w + "%", "height": "auto", "overflow-x": "hidden"});
$("#overlay").show();
$showHsActive = true;
interactiveVideo.popcornInstance.media.pause();
$learningObjectParent.popcornInstance.media.pause();
$target.parent().addClass("qWindow").addClass("panel");
$showHolder.hide();
$optHolder.show();
Expand All @@ -475,6 +476,8 @@ optional: feedback page synch play enable
$optHolder.show();
$target.parent().css({"padding": 5});
}
// If not on overlay panel
$optHolder.show();
}
},

Expand Down Expand Up @@ -537,9 +540,9 @@ optional: feedback page synch play enable
}

if (options.disable == "true") {
interactiveVideo.enableControls(this.media, false);
$learningObjectParent.enableControls(this.media, false);
} else {
interactiveVideo.enableControls(this.media, true);
$learningObjectParent.enableControls(this.media, true);
}
}
if (options.overlayPan) {
Expand Down Expand Up @@ -610,7 +613,7 @@ optional: feedback page synch play enable
end: function(event, options) {

// fire on options.end
interactiveVideo.enableControls(this.media, true);
$learningObjectParent.enableControls(this.media, true);
if (options.overlayPan) {
$target.parent().removeClass("qWindow").removeClass("panel");
$target.parent().css( //The overlay panel
Expand Down
4 changes: 4 additions & 0 deletions ...les/xerte/parent_templates/Nottingham/common_html5/js/popcorn/plugins/popcorn.textplus.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ optional: end position* line
$target.prepend(txt);
}
}
// Else if not on overlay panel
else {
$target.prepend(txt);
}
},

start: function(event, options) {
Expand Down
94 changes: 0 additions & 94 deletions modules/xerte/parent_templates/Nottingham/models_html5/mediaLesson.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,100 +11,6 @@
.popcornMedia.youTube {
position: relative;
}

/* TRACKBAR */
#trackBarHolder {
display: block;
height: 3em;
width: auto;
margin: auto;
background: #F0F6FD;
z-index: 1;
}

#trackBarRail {
background: #D5E4FD;
margin-left: 1em;
margin-right: 1em;
top: 1.2em;
height: 0.6em;
width: 80%;
display: inline-block;
position: relative;
z-index: 1;
}
#trackBarRail:hover{
cursor: pointer;
}

#trackBarSlider {
width: 1.2em;
height: 1.2em;
top: -0.3em;
border-radius: 50%;
background: #1967D2;
position: relative;
display: inline-block;
z-index: 5;
}
#trackBarSlider:hover{
cursor: pointer;
}

.trackBarButton {
display: inline-block;
height: 1.8em;
width: 1.8em;
top: 1em;
margin-left: 1em;
margin-right: 1em;
position: relative;
color: #1967D2;
z-index: 1;
}
.trackBarButton:focus {
cursor: pointer;
}
.trackBarButton:focus {
outline: 0px;
}

.trackBarEventMarker {
width: 0.6em;
height: 0.6em;
background: #77A6E8;
border-radius: 50%;
position: absolute;
display: inline-block;
z-index: 4;
}

.trackBarEventMarker:hover {
cursor: pointer;
}

.trackBarEventMarkerMandatory {
width: 1.2em;
height: 1.2em;
background: #D5E4FD;
top: -0.3em;

border-radius: 50%;
position: absolute;
display: inline-block;
z-index: 3;
}

.trackBarEventMarkerMandatory:hover {
cursor: pointer;
}

.trackBarTime {
color: #222222;
display: inline-block;
top: 1em;
position: relative;
}

/* PANEL LAYOUT */
#panelHolder .overlay {
Expand Down
Loading

0 comments on commit 87bd538

Please sign in to comment.