Skip to content

Commit 4c44407

Browse files
author
\nrlucke
committed
fix safari issues
1 parent 6b4bf99 commit 4c44407

7 files changed

Lines changed: 10 additions & 10 deletions

File tree

assets/static/courseware.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44128,7 +44128,7 @@ function clearHash(el) {
4412844128
makeBlob: function makeBlob() {
4412944129
var $view = this;
4413044130
var control = $view.$('.cw-audio-gallery-content-slide-control')[0];
44131-
this.blob = new Blob($view.chunks, { type: 'audio/ogg' });
44131+
this.blob = new Blob($view.chunks, { type: 'audio/mpeg' });
4413244132
var url = URL.createObjectURL(this.blob),
4413344133
audio = document.createElement('audio');
4413444134
audio.controls = true;
@@ -104071,7 +104071,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
104071104071
}
104072104072
content = JSON.parse(content);
104073104073
if (content.type == 'countdown') {
104074-
this.countdown(new Date(content.date + " " + content.time).getTime());
104074+
this.countdown(new Date(content.date + "T" + content.time).getTime());
104075104075
$view.$('.cw-date-countdown').show();
104076104076
}
104077104077
if (content.type == 'date') {
@@ -104288,7 +104288,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
104288104288
}, 1000);
104289104289
},
104290104290
date: function date(date, time) {
104291-
var date = new Date(date + ' ' + time);
104291+
var date = new Date(date + 'T' + time);
104292104292
this.$('.cw-date-date-digits[data-date="date"] .cw-date-date-number').html(("0" + date.getDate()).slice(-2) + '.' + ("0" + (date.getMonth() + 1)).slice(-2) + '.' + date.getFullYear());
104293104293
this.$('.cw-date-date-digits[data-date="time"] .cw-date-date-number').html(("0" + date.getHours()).slice(-2) + ':' + ("0" + date.getMinutes()).slice(-2));
104294104294
}

assets/static/courseware.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

blocks/AudioGalleryBlock/AudioGalleryBlock.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public function store_recording_handler(array $data)
100100
$tempDir = $GLOBALS['TMP_PATH'].'/'.uniqid();
101101
mkdir($tempDir);
102102
//create file in temp dir
103-
$filename = 'Courseware-Aufnahme-'.date("d.m.Y-H:i", time()).'.ogg';
103+
$filename = 'Courseware-Aufnahme-'.date("d.m.Y-H:i", time()).'.mp3';
104104
file_put_contents($tempDir.'/'.$filename, base64_decode($audio));
105105
// get personal root folder
106106

blocks/AudioGalleryBlock/js/student_view.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ export default StudentView.extend({
127127
makeBlob(){
128128
var $view = this;
129129
var control = $view.$('.cw-audio-gallery-content-slide-control')[0];
130-
this.blob = new Blob($view.chunks, {type: 'audio/ogg' })
130+
this.blob = new Blob($view.chunks, {type: 'audio/mpeg' })
131131
let url = URL.createObjectURL(this.blob),
132132
audio = document.createElement('audio');
133133
audio.controls = true;

blocks/AudioGalleryBlock/templates/student_view.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<img src="{{user_avatar}}">
77
{{#file_url}}
88
<audio class="cw-audio-gallery-player" controls>
9-
<source src="{{file_url}}">
9+
<source src="{{file_url}}" type="audio/mpeg">
1010
</audio>
1111
{{/file_url}}
1212
<input type="hidden" class="cw-audio-gallery-userhasrecord" value="{{#file_url}}true{{/file_url}}{{^file_url}}false{{/file_url}}">

blocks/DateBlock/js/student_view.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export default StudentView.extend({
2121
}
2222
content = JSON.parse(content);
2323
if (content.type == 'countdown') {
24-
this.countdown(new Date(content.date + " "+ content.time).getTime());
24+
this.countdown(new Date(content.date + "T"+ content.time).getTime());
2525
$view.$('.cw-date-countdown').show();
2626
}
2727
if (content.type == 'date') {
@@ -87,7 +87,7 @@ export default StudentView.extend({
8787
},
8888

8989
date(date, time) {
90-
var date = new Date(date+' '+time);
90+
var date = new Date(date+'T'+time);
9191
this.$('.cw-date-date-digits[data-date="date"] .cw-date-date-number').html(("0" + date.getDate()).slice(-2)+'.'+("0" + (date.getMonth()+1)).slice(-2)+'.'+date.getFullYear());
9292
this.$('.cw-date-date-digits[data-date="time"] .cw-date-date-number').html(("0" + date.getHours()).slice(-2)+':'+("0" + date.getMinutes()).slice(-2));
9393
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "courseware",
3-
"version": "4.7.4",
3+
"version": "4.7.6",
44
"description": "Interaktive multimediale Lernmodule erstellen und bereitstellen",
55
"repository": "git@github.com:virtUOS/courseware.git",
66
"author": "Zentrum virtUOS / ELAN e.V.",

0 commit comments

Comments
 (0)