fix safari issues

virtUOS · Apr 22, 2021 · 4c44407 · 4c44407
1 parent 6b4bf99
commit 4c44407
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/assets/static/courseware.js b/assets/static/courseware.js
@@ -44128,7 +44128,7 @@ function clearHash(el) {
   makeBlob: function makeBlob() {
     var $view = this;
     var control = $view.$('.cw-audio-gallery-content-slide-control')[0];
-    this.blob = new Blob($view.chunks, { type: 'audio/ogg' });
+    this.blob = new Blob($view.chunks, { type: 'audio/mpeg' });
     var url = URL.createObjectURL(this.blob),
         audio = document.createElement('audio');
     audio.controls = true;
@@ -104071,7 +104071,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         }
         content = JSON.parse(content);
         if (content.type == 'countdown') {
-            this.countdown(new Date(content.date + " " + content.time).getTime());
+            this.countdown(new Date(content.date + "T" + content.time).getTime());
             $view.$('.cw-date-countdown').show();
         }
         if (content.type == 'date') {
@@ -104288,7 +104288,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         }, 1000);
     },
     date: function date(date, time) {
-        var date = new Date(date + ' ' + time);
+        var date = new Date(date + 'T' + time);
         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());
         this.$('.cw-date-date-digits[data-date="time"] .cw-date-date-number').html(("0" + date.getHours()).slice(-2) + ':' + ("0" + date.getMinutes()).slice(-2));
     }

diff --git a/assets/static/courseware.js.map b/assets/static/courseware.js.map
diff --git a/blocks/AudioGalleryBlock/AudioGalleryBlock.php b/blocks/AudioGalleryBlock/AudioGalleryBlock.php
@@ -100,7 +100,7 @@ public function store_recording_handler(array $data)
         $tempDir = $GLOBALS['TMP_PATH'].'/'.uniqid();
         mkdir($tempDir);
         //create file in temp dir
-        $filename = 'Courseware-Aufnahme-'.date("d.m.Y-H:i", time()).'.ogg';
+        $filename = 'Courseware-Aufnahme-'.date("d.m.Y-H:i", time()).'.mp3';
         file_put_contents($tempDir.'/'.$filename, base64_decode($audio));
         // get personal root folder
 

diff --git a/blocks/AudioGalleryBlock/js/student_view.js b/blocks/AudioGalleryBlock/js/student_view.js
@@ -127,7 +127,7 @@ export default StudentView.extend({
   makeBlob(){
       var $view = this;
       var control = $view.$('.cw-audio-gallery-content-slide-control')[0];
-      this.blob = new Blob($view.chunks, {type: 'audio/ogg' })
+      this.blob = new Blob($view.chunks, {type: 'audio/mpeg' })
       let url = URL.createObjectURL(this.blob),
            audio = document.createElement('audio');
       audio.controls = true;

diff --git a/blocks/AudioGalleryBlock/templates/student_view.mustache b/blocks/AudioGalleryBlock/templates/student_view.mustache
@@ -6,7 +6,7 @@
                 <img src="{{user_avatar}}">
                 {{#file_url}}
                 <audio class="cw-audio-gallery-player" controls>
-                    <source  src="{{file_url}}">
+                    <source  src="{{file_url}}" type="audio/mpeg">
                 </audio>
                 {{/file_url}}
                 <input type="hidden" class="cw-audio-gallery-userhasrecord" value="{{#file_url}}true{{/file_url}}{{^file_url}}false{{/file_url}}">

diff --git a/blocks/DateBlock/js/student_view.js b/blocks/DateBlock/js/student_view.js
@@ -21,7 +21,7 @@ export default StudentView.extend({
         }
         content = JSON.parse(content);
         if (content.type == 'countdown') {
-            this.countdown(new Date(content.date + " "+ content.time).getTime());
+            this.countdown(new Date(content.date + "T"+ content.time).getTime());
             $view.$('.cw-date-countdown').show();
         }
         if (content.type == 'date') {
@@ -87,7 +87,7 @@ export default StudentView.extend({
     },
 
     date(date, time) {
-        var date = new Date(date+' '+time);
+        var date = new Date(date+'T'+time);
         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());
         this.$('.cw-date-date-digits[data-date="time"] .cw-date-date-number').html(("0" + date.getHours()).slice(-2)+':'+("0" + date.getMinutes()).slice(-2));
     }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "courseware",
-  "version": "4.7.4",
+  "version": "4.7.6",
   "description": "Interaktive multimediale Lernmodule erstellen und bereitstellen",
   "repository": "git@github.com:virtUOS/courseware.git",
   "author": "Zentrum virtUOS / ELAN e.V.",